Changeset 70781 in webkit

Timestamp:

Oct 28, 2010 9:14:34 AM (14 years ago)

Author:

Adam Roben

Message:

Make PluginView retain its HTMLPlugInElement

This matches WebKit/mac's WebBaseNetscapePluginView. WebCore didn't do
this, but had a very different mechanism for implementing NPRuntime
that didn't require it.

Fixes <​http://webkit.org/b/46672> <rdar://problem/8484208> Crash
(preceded by assertion) in Node::document when running
plugins/document-open.html in WebKit2 on Windows

Reviewed by Anders Carlsson.

LayoutTests:

Remove plugins/document-open.html from the win-wk2 Skipped file

It passes now that <​http://webkit.org/b/46672> is fixed.

• platform/win-wk2/Skipped:

WebKit2:

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::create): Moved here from the header file so that
clients of the header file won't have to pull in HTMLPlugInElement.h.
Changed to take a PassRefPtr<HTMLPlugInElement>.
(WebKit::PluginView::PluginView): Changed to take a
PassRefPtr<HTMLPlugInElement> and to use m_pluginElement later (because
the parameter to the function will be nulled-out after assigning into
m_pluginElement).
(WebKit::PluginView::pluginElementNPObject): Updated for change to m_pluginElement.

• WebProcess/Plugins/PluginView.h: Made m_pluginElement a RefPtr.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/win-wk2/Skipped (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (2 diffs)
• WebKit2/WebProcess/Plugins/PluginView.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-28  Adam Roben  <aroben@apple.com>
+
+        Remove plugins/document-open.html from the win-wk2 Skipped file
+
+        It passes now that <http://webkit.org/b/46672> is fixed.
+
+        Reviewed by Anders Carlsson.
+
+        * platform/win-wk2/Skipped:
+
 2010-10-28  Adam Roben  <aroben@apple.com>
 

trunk/LayoutTests/platform/win-wk2/Skipped

@@ -79 +79 @@
 platform/win/plugins/plugin-delayed-destroy.html
 
-# http://webkit.org/b/46712
-plugins/document-open.html
-
 # http://webkit.org/b/46715
 plugins/npruntime/invoke-failure.html

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-28  Adam Roben  <aroben@apple.com>
+
+        Make PluginView retain its HTMLPlugInElement
+
+        This matches WebKit/mac's WebBaseNetscapePluginView. WebCore didn't do
+        this, but had a very different mechanism for implementing NPRuntime
+        that didn't require it.
+
+        Fixes <http://webkit.org/b/46672> <rdar://problem/8484208> Crash
+        (preceded by assertion) in Node::document when running
+        plugins/document-open.html in WebKit2 on Windows
+
+        Reviewed by Anders Carlsson.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::create): Moved here from the header file so that
+        clients of the header file won't have to pull in HTMLPlugInElement.h.
+        Changed to take a PassRefPtr<HTMLPlugInElement>.
+        (WebKit::PluginView::PluginView): Changed to take a
+        PassRefPtr<HTMLPlugInElement> and to use m_pluginElement later (because
+        the parameter to the function will be nulled-out after assigning into
+        m_pluginElement).
+        (WebKit::PluginView::pluginElementNPObject): Updated for change to m_pluginElement.
+
+        * WebProcess/Plugins/PluginView.h: Made m_pluginElement a RefPtr.
+
 2010-10-28  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -236 +236 @@
     return webPage;
 }
-        
-PluginView::PluginView(HTMLPlugInElement* pluginElement, PassRefPtr<Plugin> plugin, const Plugin::Parameters& parameters)
+
+PassRefPtr<PluginView> PluginView::create(PassRefPtr<HTMLPlugInElement> pluginElement, PassRefPtr<Plugin> plugin, const Plugin::Parameters& parameters)
+{
+    return adoptRef(new PluginView(pluginElement, plugin, parameters));
+}
+
+PluginView::PluginView(PassRefPtr<HTMLPlugInElement> pluginElement, PassRefPtr<Plugin> plugin, const Plugin::Parameters& parameters)
     : PluginViewBase(0)
     , m_pluginElement(pluginElement)
     , m_plugin(plugin)
-    , m_webPage(webPage(pluginElement))
+    , m_webPage(webPage(m_pluginElement.get()))
     , m_parameters(parameters)
     , m_isInitialized(false)
@@ -785 +790 @@
 
     // FIXME: Handle JavaScript being disabled.
-    JSObject* object = frame()->script()->jsObjectForPluginElement(m_pluginElement);
+    JSObject* object = frame()->script()->jsObjectForPluginElement(m_pluginElement.get());
     ASSERT(object);
 

trunk/WebKit2/WebProcess/Plugins/PluginView.h

@@ -48 +48 @@
 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)
-    {
-        return adoptRef(new PluginView(pluginElement, plugin, parameters));
-    }
+    static PassRefPtr<PluginView> create(PassRefPtr<WebCore::HTMLPlugInElement>, PassRefPtr<Plugin>, const Plugin::Parameters&);
 
     WebCore::Frame* frame();
@@ -69 +66 @@
 
 private:
-    PluginView(WebCore::HTMLPlugInElement*, PassRefPtr<Plugin>, const Plugin::Parameters& parameters);
+    PluginView(PassRefPtr<WebCore::HTMLPlugInElement>, PassRefPtr<Plugin>, const Plugin::Parameters& parameters);
     virtual ~PluginView();
 
@@ -138 +135 @@
     virtual void didFailLoad(WebFrame*, bool wasCancelled);
 
-    WebCore::HTMLPlugInElement* m_pluginElement;
+    RefPtr<WebCore::HTMLPlugInElement> m_pluginElement;
     RefPtr<Plugin> m_plugin;
     WebPage* m_webPage;