| Index: Source/bindings/core/v8/NPV8Object.cpp
|
| diff --git a/Source/bindings/core/v8/NPV8Object.cpp b/Source/bindings/core/v8/NPV8Object.cpp
|
| index c694841c0a482a814d55caa565e0e28254ecfc0f..e2e6049aafaa1d660f40e27b7ee3cd6eb04dc6a4 100644
|
| --- a/Source/bindings/core/v8/NPV8Object.cpp
|
| +++ b/Source/bindings/core/v8/NPV8Object.cpp
|
| @@ -75,7 +75,7 @@ static NPObject* allocV8NPObject(NPP, NPClass*)
|
| static void freeV8NPObject(NPObject* npObject)
|
| {
|
| V8NPObject* v8NpObject = reinterpret_cast<V8NPObject*>(npObject);
|
| - disposeUnderlyingV8Object(npObject, v8::Isolate::GetCurrent());
|
| + disposeUnderlyingV8Object(v8::Isolate::GetCurrent(), npObject);
|
| free(v8NpObject);
|
| }
|
|
|
| @@ -134,7 +134,7 @@ bool isWrappedNPObject(v8::Handle<v8::Object> object)
|
| return false;
|
| }
|
|
|
| -NPObject* npCreateV8ScriptObject(NPP npp, v8::Handle<v8::Object> object, LocalDOMWindow* root, v8::Isolate* isolate)
|
| +NPObject* npCreateV8ScriptObject(v8::Isolate* isolate, NPP npp, v8::Handle<v8::Object> object, LocalDOMWindow* root)
|
| {
|
| // Check to see if this object is already wrapped.
|
| if (isWrappedNPObject(object)) {
|
| @@ -192,7 +192,7 @@ ScriptWrappableBase* npObjectToScriptWrappableBase(NPObject* npObject)
|
| return reinterpret_cast<ScriptWrappableBase*>(npObject);
|
| }
|
|
|
| -void disposeUnderlyingV8Object(NPObject* npObject, v8::Isolate* isolate)
|
| +void disposeUnderlyingV8Object(v8::Isolate* isolate, NPObject* npObject)
|
| {
|
| ASSERT(npObject);
|
| V8NPObject* v8NpObject = npObjectToV8NPObject(npObject);
|
|
|