Title: [97200] trunk/Source/WebKit2
- Revision
- 97200
- Author
- [email protected]
- Date
- 2011-10-11 17:16:22 -0700 (Tue, 11 Oct 2011)
Log Message
[Mac] Crash when opening an embedded PDF in a background tab
https://bugs.webkit.org/show_bug.cgi?id=69880
Reviewed by Darin Adler.
* WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::paint): Don't call plug-in that
doesn't even have a controller yet.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (97199 => 97200)
--- trunk/Source/WebKit2/ChangeLog 2011-10-12 00:12:29 UTC (rev 97199)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-12 00:16:22 UTC (rev 97200)
@@ -1,3 +1,13 @@
+2011-10-11 Alexey Proskuryakov <[email protected]>
+
+ [Mac] Crash when opening an embedded PDF in a background tab
+ https://bugs.webkit.org/show_bug.cgi?id=69880
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::paint): Don't call plug-in that
+ doesn't even have a controller yet.
+
2011-10-11 Beth Dakin <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=69874
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (97199 => 97200)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-10-12 00:12:29 UTC (rev 97199)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-10-12 00:16:22 UTC (rev 97200)
@@ -554,11 +554,14 @@
void PluginView::paint(GraphicsContext* context, const IntRect& dirtyRect)
{
- if (m_plugin && context->updatingControlTints())
- m_plugin->updateControlTints(context);
+ if (!m_plugin || !m_isInitialized)
+ return;
- if (context->paintingDisabled() || !m_plugin || !m_isInitialized)
+ if (context->paintingDisabled()) {
+ if (context->updatingControlTints())
+ m_plugin->updateControlTints(context);
return;
+ }
IntRect dirtyRectInWindowCoordinates = parent()->contentsToWindow(dirtyRect);
IntRect paintRectInWindowCoordinates = intersection(dirtyRectInWindowCoordinates, clipRectInWindowCoordinates());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
