Changeset 181133 in webkit

Timestamp:

Mar 5, 2015 8:38:01 PM (9 years ago)

Author:

Chris Dumez

Message:

Document::recalcStyle() shouldn't call viewportContentsChanged() if there is a pending layout
​https://bugs.webkit.org/show_bug.cgi?id=142140

Reviewed by Darin Adler.

Stop calling FrameView::viewportContentsChanged() in Document::recalcStyle()
if there is a layout pending to avoid doing unncessary work. If there is a
layout pending, we don't need to do anything because viewportContentsChanged()
will be called after layout.

We only need to call FrameView::viewportContentsChanged() in
Document::recalcStyle() if a style recalc does not cause a layout. For e.g.
a '-webkit-transform' could make an animated GIF visible without causing a
layout, in which case we need to resume the animated GIF after style recalc.

No new tests, already covered by:
fast/images/animated-gif-webkit-transform.html

• dom/Document.cpp:

(WebCore::Document::recalcStyle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-05  Chris Dumez  <cdumez@apple.com>
+
+        Document::recalcStyle() shouldn't call viewportContentsChanged() if there is a pending layout
+        https://bugs.webkit.org/show_bug.cgi?id=142140
+
+        Reviewed by Darin Adler.
+
+        Stop calling FrameView::viewportContentsChanged() in Document::recalcStyle()
+        if there is a layout pending to avoid doing unncessary work. If there is a
+        layout pending, we don't need to do anything because viewportContentsChanged()
+        will be called after layout.
+
+        We only need to call FrameView::viewportContentsChanged() in
+        Document::recalcStyle() if a style recalc does not cause a layout. For e.g.
+        a '-webkit-transform' could make an animated GIF visible without causing a
+        layout, in which case we need to resume the animated GIF after style recalc.
+
+        No new tests, already covered by:
+        fast/images/animated-gif-webkit-transform.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::recalcStyle):
+
 2015-03-05  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1791 +1791 @@
 
     // Some animated images may now be inside the viewport due to style recalc,
-    // resume them if necessary.
-    frameView.viewportContentsChanged();
+    // resume them if necessary if there is no layout pending. Otherwise, we'll
+    // check if they need to be resumed after layout.
+    if (!frameView.needsLayout())
+        frameView.viewportContentsChanged();
 
     // As a result of the style recalculation, the currently hovered element might have been