Title: [153028] branches/safari-537-branch/Source/WebCore
Revision
153028
Author
[email protected]
Date
2013-07-22 19:10:16 -0700 (Mon, 22 Jul 2013)

Log Message

Merged r152989.  <rdar://problem/13580220>

Modified Paths

Diff

Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153027 => 153028)


--- branches/safari-537-branch/Source/WebCore/ChangeLog	2013-07-23 02:08:08 UTC (rev 153027)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog	2013-07-23 02:10:16 UTC (rev 153028)
@@ -1,5 +1,25 @@
 2013-07-22  Lucas Forschler  <[email protected]>
 
+        Merge r152989
+
+    2013-07-22  Dean Jackson  <[email protected]>
+
+            PlugIn content can disappear after restarting
+            https://bugs.webkit.org/show_bug.cgi?id=118982
+
+            Reviewed by Simon Fraser.
+
+            When a snapshotted plug-in is restarted, we inserted its compositing
+            layer back into the tree, but didn't recalculate style. This meant
+            that a subsequent compositing tree operation (such as any hardware
+            animation) could cause the content to disappear.
+
+            * html/HTMLPlugInImageElement.cpp:
+            (WebCore::HTMLPlugInImageElement::setDisplayState): Force a style recalc.
+            (WebCore::HTMLPlugInImageElement::removeSnapshotTimerFired): Ditto.
+
+2013-07-22  Lucas Forschler  <[email protected]>
+
         Merge r152951
 
     2013-07-21  Andreas Kling  <[email protected]>

Modified: branches/safari-537-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp (153027 => 153028)


--- branches/safari-537-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp	2013-07-23 02:08:08 UTC (rev 153027)
+++ branches/safari-537-branch/Source/WebCore/html/HTMLPlugInImageElement.cpp	2013-07-23 02:10:16 UTC (rev 153028)
@@ -135,6 +135,7 @@
     if (state == RestartingWithPendingMouseClick || state == Restarting) {
         m_isRestartedPlugin = true;
         m_snapshotDecision = NeverSnapshot;
+        setNeedsStyleRecalc(SyntheticStyleChange);
         if (displayState() == DisplayingSnapshot)
             m_removeSnapshotTimer.startOneShot(removeSnapshotTimerDelay);
     }
@@ -428,6 +429,7 @@
 {
     m_snapshotImage = nullptr;
     m_isRestartedPlugin = false;
+    setNeedsStyleRecalc(SyntheticStyleChange);
     if (renderer())
         renderer()->repaint();
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to