Changeset 64154 in webkit

Timestamp:

Jul 27, 2010 1:55:29 PM (14 years ago)

Author:

andersca@apple.com

Message:

Expose interface for returning the plug-in script JSObject
​https://bugs.webkit.org/show_bug.cgi?id=43074

Reviewed by Sam Weinig.

WebCore:

PluginViewBase::scriptObject should be a virtual function.

• plugins/PluginViewBase.h:

(WebCore::PluginViewBase::scriptObject):

WebKit2:

• WebProcess/Plugins/NPRuntimeObjectMap.cpp:

(WebKit::NPRuntimeObjectMap::getOrCreateJSObject):
Add empty stub.

• WebProcess/Plugins/NPRuntimeObjectMap.h:
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::pluginScriptableNPObject):
Ask the plug-in for it's scriptable NPObject.

• WebProcess/Plugins/Netscape/NetscapePlugin.h:
• WebProcess/Plugins/Plugin.h:

Add pluginScritableNPObject.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::PluginView):
Call PluginViewBase constructor.

(WebKit::PluginView::scriptObject):
Ask the plug-in for its scriptable object and wrap it.

• WebProcess/Plugins/PluginView.h:

PluginView now inherits from PluginViewBase.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/plugins/PluginViewBase.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp (modified) (1 diff)
• WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h (modified) (2 diffs)
• WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (modified) (1 diff)
• WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h (modified) (1 diff)
• WebKit2/WebProcess/Plugins/Plugin.h (modified) (2 diffs)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (3 diffs)
• WebKit2/WebProcess/Plugins/PluginView.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-27  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Expose interface for returning the plug-in script JSObject
+        https://bugs.webkit.org/show_bug.cgi?id=43074
+
+        PluginViewBase::scriptObject should be a virtual function.
+
+        * plugins/PluginViewBase.h:
+        (WebCore::PluginViewBase::scriptObject):
+
 2010-07-27  Jian Li  <jianli@chromium.org>
 

trunk/WebCore/plugins/PluginViewBase.h

@@ -45 +45 @@
 #endif
 
-    JSC::JSObject* scriptObject(JSC::ExecState*, JSC::JSGlobalObject*) { return 0; }
+    virtual JSC::JSObject* scriptObject(JSC::ExecState*, JSC::JSGlobalObject*) { return 0; }
 
 protected:

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-07-27  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Expose interface for returning the plug-in script JSObject
+        https://bugs.webkit.org/show_bug.cgi?id=43074
+
+        * WebProcess/Plugins/NPRuntimeObjectMap.cpp:
+        (WebKit::NPRuntimeObjectMap::getOrCreateJSObject):
+        Add empty stub.
+
+        * WebProcess/Plugins/NPRuntimeObjectMap.h:
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::pluginScriptableNPObject):
+        Ask the plug-in for it's scriptable NPObject.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.h:
+        * WebProcess/Plugins/Plugin.h:
+        Add pluginScritableNPObject.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::PluginView):
+        Call PluginViewBase constructor.
+
+        (WebKit::PluginView::scriptObject):
+        Ask the plug-in for its scriptable object and wrap it.
+
+        * WebProcess/Plugins/PluginView.h:
+        PluginView now inherits from PluginViewBase.
+
 2010-07-27  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.cpp

@@ -63 +63 @@
 }
 
+JSObject* NPRuntimeObjectMap::getOrCreateJSObject(NPObject*, ExecState*, JSGlobalObject*)
+{
+    // FIXME: Implement.
+    return 0;
+}
+
 void NPRuntimeObjectMap::invalidate()
 {

trunk/WebKit2/WebProcess/Plugins/NPRuntimeObjectMap.h

@@ -33 +33 @@
 namespace JSC {
     class ExecState;
+    class JSGlobalObject;
     class JSObject;
 }
@@ -46 +47 @@
     explicit NPRuntimeObjectMap(PluginView*);
 
-    // Returns an NPObject that wraps the given JavaScript object. If there is already an NPObject that wraps this JSObject, it will
+    // Returns an NPObject that wraps the given JSObject object. If there is already an NPObject that wraps this JSObject, it will
     // retain it and return it.
     NPObject* getOrCreateNPObject(JSC::JSObject*);
 
     void npJSObjectDestroyed(NPJSObject*);
+
+    // Returns a JSObject object that wraps the given NPObject.
+    JSC::JSObject* getOrCreateJSObject(NPObject*, JSC::ExecState*, JSC::JSGlobalObject*);
+
 
     // Called when the plug-in is destroyed. Will invalidate all the NPObjects.

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

@@ -439 +439 @@
 }
 
+NPObject* NetscapePlugin::pluginScriptableNPObject()
+{
+    NPObject* scriptableNPObject = 0;
+    
+    if (NPP_GetValue(NPPVpluginScriptableNPObject, &scriptableNPObject) != NPERR_NO_ERROR)
+        return 0;
+    
+    return scriptableNPObject;
+}
+
 PluginController* NetscapePlugin::controller()
 {

trunk/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h

@@ -117 +117 @@
     virtual bool handleMouseLeaveEvent(const WebMouseEvent&);
     virtual void setFocus(bool);
+    virtual NPObject* pluginScriptableNPObject();
 
     virtual PluginController* controller();

trunk/WebKit2/WebProcess/Plugins/Plugin.h

@@ -30 +30 @@
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
+
+struct NPObject;
 
 namespace WebCore {
@@ -105 +107 @@
     virtual void setFocus(bool) = 0;
 
+    // Get the NPObject that corresponds to the plug-in's scriptable object. Returns a retained object.
+    virtual NPObject* pluginScriptableNPObject() = 0;
+
     // Returns the plug-in controller for this plug-in.
     // FIXME: We could just have the controller be a member variable of Plugin.

trunk/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -26 +26 @@
 #include "PluginView.h"
 
+#include "NPRuntimeUtilities.h"
 #include "Plugin.h"
 #include "WebEvent.h"
@@ -210 +211 @@
 
 PluginView::PluginView(WebCore::HTMLPlugInElement* pluginElement, PassRefPtr<Plugin> plugin, const Plugin::Parameters& parameters)
-    : m_pluginElement(pluginElement)
+    : PluginViewBase(0)
+    , m_pluginElement(pluginElement)
     , m_plugin(plugin)
     , m_parameters(parameters)
@@ -280 +282 @@
 }
 
+JSObject* PluginView::scriptObject(ExecState* exec, JSGlobalObject* globalObject)
+{
+    NPObject* scriptableNPObject = m_plugin->pluginScriptableNPObject();
+    if (!scriptableNPObject)
+        return 0;
+
+    JSObject* jsObject = m_npRuntimeObjectMap.getOrCreateJSObject(scriptableNPObject, exec, globalObject);
+    releaseNPObject(scriptableNPObject);
+
+    return jsObject;
+}
+
 void PluginView::setFrameRect(const WebCore::IntRect& rect)
 {

trunk/WebKit2/WebProcess/Plugins/PluginView.h

@@ -34 +34 @@
 
 #include <WebCore/MediaCanStartListener.h>
-#include <WebCore/Widget.h>
+#include <WebCore/PluginViewBase.h>
 #include <wtf/Deque.h>
 
@@ -46 +46 @@
 namespace WebKit {
 
-class PluginView : public WebCore::Widget, WebCore::MediaCanStartListener, PluginController, WebFrame::LoadListener {
+class PluginView : public WebCore::PluginViewBase, WebCore::MediaCanStartListener, PluginController, WebFrame::LoadListener {
 public:
     static PassRefPtr<PluginView> create(WebCore::HTMLPlugInElement* pluginElement, PassRefPtr<Plugin> plugin, const Plugin::Parameters& parameters)
@@ -81 +81 @@
     void cancelAllStreams();
 
+    // WebCore::PluginViewBase
+    virtual JSC::JSObject* scriptObject(JSC::ExecState*, JSC::JSGlobalObject*);
+    
     // WebCore::Widget
     virtual void setFrameRect(const WebCore::IntRect&);