Changeset 147977 in webkit

Timestamp:

Apr 8, 2013, 7:43:24 PM (12 years ago)

Author:

dino@apple.com

Message:

Don't try to remove a non-existent snapshot
​https://bugs.webkit.org/show_bug.cgi?id=114226
<rdar://problem/13604480>

Reviewed by Darin Adler.

We don't need to trigger the timer to remove a snapshot
if there was never a snapshot displayed.

• html/HTMLPlugInImageElement.cpp:

(WebCore::HTMLPlugInImageElement::setDisplayState): Detect if we're moving from the DisplayingSnapshot state.
(WebCore::HTMLPlugInImageElement::removeSnapshotTimerFired): Guard against a missing renderer.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLPlugInImageElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-08  Dean Jackson  <dino@apple.com>
+
+        Don't try to remove a non-existent snapshot
+        https://bugs.webkit.org/show_bug.cgi?id=114226
+        <rdar://problem/13604480>
+
+        Reviewed by Darin Adler.
+
+        We don't need to trigger the timer to remove a snapshot
+        if there was never a snapshot displayed.
+
+        * html/HTMLPlugInImageElement.cpp:
+        (WebCore::HTMLPlugInImageElement::setDisplayState): Detect if we're moving from the DisplayingSnapshot state.
+        (WebCore::HTMLPlugInImageElement::removeSnapshotTimerFired): Guard against a missing renderer.
+
 2013-04-08  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -94 +94 @@
 void HTMLPlugInImageElement::setDisplayState(DisplayState state)
 {
+#if PLATFORM(MAC)
+    if (state == RestartingWithPendingMouseClick || state == Restarting) {
+        m_restartedPlugin = true;
+        if (displayState() == DisplayingSnapshot)
+            m_removeSnapshotTimer.startOneShot(removeSnapshotTimerDelay);
+    }
+#endif
+
     HTMLPlugInElement::setDisplayState(state);
-    if (displayState() == DisplayingSnapshot)
+
+    if (state == DisplayingSnapshot)
         m_swapRendererTimer.startOneShot(0);
-
-#if PLATFORM(MAC)
-    if (displayState() == RestartingWithPendingMouseClick || displayState() == Restarting) {
-        m_restartedPlugin = true;
-        m_removeSnapshotTimer.startOneShot(removeSnapshotTimerDelay);
-    }
-#endif
 }
 
@@ -416 +418 @@
     m_snapshotImage = nullptr;
     m_restartedPlugin = false;
-    renderer()->repaint();
+    if (renderer())
+        renderer()->repaint();
 }