Title: [113398] trunk/Source/WebKit2
Revision
113398
Author
[email protected]
Date
2012-04-05 18:06:57 -0700 (Thu, 05 Apr 2012)

Log Message

Crash when switching to a tab with plug-ins
https://bugs.webkit.org/show_bug.cgi?id=83339
<rdar://problem/11183338>

Reviewed by Oliver Hunt.

Add an additional check so we don't try to call into plug-ins that haven't yet been initialized.

* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::setLayerHostingMode):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (113397 => 113398)


--- trunk/Source/WebKit2/ChangeLog	2012-04-06 00:56:04 UTC (rev 113397)
+++ trunk/Source/WebKit2/ChangeLog	2012-04-06 01:06:57 UTC (rev 113398)
@@ -1,3 +1,16 @@
+2012-04-05  Anders Carlsson  <[email protected]>
+
+        Crash when switching to a tab with plug-ins
+        https://bugs.webkit.org/show_bug.cgi?id=83339
+        <rdar://problem/11183338>
+
+        Reviewed by Oliver Hunt.
+
+        Add an additional check so we don't try to call into plug-ins that haven't yet been initialized.
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebKit::PluginView::setLayerHostingMode):
+
 2012-04-05  Dean Jackson  <[email protected]>
 
         [mac] requestAnimationFrame sometimes stuck when page loads in a background tab

Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (113397 => 113398)


--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp	2012-04-06 00:56:04 UTC (rev 113397)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp	2012-04-06 01:06:57 UTC (rev 113398)
@@ -436,7 +436,7 @@
 
 void PluginView::setLayerHostingMode(LayerHostingMode layerHostingMode)
 {
-    if (!m_plugin)
+    if (!m_isInitialized || !m_plugin)
         return;
 
     m_plugin->setLayerHostingMode(layerHostingMode);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to