Title: [181599] trunk/Source/WebKit2
- Revision
- 181599
- Author
- [email protected]
- Date
- 2015-03-16 16:58:15 -0700 (Mon, 16 Mar 2015)
Log Message
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: trunk/Source/WebKit2/ChangeLog (181598 => 181599)
--- trunk/Source/WebKit2/ChangeLog 2015-03-16 23:58:09 UTC (rev 181598)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-16 23:58:15 UTC (rev 181599)
@@ -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 Csaba Osztrogonác <[email protected]>
One more URTBF after r181578.
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (181598 => 181599)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-03-16 23:58:09 UTC (rev 181598)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2015-03-16 23:58:15 UTC (rev 181599)
@@ -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
