Reduce usage of v8::Isolate::GetCurrent() in NPV8Object

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 48 matching lines @@
 
 // FIXME: Comments on why use malloc and free.
 static NPObject* allocV8NPObject(NPP, NPClass*)
 {
     return static_cast<NPObject*>(malloc(sizeof(V8NPObject)));
 }
 
 static void freeV8NPObject(NPObject* npObject)
 {
     V8NPObject* v8NpObject = reinterpret_cast<V8NPObject*>(npObject);
-    disposeUnderlyingV8Object(npObject);
+    disposeUnderlyingV8Object(npObject, v8::Isolate::GetCurrent());
     free(v8NpObject);
 }
 
 static NPClass V8NPObjectClass = {
     NP_CLASS_STRUCT_VERSION,
     allocV8NPObject,
     freeV8NPObject,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
@@ skipping 27 matching lines @@
     char buffer[32];
     snprintf(buffer, sizeof(buffer), "%d", identifier->value.number);
     return v8::String::NewSymbol(buffer);
 }
 
 NPObject* v8ObjectToNPObject(v8::Handle<v8::Object> object)
 {
     return reinterpret_cast<NPObject*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
 }
 
-NPObject* npCreateV8ScriptObject(NPP npp, v8::Handle<v8::Object> object, DOMWindow* root)
+NPObject* npCreateV8ScriptObject(NPP npp, v8::Handle<v8::Object> object, DOMWindow* root, v8::Isolate* isolate)
 {
     // Check to see if this object is already wrapped.
     if (object->InternalFieldCount() == npObjectInternalFieldCount) {
         WrapperTypeInfo* typeInfo = static_cast<WrapperTypeInfo*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex));
         if (typeInfo == npObjectTypeInfo()) {
             NPObject* returnValue = v8ObjectToNPObject(object);
             _NPN_RetainObject(returnValue);
             return returnValue;
         }
     }
@@ skipping 16 matching lines @@
         } else {
             iter = v8NPObjectMap->set(v8ObjectHash, V8NPObjectVector()).iterator;
         }
         objectVector = &iter->value;
     }
 
     V8NPObject* v8npObject = reinterpret_cast<V8NPObject*>(_NPN_CreateObject(npp, &V8NPObjectClass));
     // This is uninitialized memory, we need to clear it so that
     // Persistent::Reset won't try to Dispose anything bogus.
     v8npObject->v8Object.Clear();
-    v8npObject->v8Object.Reset(v8::Isolate::GetCurrent(), object);
+    v8npObject->v8Object.Reset(isolate, object);
     v8npObject->rootObject = root;
 
     if (objectVector)
         objectVector->append(v8npObject);
 
     return reinterpret_cast<NPObject*>(v8npObject);
 }
 
 V8NPObject* npObjectToV8NPObject(NPObject* npObject)
 {
     if (npObject->_class != &V8NPObjectClass)
         return 0;
     V8NPObject* v8NpObject = reinterpret_cast<V8NPObject*>(npObject);
     if (v8NpObject->v8Object.IsEmpty())
         return 0;
     return v8NpObject;
 }
 
-void disposeUnderlyingV8Object(NPObject* npObject)
+void disposeUnderlyingV8Object(NPObject* npObject, v8::Isolate* isolate)
 {
     ASSERT(npObject);
     V8NPObject* v8NpObject = npObjectToV8NPObject(npObject);
     if (!v8NpObject)
         return;
-    v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::HandleScope scope(isolate);
     v8::Handle<v8::Object> v8Object = v8::Local<v8::Object>::New(isolate, v8NpObject->v8Object);
     ASSERT(!v8Object->CreationContext().IsEmpty());
     if (V8PerContextData* perContextData = V8PerContextData::from(v8Object->CreationContext())) {
         V8NPObjectMap* v8NPObjectMap = perContextData->v8NPObjectMap();
         int v8ObjectHash = v8Object->GetIdentityHash();
         ASSERT(v8ObjectHash);
         V8NPObjectMap::iterator iter = v8NPObjectMap->find(v8ObjectHash);
         if (iter != v8NPObjectMap->end()) {
             V8NPObjectVector& objects = iter->value;
@@ skipping 68 matching lines @@
     // Call the function object.
     v8::Handle<v8::Function> function = v8::Handle<v8::Function>::Cast(functionObject);
     OwnArrayPtr<v8::Handle<v8::Value> > argv = createValueListFromVariantArgs(arguments, argumentCount, npObject, isolate);
     v8::Local<v8::Value> resultObject = frame->script()->callFunction(function, v8Object, argumentCount, argv.get());
 
     // If we had an error, return false.  The spec is a little unclear here, but says "Returns true if the method was
     // successfully invoked".  If we get an error return value, was that successfully invoked?
     if (resultObject.IsEmpty())
         return false;
 
-    convertV8ObjectToNPVariant(resultObject, npObject, result);
+    convertV8ObjectToNPVariant(resultObject, npObject, result, isolate);
     return true;
 }
 
 // FIXME: Fix it same as _NPN_Invoke (HandleScope and such).
 bool _NPN_InvokeDefault(NPP npp, NPObject* npObject, const NPVariant* arguments, uint32_t argumentCount, NPVariant* result)
 {
     if (!npObject)
         return false;
 
     v8::Isolate* isolate = v8::Isolate::GetCurrent();
@@ skipping 29 matching lines @@
         ASSERT(frame);
 
         OwnArrayPtr<v8::Handle<v8::Value> > argv = createValueListFromVariantArgs(arguments, argumentCount, npObject, isolate);
         resultObject = frame->script()->callFunction(function, functionObject, argumentCount, argv.get());
     }
     // If we had an error, return false.  The spec is a little unclear here, but says "Returns true if the method was
     // successfully invoked".  If we get an error return value, was that successfully invoked?
     if (resultObject.IsEmpty())
         return false;
 
-    convertV8ObjectToNPVariant(resultObject, npObject, result);
+    convertV8ObjectToNPVariant(resultObject, npObject, result, isolate);
     return true;
 }
 
 bool _NPN_Evaluate(NPP npp, NPObject* npObject, NPString* npScript, NPVariant* result)
 {
     // FIXME: Give the embedder a way to control this.
     bool popupsAllowed = false;
     return _NPN_EvaluateHelper(npp, popupsAllowed, npObject, npScript, result);
 }
 
 bool _NPN_EvaluateHelper(NPP npp, bool popupsAllowed, NPObject* npObject, NPString* npScript, NPVariant* result)
 {
     VOID_TO_NPVARIANT(*result);
     if (!npObject)
         return false;
 
     V8NPObject* v8NpObject = npObjectToV8NPObject(npObject);
     if (!v8NpObject)
         return false;
 
-    v8::HandleScope handleScope(v8::Isolate::GetCurrent());
+    v8::Isolate* isolate = v8::Isolate::GetCurrent();
+    v8::HandleScope handleScope(isolate);
     v8::Handle<v8::Context> context = toV8Context(npp, npObject);
     if (context.IsEmpty())
         return false;
 
     v8::Context::Scope scope(context);
     ExceptionCatcher exceptionCatcher;
 
     // FIXME: Is this branch still needed after switching to using UserGestureIndicator?
     String filename;
     if (!popupsAllowed)
         filename = "npscript";
 
     Frame* 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()->compileAndRunScript(ScriptSourceCode(script, KURL(ParsedURLString, filename)));
 
     if (v8result.IsEmpty())
         return false;
 
     if (_NPN_IsAlive(npObject))
-        convertV8ObjectToNPVariant(v8result, npObject, result);
+        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 = toV8Context(npp, npObject);
         if (context.IsEmpty())
             return false;
 
         v8::Context::Scope scope(context);
         ExceptionCatcher exceptionCatcher;
 
         v8::Handle<v8::Object> obj = v8::Local<v8::Object>::New(isolate, object->v8Object);
         v8::Local<v8::Value> v8result = obj->Get(npIdentifierToV8Identifier(propertyName));
 
         if (v8result.IsEmpty())
             return false;
 
-        convertV8ObjectToNPVariant(v8result, npObject, result);
+        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;
@@ skipping 196 matching lines @@
         if (!ctor->IsNull()) {
             Frame* frame = object->rootObject->frame();
             ASSERT(frame);
             OwnArrayPtr<v8::Handle<v8::Value> > argv = createValueListFromVariantArgs(arguments, argumentCount, npObject, isolate);
             resultObject = V8ObjectConstructor::newInstanceInDocument(ctor, argumentCount, argv.get(), frame ? frame->document() : 0);
         }
 
         if (resultObject.IsEmpty())
             return false;
 
-        convertV8ObjectToNPVariant(resultObject, npObject, result);
+        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;
 }