Changeset 74205 in webkit

Timestamp:

Dec 16, 2010 12:07:41 PM (13 years ago)

Author:

andersca@apple.com

Message:

Don't try to call plug-in member functions if the plug-in hasn't been initialized
​https://bugs.webkit.org/show_bug.cgi?id=51205
<rdar://problem/8730204>

Reviewed by Oliver Hunt.

Make sure that all PluginView functions that can be called while a plug-in has not been
initialized (if the plug-in page is in a background tab for example) have an additional
check for m_isInitialized.

• WebProcess/Plugins/PluginView.cpp:

(WebKit::PluginView::setWindowIsFocused):
(WebKit::PluginView::windowAndViewFramesChanged):
(WebKit::PluginView::platformLayer):
(WebKit::PluginView::scriptObject):
(WebKit::PluginView::privateBrowsingStateChanged):
(WebKit::PluginView::handleEvent):
(WebKit::PluginView::viewGeometryDidChange):
(WebKit::PluginView::setFocus):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PluginView.cpp (modified) (8 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-16  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Don't try to call plug-in member functions if the plug-in hasn't been initialized
+        https://bugs.webkit.org/show_bug.cgi?id=51205
+        <rdar://problem/8730204>
+
+        Make sure that all PluginView functions that can be called while a plug-in has not been
+        initialized (if the plug-in page is in a background tab for example) have an additional
+        check for m_isInitialized.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::setWindowIsFocused):
+        (WebKit::PluginView::windowAndViewFramesChanged):
+        (WebKit::PluginView::platformLayer):
+        (WebKit::PluginView::scriptObject):
+        (WebKit::PluginView::privateBrowsingStateChanged):
+        (WebKit::PluginView::handleEvent):
+        (WebKit::PluginView::viewGeometryDidChange):
+        (WebKit::PluginView::setFocus):
+
 2010-12-16  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -379 +379 @@
 void PluginView::setWindowIsFocused(bool windowIsFocused)
 {
-    if (!m_plugin)
+    if (!m_isInitialized || !m_plugin)
         return;
 
@@ -387 +387 @@
 void PluginView::windowAndViewFramesChanged(const IntRect& windowFrameInScreenCoordinates, const IntRect& viewFrameInWindowCoordinates)
 {
-    if (!m_plugin)
+    if (!m_isInitialized || !m_plugin)
         return;
 
@@ -462 +462 @@
 PlatformLayer* PluginView::platformLayer() const
 {
-    // The plug-in can be null here if it failed to initialize or hasn't yet been initialized.
-    if (!m_plugin)
+    // The plug-in can be null here if it failed to initialize.
+    if (!m_isInitialized || !m_plugin)
         return 0;
         
@@ -473 +473 @@
 {
     // The plug-in can be null here if it failed to initialize.
-    if (!m_plugin)
+    if (!m_isInitialized || !m_plugin)
         return 0;
-    
+
     NPObject* scriptableNPObject = m_plugin->pluginScriptableNPObject();
     if (!scriptableNPObject)
@@ -489 +489 @@
 {
     // The plug-in can be null here if it failed to initialize.
-    if (!m_plugin)
+    if (!m_isInitialized || !m_plugin)
         return;
 
@@ -538 +538 @@
 void PluginView::handleEvent(Event* event)
 {
-    if (!m_plugin)
+    if (!m_isInitialized || !m_plugin)
         return;
 
@@ -576 +576 @@
 void PluginView::viewGeometryDidChange()
 {
-    if (!parent() || !m_plugin || !m_isInitialized)
+    if (!m_isInitialized || !m_plugin || !parent())
         return;
 
@@ -798 +798 @@
 {
     Widget::setFocus(hasFocus);
-    
+
+    if (!m_isInitialized || !m_plugin)
+        return;
+
     m_plugin->setFocus(hasFocus);
 }