Changeset 117203 in webkit

Timestamp:

May 15, 2012 7:00:00 PM (12 years ago)

Author:

fsamuel@chromium.org

Message:

[Chromium] Reset ScriptInstance in HTMLPlugInElement on WebPluginContainerImpl::setPlugin
​https://bugs.webkit.org/show_bug.cgi?id=86535

Source/WebCore:

Reviewed by Darin Fisher.

When we swap out WebPluginImpls for the Browser Plugin, the HTMLPlugInElement continues
to use a now invalid ScriptInstance, so we reset the ScriptInstance on WebPluginContainerImpl::setPlugin

• html/HTMLPlugInElement.cpp:

(WebCore::HTMLPlugInElement::resetInstance):
(WebCore):

• html/HTMLPlugInElement.h:

(HTMLPlugInElement):

Source/WebKit/chromium:

Reviewed by Darin Fisher.

• src/WebPluginContainerImpl.cpp:

(WebKit::WebPluginContainerImpl::setPlugin):
(WebKit):

• src/WebPluginContainerImpl.h:

(WebPluginContainerImpl):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLPlugInElement.cpp (modified) (1 diff)
• WebCore/html/HTMLPlugInElement.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebPluginContainerImpl.cpp (modified) (1 diff)
• WebKit/chromium/src/WebPluginContainerImpl.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-15  Fady Samuel  <fsamuel@chromium.org>
+
+        [Chromium] Reset ScriptInstance in HTMLPlugInElement on WebPluginContainerImpl::setPlugin
+        https://bugs.webkit.org/show_bug.cgi?id=86535
+
+        Reviewed by Darin Fisher.
+        
+        When we swap out WebPluginImpls for the Browser Plugin, the HTMLPlugInElement continues
+        to use a now invalid ScriptInstance, so we reset the ScriptInstance on WebPluginContainerImpl::setPlugin
+
+        * html/HTMLPlugInElement.cpp:
+        (WebCore::HTMLPlugInElement::resetInstance):
+        (WebCore):
+        * html/HTMLPlugInElement.h:
+        (HTMLPlugInElement):
+
 2012-05-15  Robert Hogan  <robert@webkit.org>
 

trunk/Source/WebCore/html/HTMLPlugInElement.cpp

@@ -89 +89 @@
 }
 
+void HTMLPlugInElement::resetInstance()
+{
+    m_instance.clear();
+}
+
 PassScriptInstance HTMLPlugInElement::getInstance()
 {

trunk/Source/WebCore/html/HTMLPlugInElement.h

@@ -40 +40 @@
 public:
     virtual ~HTMLPlugInElement();
+
+    void resetInstance();
 
     PassScriptInstance getInstance();

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-15  Fady Samuel  <fsamuel@chromium.org>
+
+        [Chromium] Reset ScriptInstance in HTMLPlugInElement on WebPluginContainerImpl::setPlugin
+        https://bugs.webkit.org/show_bug.cgi?id=86535
+
+        Reviewed by Darin Fisher.
+
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::setPlugin):
+        (WebKit):
+        * src/WebPluginContainerImpl.h:
+        (WebPluginContainerImpl):
+
 2012-05-15  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp

@@ -235 +235 @@
 }
 
+void WebPluginContainerImpl::setPlugin(WebPlugin* plugin)
+{
+    if (plugin != m_webPlugin) {
+        m_element->resetInstance();
+        m_webPlugin = plugin;
+    }
+}
+
 bool WebPluginContainerImpl::supportsPaginatedPrint() const
 {

trunk/Source/WebKit/chromium/src/WebPluginContainerImpl.h

@@ -113 +113 @@
     // This cannot be null.
     WebPlugin* plugin() { return m_webPlugin; }
-    void setPlugin(WebPlugin* plugin) { m_webPlugin = plugin; }
+    void setPlugin(WebPlugin*);
 
     // Printing interface. The plugin can support custom printing