Move the v8::Isolate* parameter to the first parameter of various binding methods in third_party/We…

Source/bindings/core/v8/V8NPObject.cpp

 /*
 * Copyright (C) 2006, 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:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
@@ skipping 91 matching lines @@
     if (!npObject || !_NPN_IsAlive(npObject)) {
         V8ThrowException::throwReferenceError("NPObject deleted", isolate);
         return;
     }
 
     // Wrap up parameters.
     int numArgs = info.Length();
     OwnPtr<NPVariant[]> npArgs = adoptArrayPtr(new NPVariant[numArgs]);
 
     for (int i = 0; i < numArgs; i++)
-        convertV8ObjectToNPVariant(info[i], npObject, &npArgs[i], isolate);
+        convertV8ObjectToNPVariant(isolate, info[i], npObject, &npArgs[i]);
 
     NPVariant result;
     VOID_TO_NPVARIANT(result);
 
     bool retval = true;
     switch (functionId) {
     case InvokeMethod:
         if (npObject->_class->invoke) {
             v8::Handle<v8::String> functionName = v8::Handle<v8::String>::Cast(info.Data());
             NPIdentifier identifier = getStringIdentifier(functionName);
@@ skipping 14 matching lines @@
 
     if (!retval)
         V8ThrowException::throwGeneralError("Error calling method on NPObject.", isolate);
 
     for (int i = 0; i < numArgs; i++)
         _NPN_ReleaseVariantValue(&npArgs[i]);
 
     // Unwrap return values.
     v8::Handle<v8::Value> returnValue;
     if (_NPN_IsAlive(npObject))
-        returnValue = convertNPVariantToV8Object(&result, npObject, isolate);
+        returnValue = convertNPVariantToV8Object(isolate, &result, npObject);
     _NPN_ReleaseVariantValue(&result);
 
     v8SetReturnValue(info, returnValue);
 }
 
 
 void npObjectMethodHandler(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     return npObjectInvokeImpl(info, InvokeMethod);
 }
@@ skipping 89 matching lines @@
         if (!_NPN_IsAlive(npObject))
             return V8ThrowException::throwReferenceError("NPObject deleted", isolate);
 
         NPVariant result;
         VOID_TO_NPVARIANT(result);
         if (!npObject->_class->getProperty(npObject, identifier, &result))
             return v8Undefined();
 
         v8::Handle<v8::Value> returnValue;
         if (_NPN_IsAlive(npObject))
-            returnValue = convertNPVariantToV8Object(&result, npObject, isolate);
+            returnValue = convertNPVariantToV8Object(isolate, &result, npObject);
         _NPN_ReleaseVariantValue(&result);
         return returnValue;
 
     }
 
     if (!_NPN_IsAlive(npObject))
         return V8ThrowException::throwReferenceError("NPObject deleted", isolate);
 
     if (key->IsString() && npObject->_class->hasMethod && npObject->_class->hasMethod(npObject, identifier)) {
         if (!_NPN_IsAlive(npObject))
@@ skipping 57 matching lines @@
         V8ThrowException::throwReferenceError("NPObject deleted", isolate);
         return value; // Intercepted, but an exception was thrown.
     }
 
     if (npObject->_class->hasProperty && npObject->_class->setProperty && npObject->_class->hasProperty(npObject, identifier)) {
         if (!_NPN_IsAlive(npObject))
             return V8ThrowException::throwReferenceError("NPObject deleted", isolate);
 
         NPVariant npValue;
         VOID_TO_NPVARIANT(npValue);
-        convertV8ObjectToNPVariant(value, npObject, &npValue, isolate);
+        convertV8ObjectToNPVariant(isolate, value, npObject, &npValue);
         bool success = npObject->_class->setProperty(npObject, identifier, &npValue);
         _NPN_ReleaseVariantValue(&npValue);
         if (success)
             return value; // Intercept the call.
     }
     return v8Undefined();
 }
 
 
 void npObjectNamedPropertySetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
@@ skipping 141 matching lines @@
     v8::HandleScope scope(isolate);
     v8::Handle<v8::Object> wrapper = staticNPObjectMap().newLocal(object, isolate);
     if (!wrapper.IsEmpty()) {
         V8DOMWrapper::clearNativeInfo(wrapper, npObjectTypeInfo());
         staticNPObjectMap().removeAndDispose(object);
         _NPN_ReleaseObject(object);
     }
 }
 
 } // namespace blink