Title: [181636] releases/WebKitGTK/webkit-2.8/Source/WebKit2
- Revision
- 181636
- Author
- [email protected]
- Date
- 2015-03-17 04:46:54 -0700 (Tue, 17 Mar 2015)
Log Message
Merge r181599 - ASSERT(m_plugin) on plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html
https://bugs.webkit.org/show_bug.cgi?id=142637
Reviewed by Dean Jackson.
* WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::pluginSnapshotTimerFired):
m_plugin can be legitimately null.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (181635 => 181636)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-17 11:44:32 UTC (rev 181635)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-03-17 11:46:54 UTC (rev 181636)
@@ -1,3 +1,13 @@
+2015-03-16 Alexey Proskuryakov <[email protected]>
+
+ ASSERT(m_plugin) on plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html
+ https://bugs.webkit.org/show_bug.cgi?id=142637
+
+ Reviewed by Dean Jackson.
+
+ * WebProcess/Plugins/PluginView.cpp: (WebKit::PluginView::pluginSnapshotTimerFired):
+ m_plugin can be legitimately null.
+
2015-03-16 Carlos Garcia Campos <[email protected]>
Unreviewed. Add new Notification classes to GTK+ API documentation.
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (181635 => 181636)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-03-17 11:44:32 UTC (rev 181635)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-03-17 11:46:54 UTC (rev 181636)
@@ -1738,8 +1738,6 @@
void PluginView::pluginSnapshotTimerFired()
{
- ASSERT(m_plugin);
-
#if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
HTMLPlugInImageElement& plugInImageElement = downcast<HTMLPlugInImageElement>(*m_pluginElement);
bool isPlugInOnScreen = m_webPage->plugInIntersectsSearchRect(plugInImageElement);
@@ -1747,7 +1745,7 @@
bool snapshotFound = false;
#endif
- if (m_plugin->supportsSnapshotting()) {
+ if (m_plugin && m_plugin->supportsSnapshotting()) {
// Snapshot might be 0 if plugin size is 0x0.
RefPtr<ShareableBitmap> snapshot = m_plugin->snapshot();
RefPtr<Image> snapshotImage;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
