Index: Source/bindings/core/v8/V8NPObject.cpp |
diff --git a/Source/bindings/core/v8/V8NPObject.cpp b/Source/bindings/core/v8/V8NPObject.cpp |
index 2082a43cce3886fe8d3eb23e72f466f95fc10558..df008676292e12dd62835c074fd7917227ad0332 100644 |
--- a/Source/bindings/core/v8/V8NPObject.cpp |
+++ b/Source/bindings/core/v8/V8NPObject.cpp |
@@ -233,7 +233,7 @@ V8TemplateMapTraits::MapType* V8TemplateMapTraits::MapFromWeakCallbackData(const |
} |
-static v8::Local<v8::Value> npObjectGetProperty(v8::Local<v8::Object> self, NPIdentifier identifier, v8::Local<v8::Value> key, v8::Isolate* isolate) |
+static v8::Local<v8::Value> npObjectGetProperty(v8::Isolate* isolate, v8::Local<v8::Object> self, NPIdentifier identifier, v8::Local<v8::Value> key) |
{ |
NPObject* npObject = v8ObjectToNPObject(self); |
@@ -289,31 +289,31 @@ static v8::Local<v8::Value> npObjectGetProperty(v8::Local<v8::Object> self, NPId |
void npObjectNamedPropertyGetter(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info) |
{ |
NPIdentifier identifier = getStringIdentifier(name); |
- v8SetReturnValue(info, npObjectGetProperty(info.Holder(), identifier, name, info.GetIsolate())); |
+ v8SetReturnValue(info, npObjectGetProperty(info.GetIsolate(), info.Holder(), identifier, name)); |
} |
void npObjectIndexedPropertyGetter(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info) |
{ |
NPIdentifier identifier = _NPN_GetIntIdentifier(index); |
- v8SetReturnValue(info, npObjectGetProperty(info.Holder(), identifier, v8::Number::New(info.GetIsolate(), index), info.GetIsolate())); |
+ v8SetReturnValue(info, npObjectGetProperty(info.GetIsolate(), info.Holder(), identifier, v8::Number::New(info.GetIsolate(), index))); |
} |
void npObjectGetNamedProperty(v8::Local<v8::Object> self, v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Value>& info) |
{ |
NPIdentifier identifier = getStringIdentifier(name); |
- v8SetReturnValue(info, npObjectGetProperty(self, identifier, name, info.GetIsolate())); |
+ v8SetReturnValue(info, npObjectGetProperty(info.GetIsolate(), self, identifier, name)); |
} |
void npObjectGetIndexedProperty(v8::Local<v8::Object> self, uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info) |
{ |
NPIdentifier identifier = _NPN_GetIntIdentifier(index); |
- v8SetReturnValue(info, npObjectGetProperty(self, identifier, v8::Number::New(info.GetIsolate(), index), info.GetIsolate())); |
+ v8SetReturnValue(info, npObjectGetProperty(info.GetIsolate(), self, identifier, v8::Number::New(info.GetIsolate(), index))); |
} |
void npObjectQueryProperty(v8::Local<v8::String> name, const v8::PropertyCallbackInfo<v8::Integer>& info) |
{ |
NPIdentifier identifier = getStringIdentifier(name); |
- if (npObjectGetProperty(info.Holder(), identifier, name, info.GetIsolate()).IsEmpty()) |
+ if (npObjectGetProperty(info.GetIsolate(), info.Holder(), identifier, name).IsEmpty()) |
return; |
v8SetReturnValueInt(info, 0); |
} |