Changeset 181636 in webkit

Timestamp:

Mar 17, 2015, 4:46:54 AM (11 years ago)

Author:

Carlos Garcia Campos

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.

Location:

releases/WebKitGTK/webkit-2.8/Source/WebKit2

Files:

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

releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-16  Alexey Proskuryakov  <ap@apple.com>
+
+        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  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -1739 +1739 @@
 void PluginView::pluginSnapshotTimerFired()
 {
-    ASSERT(m_plugin);
-
 #if ENABLE(PRIMARY_SNAPSHOTTED_PLUGIN_HEURISTIC)
     HTMLPlugInImageElement& plugInImageElement = downcast<HTMLPlugInImageElement>(*m_pluginElement);
@@ -1748 +1746 @@
 #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();