| Index: Source/bindings/v8/ScriptController.cpp
|
| diff --git a/Source/bindings/v8/ScriptController.cpp b/Source/bindings/v8/ScriptController.cpp
|
| index 0e672cf9ba68eb828bf17c9a2ebd0929eecc7625..271c72aef0dcda8092112d0865216ae502588624 100644
|
| --- a/Source/bindings/v8/ScriptController.cpp
|
| +++ b/Source/bindings/v8/ScriptController.cpp
|
| @@ -345,16 +345,16 @@ void ScriptController::disableEval(const String& errorMessage)
|
| v8Context->SetErrorMessageForCodeGenerationFromStrings(v8String(m_isolate, errorMessage));
|
| }
|
|
|
| -PassRefPtr<SharedPersistent<v8::Object> > ScriptController::createPluginWrapper(Widget* widget)
|
| +ScriptValue ScriptController::createPluginWrapper(Widget* widget)
|
| {
|
| ASSERT(widget);
|
|
|
| if (!widget->isPluginView())
|
| - return 0;
|
| + return ScriptValue();
|
|
|
| NPObject* npObject = toPluginView(widget)->scriptableObject();
|
| if (!npObject)
|
| - return 0;
|
| + return ScriptValue();
|
|
|
| // Frame Memory Management for NPObjects
|
| // -------------------------------------
|
| @@ -380,12 +380,12 @@ PassRefPtr<SharedPersistent<v8::Object> > ScriptController::createPluginWrapper(
|
| // NPObject as part of its wrapper. However, before accessing the object
|
| // it must consult the _NPN_Registry.
|
|
|
| - v8::Local<v8::Object> wrapper = createV8ObjectForNPObject(npObject, 0, m_isolate);
|
| + v8::Handle<v8::Object> wrapper = createV8ObjectForNPObject(npObject, 0, m_isolate);
|
|
|
| // Track the plugin object. We've been given a reference to the object.
|
| m_pluginObjects.set(widget, npObject);
|
|
|
| - return SharedPersistent<v8::Object>::create(wrapper, m_isolate);
|
| + return ScriptValue(wrapper, m_isolate);
|
| }
|
|
|
| void ScriptController::cleanupScriptObjectsForPlugin(Widget* nativeHandle)
|
|
|