Replace Context::Scope with ScriptState::Scope

Source/bindings/v8/NPV8Object.cpp

 /*
  * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007, 2008, 2009 Google, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 59 matching lines @@
     free(v8NpObject);
 }
 
 static NPClass V8NPObjectClass = {
     NP_CLASS_STRUCT_VERSION,
     allocV8NPObject,
     freeV8NPObject,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static v8::Local<v8::Context> mainWorldContext(v8::Isolate* isolate, NPP npp, NPObject* npObject)
+static ScriptState* mainWorldScriptState(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 toV8Context(isolate, object->rootObject->frame(), DOMWrapperWorld::mainWorld());
+        return 0;
+    v8::HandleScope handleScope(isolate);
+    v8::Handle<v8::Context> context = toV8Context(isolate, object->rootObject->frame(), DOMWrapperWorld::mainWorld());
+    return ScriptState::from(context);
 }
 
 static PassOwnPtr<v8::Handle<v8::Value>[]> createValueListFromVariantArgs(const NPVariant* arguments, uint32_t argumentCount, NPObject* owner, v8::Isolate* isolate)
 {
     OwnPtr<v8::Handle<v8::Value>[]> argv = adoptArrayPtr(new v8::Handle<v8::Value>[argumentCount]);
     for (uint32_t index = 0; index < argumentCount; index++) {
         const NPVariant* arg = &arguments[index];
         argv[index] = convertNPVariantToV8Object(arg, owner, isolate);
     }
     return argv.release();
@@ skipping 125 matching lines @@
         return false;
 
     if (!strcmp(identifier->value.string, "eval")) {
         if (argumentCount != 1)
             return false;
         if (arguments[0].type != NPVariantType_String)
             return false;
         return _NPN_Evaluate(npp, npObject, const_cast<NPString*>(&arguments[0].value.stringValue), result);
     }
 
-    v8::HandleScope handleScope(isolate);
     // FIXME: should use the plugin's owner frame as the security context.
-    v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
-    if (context.IsEmpty())
+    ScriptState* scriptState = mainWorldScriptState(isolate, npp, npObject);
+    if (!scriptState)
         return false;
 
-    v8::Context::Scope scope(context);
+    ScriptState::Scope scope(scriptState);
     ExceptionCatcher exceptionCatcher;
 
     v8::Handle<v8::Object> v8Object = v8::Local<v8::Object>::New(isolate, v8NpObject->v8Object);
     v8::Handle<v8::Value> functionObject = v8Object->Get(v8AtomicString(isolate, identifier->value.string));
     if (functionObject.IsEmpty() || functionObject->IsNull()) {
         NULL_TO_NPVARIANT(*result);
         return false;
     }
     if (functionObject->IsUndefined()) {
         VOID_TO_NPVARIANT(*result);
@@ skipping 29 matching lines @@
     if (!v8NpObject) {
         if (npObject->_class->invokeDefault)
             return npObject->_class->invokeDefault(npObject, arguments, argumentCount, result);
 
         VOID_TO_NPVARIANT(*result);
         return true;
     }
 
     VOID_TO_NPVARIANT(*result);
 
-    v8::HandleScope handleScope(isolate);
-    v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
-    if (context.IsEmpty())
+    ScriptState* scriptState = mainWorldScriptState(isolate, npp, npObject);
+    if (!scriptState)
         return false;
 
-    v8::Context::Scope scope(context);
+    ScriptState::Scope scope(scriptState);
     ExceptionCatcher exceptionCatcher;
 
     // Lookup the function object and call it.
     v8::Local<v8::Object> functionObject = v8::Local<v8::Object>::New(isolate, v8NpObject->v8Object);
     if (!functionObject->IsFunction())
         return false;
 
     v8::Local<v8::Value> resultObject;
     v8::Handle<v8::Function> function = v8::Local<v8::Function>::Cast(functionObject);
     if (!function->IsNull()) {
@@ skipping 23 matching lines @@
 {
     VOID_TO_NPVARIANT(*result);
     if (!npObject)
         return false;
 
     V8NPObject* v8NpObject = npObjectToV8NPObject(npObject);
     if (!v8NpObject)
         return false;
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
-    v8::HandleScope handleScope(isolate);
-    v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
-    if (context.IsEmpty())
+    ScriptState* scriptState = mainWorldScriptState(isolate, npp, npObject);
+    if (!scriptState)
         return false;
 
-    v8::Context::Scope scope(context);
+    ScriptState::Scope scope(scriptState);
     ExceptionCatcher exceptionCatcher;
 
     // FIXME: Is this branch still needed after switching to using UserGestureIndicator?
     String filename;
     if (!popupsAllowed)
         filename = "npscript";
 
     LocalFrame* frame = v8NpObject->rootObject->frame();
     ASSERT(frame);
 
     String script = String::fromUTF8(npScript->UTF8Characters, npScript->UTF8Length);
 
     UserGestureIndicator gestureIndicator(popupsAllowed ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);
-    v8::Local<v8::Value> v8result = frame->script().executeScriptAndReturnValue(context, ScriptSourceCode(script, KURL(ParsedURLString, filename)));
+    v8::Local<v8::Value> v8result = frame->script().executeScriptAndReturnValue(scriptState->context(), ScriptSourceCode(script, KURL(ParsedURLString, filename)));
 
     if (v8result.IsEmpty())
         return false;
 
     if (_NPN_IsAlive(npObject))
         convertV8ObjectToNPVariant(v8result, npObject, result, isolate);
     return true;
 }
 
 bool _NPN_GetProperty(NPP npp, NPObject* npObject, NPIdentifier propertyName, NPVariant* result)
 {
     if (!npObject)
         return false;
 
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
-        v8::HandleScope handleScope(isolate);
-        v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
-        if (context.IsEmpty())
+        ScriptState* scriptState = mainWorldScriptState(isolate, npp, npObject);
+        if (!scriptState)
             return false;
 
-        v8::Context::Scope scope(context);
+        ScriptState::Scope scope(scriptState);
         ExceptionCatcher exceptionCatcher;
 
         v8::Handle<v8::Object> obj = v8::Local<v8::Object>::New(isolate, object->v8Object);
         v8::Local<v8::Value> v8result = obj->Get(npIdentifierToV8Identifier(propertyName, isolate));
 
         if (v8result.IsEmpty())
             return false;
 
         convertV8ObjectToNPVariant(v8result, npObject, result, isolate);
         return true;
     }
 
     if (npObject->_class->hasProperty && npObject->_class->getProperty) {
         if (npObject->_class->hasProperty(npObject, propertyName))
             return npObject->_class->getProperty(npObject, propertyName, result);
     }
 
     VOID_TO_NPVARIANT(*result);
     return false;
 }
 
 bool _NPN_SetProperty(NPP npp, NPObject* npObject, NPIdentifier propertyName, const NPVariant* value)
 {
     if (!npObject)
         return false;
 
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
-        v8::HandleScope handleScope(isolate);
-        v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
-        if (context.IsEmpty())
+        ScriptState* scriptState = mainWorldScriptState(isolate, npp, npObject);
+        if (!scriptState)
             return false;
 
-        v8::Context::Scope scope(context);
+        ScriptState::Scope scope(scriptState);
         ExceptionCatcher exceptionCatcher;
 
         v8::Handle<v8::Object> obj = v8::Local<v8::Object>::New(isolate, object->v8Object);
-        obj->Set(npIdentifierToV8Identifier(propertyName, context->GetIsolate()), convertNPVariantToV8Object(value, object->rootObject->frame()->script().windowScriptNPObject(), context->GetIsolate()));
+        obj->Set(npIdentifierToV8Identifier(propertyName, isolate), convertNPVariantToV8Object(value, object->rootObject->frame()->script().windowScriptNPObject(), isolate));
         return true;
     }
 
     if (npObject->_class->setProperty)
         return npObject->_class->setProperty(npObject, propertyName, value);
 
     return false;
 }
 
 bool _NPN_RemoveProperty(NPP npp, NPObject* npObject, NPIdentifier propertyName)
 {
     if (!npObject)
         return false;
 
     V8NPObject* object = npObjectToV8NPObject(npObject);
     if (!object)
         return false;
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
-    v8::HandleScope handleScope(isolate);
-    v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
-    if (context.IsEmpty())
+    ScriptState* scriptState = mainWorldScriptState(isolate, npp, npObject);
+    if (!scriptState)
         return false;
-    v8::Context::Scope scope(context);
+    ScriptState::Scope scope(scriptState);
     ExceptionCatcher exceptionCatcher;
 
     v8::Handle<v8::Object> obj = v8::Local<v8::Object>::New(isolate, object->v8Object);
     // FIXME: Verify that setting to undefined is right.
     obj->Set(npIdentifierToV8Identifier(propertyName, isolate), v8::Undefined(isolate));
     return true;
 }
 
 bool _NPN_HasProperty(NPP npp, NPObject* npObject, NPIdentifier propertyName)
 {
     if (!npObject)
         return false;
 
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
-        v8::HandleScope handleScope(isolate);
-        v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
-        if (context.IsEmpty())
+        ScriptState* scriptState = mainWorldScriptState(isolate, npp, npObject);
+        if (!scriptState)
             return false;
-        v8::Context::Scope scope(context);
+        ScriptState::Scope scope(scriptState);
         ExceptionCatcher exceptionCatcher;
 
         v8::Handle<v8::Object> obj = v8::Local<v8::Object>::New(isolate, object->v8Object);
         return obj->Has(npIdentifierToV8Identifier(propertyName, isolate));
     }
 
     if (npObject->_class->hasProperty)
         return npObject->_class->hasProperty(npObject, propertyName);
     return false;
 }
 
 bool _NPN_HasMethod(NPP npp, NPObject* npObject, NPIdentifier methodName)
 {
     if (!npObject)
         return false;
 
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
-        v8::HandleScope handleScope(isolate);
-        v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
-        if (context.IsEmpty())
+        ScriptState* scriptState = mainWorldScriptState(isolate, npp, npObject);
+        if (!scriptState)
             return false;
-        v8::Context::Scope scope(context);
+        ScriptState::Scope scope(scriptState);
         ExceptionCatcher exceptionCatcher;
 
         v8::Handle<v8::Object> obj = v8::Local<v8::Object>::New(isolate, object->v8Object);
         v8::Handle<v8::Value> prop = obj->Get(npIdentifierToV8Identifier(methodName, isolate));
         return prop->IsFunction();
     }
 
     if (npObject->_class->hasMethod)
         return npObject->_class->hasMethod(npObject, methodName);
     return false;
 }
 
 void _NPN_SetException(NPObject* npObject, const NPUTF8 *message)
 {
     if (!npObject || !npObjectToV8NPObject(npObject)) {
         // We won't be able to find a proper scope for this exception, so just throw it.
         // This is consistent with JSC, which throws a global exception all the time.
         throwError(v8GeneralError, message, v8::Isolate::GetCurrent());
         return;
     }
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
-    v8::HandleScope handleScope(isolate);
-    v8::Handle<v8::Context> context = mainWorldContext(isolate, 0, npObject);
-    if (context.IsEmpty())
+    ScriptState* scriptState = mainWorldScriptState(isolate, 0, npObject);
+    if (!scriptState)
         return;
 
-    v8::Context::Scope scope(context);
+    ScriptState::Scope scope(scriptState);
     ExceptionCatcher exceptionCatcher;
 
-    throwError(v8GeneralError, message, context->GetIsolate());
+    throwError(v8GeneralError, message, isolate);
 }
 
 bool _NPN_Enumerate(NPP npp, NPObject* npObject, NPIdentifier** identifier, uint32_t* count)
 {
     if (!npObject)
         return false;
 
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
         v8::Isolate* isolate = v8::Isolate::GetCurrent();
-        v8::HandleScope handleScope(isolate);
-        v8::Local<v8::Context> context = mainWorldContext(isolate, npp, npObject);
-        if (context.IsEmpty())
+        ScriptState* scriptState = mainWorldScriptState(isolate, npp, npObject);
+        if (!scriptState)
             return false;
-        v8::Context::Scope scope(context);
+        ScriptState::Scope scope(scriptState);
         ExceptionCatcher exceptionCatcher;
 
         v8::Handle<v8::Object> obj = v8::Local<v8::Object>::New(isolate, object->v8Object);
 
         // FIXME: http://b/issue?id=1210340: Use a v8::Object::Keys() method when it exists, instead of evaluating javascript.
 
         // FIXME: Figure out how to cache this helper function.  Run a helper function that collects the properties
         // on the object into an array.
         const char enumeratorCode[] =
             "(function (obj) {"
             "  var props = [];"
             "  for (var prop in obj) {"
             "    props[props.length] = prop;"
             "  }"
             "  return props;"
             "});";
         v8::Handle<v8::String> source = v8AtomicString(isolate, enumeratorCode);
-        v8::Handle<v8::Value> result = V8ScriptRunner::compileAndRunInternalScript(source, context->GetIsolate());
+        v8::Handle<v8::Value> result = V8ScriptRunner::compileAndRunInternalScript(source, isolate);
         ASSERT(!result.IsEmpty());
         ASSERT(result->IsFunction());
         v8::Handle<v8::Function> enumerator = v8::Handle<v8::Function>::Cast(result);
         v8::Handle<v8::Value> argv[] = { obj };
-        v8::Local<v8::Value> propsObj = V8ScriptRunner::callInternalFunction(enumerator, v8::Handle<v8::Object>::Cast(result), WTF_ARRAY_LENGTH(argv), argv, context->GetIsolate());
+        v8::Local<v8::Value> propsObj = V8ScriptRunner::callInternalFunction(enumerator, v8::Handle<v8::Object>::Cast(result), WTF_ARRAY_LENGTH(argv), argv, isolate);
         if (propsObj.IsEmpty())
             return false;
 
         // Convert the results into an array of NPIdentifiers.
         v8::Handle<v8::Array> props = v8::Handle<v8::Array>::Cast(propsObj);
         *count = props->Length();
         *identifier = static_cast<NPIdentifier*>(calloc(*count, sizeof(NPIdentifier)));
         for (uint32_t i = 0; i < *count; ++i) {
-            v8::Local<v8::Value> name = props->Get(v8::Integer::New(context->GetIsolate(), i));
+            v8::Local<v8::Value> name = props->Get(v8::Integer::New(isolate, i));
             (*identifier)[i] = getStringIdentifier(v8::Local<v8::String>::Cast(name));
         }
         return true;
     }
 
     if (NP_CLASS_STRUCT_VERSION_HAS_ENUM(npObject->_class) && npObject->_class->enumerate)
        return npObject->_class->enumerate(npObject, identifier, count);
 
     return false;
 }
 
 bool _NPN_Construct(NPP npp, NPObject* npObject, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result)
 {
     if (!npObject)
         return false;
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
 
     if (V8NPObject* object = npObjectToV8NPObject(npObject)) {
-        v8::HandleScope handleScope(isolate);
-        v8::Handle<v8::Context> context = mainWorldContext(isolate, npp, npObject);
-        if (context.IsEmpty())
+        ScriptState* scriptState = mainWorldScriptState(isolate, npp, npObject);
+        if (!scriptState)
             return false;
-        v8::Context::Scope scope(context);
+        ScriptState::Scope scope(scriptState);
         ExceptionCatcher exceptionCatcher;
 
         // Lookup the constructor function.
         v8::Handle<v8::Object> ctorObj = v8::Local<v8::Object>::New(isolate, object->v8Object);
         if (!ctorObj->IsFunction())
             return false;
 
         // Call the constructor.
         v8::Local<v8::Value> resultObject;
         v8::Handle<v8::Function> ctor = v8::Handle<v8::Function>::Cast(ctorObj);
         if (!ctor->IsNull()) {
             LocalFrame* frame = object->rootObject->frame();
             ASSERT(frame);
             OwnPtr<v8::Handle<v8::Value>[]> argv = createValueListFromVariantArgs(arguments, argumentCount, npObject, isolate);
             resultObject = V8ObjectConstructor::newInstanceInDocument(isolate, ctor, argumentCount, argv.get(), frame ? frame->document() : 0);
         }
 
         if (resultObject.IsEmpty())
             return false;
 
         convertV8ObjectToNPVariant(resultObject, npObject, result, isolate);
         return true;
     }
 
     if (NP_CLASS_STRUCT_VERSION_HAS_CTOR(npObject->_class) && npObject->_class->construct)
         return npObject->_class->construct(npObject, arguments, argumentCount, result);
 
     return false;
 }