Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / bindings / v8 / NPV8Object.cpp

diff --git a/src/third_party/WebKit/Source/bindings/v8/NPV8Object.cpp b/src/third_party/WebKit/Source/bindings/v8/NPV8Object.cpp
index 99e5e0c..ecfe93c 100644 (file)
--- a/src/third_party/WebKit/Source/bindings/v8/NPV8Object.cpp
+++ b/src/third_party/WebKit/Source/bindings/v8/NPV8Object.cpp
@@ -53,7 +53,7 @@ namespace WebCore {
 
 const WrapperTypeInfo* npObjectTypeInfo()
 {
-    static const WrapperTypeInfo typeInfo = { gin::kEmbedderBlink, 0, 0, 0, 0, 0, 0, 0, WrapperTypeObjectPrototype };
+    static const WrapperTypeInfo typeInfo = { gin::kEmbedderBlink, 0, 0, 0, 0, 0, 0, 0, WrapperTypeObjectPrototype, false };
     return &typeInfo;
 }
 
@@ -77,14 +77,14 @@ static NPClass V8NPObjectClass = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static v8::Local<v8::Context> toV8Context(NPP npp, NPObject* npObject)
+static v8::Local<v8::Context> mainWorldContext(v8::Isolate* isolate, NPP npp, NPObject* npObject)
 {
     ASSERT(npObject->_class == &V8NPObjectClass);
     V8NPObject* object = reinterpret_cast<V8NPObject*>(npObject);
     DOMWindow* window = object->rootObject;
     if (!window || !window->isCurrentlyDisplayedInFrame())
         return v8::Local<v8::Context>();
-    return ScriptController::mainWorldContext(object->rootObject->frame());
+    return toV8Context(isolate, object->rootObject->frame(), DOMWrapperWorld::mainWorld());
 }
 
 static PassOwnPtr<v8::Handle<v8::Value>[]> createValueListFromVariantArgs(const NPVariant* arguments, uint32_t argumentCount, NPObject* owner, v8::Isolate* isolate)
@@ -141,10 +141,10 @@ NPObject* npCreateV8ScriptObject(NPP npp, v8::Handle<v8::Object> object, DOMWind
                     return reinterpret_cast<NPObject*>(v8npObject);
                 }
             }
+            objectVector = &iter->value;
         } else {
-            iter = v8NPObjectMap->set(v8ObjectHash, V8NPObjectVector()).iterator;
+            objectVector = &v8NPObjectMap->set(v8ObjectHash, V8NPObjectVector()).storedValue->value;
         }
-        objectVector = &iter->value;
     }
 
     V8NPObject* v8npObject = reinterpret_cast<V8NPObject*>(_NPN_CreateObject(npp, &V8NPObjectClass));
@@ -232,7 +232,7 @@ bool _NPN_Invoke(NPP npp, NPObject* npObject, NPIdentifier methodName, const NPV
 
     v8::HandleScope handleScope(isolate);
     // FIXME: should use the plugin's owner frame as the security context.
-    v8::Handle<v8::Context> context = toV8Context(npp, npObject);
+    v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
     if (context.IsEmpty())
         return false;
 
@@ -287,7 +287,7 @@ bool _NPN_InvokeDefault(NPP npp, NPObject* npObject, const NPVariant* arguments,
     VOID_TO_NPVARIANT(*result);
 
     v8::HandleScope handleScope(isolate);
-    v8::Handle<v8::Context> context = toV8Context(npp, npObject);
+    v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
     if (context.IsEmpty())
         return false;
 
@@ -336,7 +336,7 @@ bool _NPN_EvaluateHelper(NPP npp, bool popupsAllowed, NPObject* npObject, NPStri
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
-    v8::Handle<v8::Context> context = toV8Context(npp, npObject);
+    v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
     if (context.IsEmpty())
         return false;
 
@@ -372,7 +372,7 @@ bool _NPN_GetProperty(NPP npp, NPObject* npObject, NPIdentifier propertyName, NP
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
         v8::HandleScope handleScope(isolate);
-        v8::Handle<v8::Context> context = toV8Context(npp, npObject);
+        v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
         if (context.IsEmpty())
             return false;
 
@@ -406,7 +406,7 @@ bool _NPN_SetProperty(NPP npp, NPObject* npObject, NPIdentifier propertyName, co
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
         v8::HandleScope handleScope(isolate);
-        v8::Handle<v8::Context> context = toV8Context(npp, npObject);
+        v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
         if (context.IsEmpty())
             return false;
 
@@ -435,7 +435,7 @@ bool _NPN_RemoveProperty(NPP npp, NPObject* npObject, NPIdentifier propertyName)
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope handleScope(isolate);
-    v8::Handle<v8::Context> context = toV8Context(npp, npObject);
+    v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
     if (context.IsEmpty())
         return false;
     v8::Context::Scope scope(context);
@@ -455,7 +455,7 @@ bool _NPN_HasProperty(NPP npp, NPObject* npObject, NPIdentifier propertyName)
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
         v8::HandleScope handleScope(isolate);
-        v8::Handle<v8::Context> context = toV8Context(npp, npObject);
+        v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
         if (context.IsEmpty())
             return false;
         v8::Context::Scope scope(context);
@@ -478,7 +478,7 @@ bool _NPN_HasMethod(NPP npp, NPObject* npObject, NPIdentifier methodName)
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
         v8::HandleScope handleScope(isolate);
-        v8::Handle<v8::Context> context = toV8Context(npp, npObject);
+        v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
         if (context.IsEmpty())
             return false;
         v8::Context::Scope scope(context);
@@ -503,8 +503,9 @@ void _NPN_SetException(NPObject* npObject, const NPUTF8 *message)
         return;
     }
 
-    v8::HandleScope handleScope(v8::Isolate::GetCurrent());
-    v8::Handle<v8::Context> context = toV8Context(0, npObject);
+    v8::Isolate* isolate = v8::Isolate::GetCurrent();
+    v8::HandleScope handleScope(isolate);
+    v8::Handle<v8::Context> context = mainWorldContext(isolate, 0, npObject);
     if (context.IsEmpty())
         return;
 
@@ -522,7 +523,7 @@ bool _NPN_Enumerate(NPP npp, NPObject* npObject, NPIdentifier** identifier, uint
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
         v8::HandleScope handleScope(isolate);
-        v8::Local<v8::Context> context = toV8Context(npp, npObject);
+        v8::Local<v8::Context> context = mainWorldContext(isolate, npp, npObject);
         if (context.IsEmpty())
             return false;
         v8::Context::Scope scope(context);
@@ -578,7 +579,7 @@ bool _NPN_Construct(NPP npp, NPObject* npObject, const NPVariant* arguments, uin
 
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
         v8::HandleScope handleScope(isolate);
-        v8::Handle<v8::Context> context = toV8Context(npp, npObject);
+        v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
         if (context.IsEmpty())
             return false;
         v8::Context::Scope scope(context);