Title: [151622] trunk
Revision
151622
Author
[email protected]
Date
2013-06-16 09:57:14 -0700 (Sun, 16 Jun 2013)

Log Message

webkit-backface-visibility on a parent element stops background-position from updating
https://bugs.webkit.org/show_bug.cgi?id=116319

Source/WebCore:

Reviewed by Darin Adler.

The optimization added in r102952 was incorrect in the case where a style change
resulted in a positioned-movement-only layout but also required a repaint; it assumed
that a composited layer did not need to be repainted for a a positioned-movement-only layout.

Fix by making RenderObject::setNeedsLayoutForPositionedMovement() check whether the
style change requires a repaint, and calling setLayerNeedsFullRepaint() in that situation.

Test: compositing/repaint/positioned-movement.html

* rendering/RenderLayer.h: RepaintStatus values do not need to be bit flags.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::setStyle): Pass the old style to setNeedsPositionedMovementLayout().
(WebCore::RenderObject::styleDidChange): Ditto.
* rendering/RenderObject.h:
(WebCore::RenderObject::setNeedsPositionedMovementLayout): Now takes a const RenderStyle*.
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::diff): Remove a comment now that this bug is fixed.
(WebCore::RenderStyle::diffRequiresRepaint): Public wrapper for changeRequiresRepaint().
That function never uses contextSensitiveProperties so we can safely ignore them.
* rendering/style/RenderStyle.h: Expose a way to call changeRequiresRepaint().

LayoutTests:

Reviewed by Darin Adler.

Test that does a positioned-movement-only layout and dumps a layer tree with
repaint rects.

* compositing/repaint/positioned-movement-expected.txt: Added.
* compositing/repaint/positioned-movement.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (151621 => 151622)


--- trunk/LayoutTests/ChangeLog	2013-06-16 15:06:30 UTC (rev 151621)
+++ trunk/LayoutTests/ChangeLog	2013-06-16 16:57:14 UTC (rev 151622)
@@ -1,3 +1,16 @@
+2013-06-15  Simon Fraser  <[email protected]>
+
+        webkit-backface-visibility on a parent element stops background-position from updating
+        https://bugs.webkit.org/show_bug.cgi?id=116319
+
+        Reviewed by Darin Adler.
+        
+        Test that does a positioned-movement-only layout and dumps a layer tree with
+        repaint rects.
+
+        * compositing/repaint/positioned-movement-expected.txt: Added.
+        * compositing/repaint/positioned-movement.html: Added.
+
 2013-06-14  Robert Hogan  <[email protected]>
 
         REGRESSION (r148367): Facebook and Twitter icons at macworld.com are stacked vertically, obscuring Twitter one

Added: trunk/LayoutTests/compositing/repaint/positioned-movement-expected.txt (0 => 151622)


--- trunk/LayoutTests/compositing/repaint/positioned-movement-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/compositing/repaint/positioned-movement-expected.txt	2013-06-16 16:57:14 UTC (rev 151622)
@@ -0,0 +1,20 @@
+(GraphicsLayer
+  (bounds 800.00 600.00)
+  (children 1
+    (GraphicsLayer
+      (bounds 800.00 600.00)
+      (contentsOpaque 1)
+      (children 1
+        (GraphicsLayer
+          (position 110.00 110.00)
+          (bounds 400.00 400.00)
+          (drawsContent 1)
+          (repaint rects
+            (rect 0.00 0.00 400.00 400.00)
+          )
+        )
+      )
+    )
+  )
+)
+

Added: trunk/LayoutTests/compositing/repaint/positioned-movement.html (0 => 151622)


--- trunk/LayoutTests/compositing/repaint/positioned-movement.html	                        (rev 0)
+++ trunk/LayoutTests/compositing/repaint/positioned-movement.html	2013-06-16 16:57:14 UTC (rev 151622)
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+
+<html>
+<head>
+    <style>
+        .box {
+            position: absolute;
+            top: 10px;
+            left: 10px;
+            width: 400px;
+            height: 400px;
+            background-image: url('../resources/alpha-blocks.png');
+            background-size: 400px 400px;
+        }
+        
+        #box.moved {
+            background-position: -100px -100px;
+            top: 110px;
+            left: 110px;
+        }
+        
+        .composited {
+            -webkit-transform: translateZ(0);
+        }
+    </style>
+    <script>
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
+        }
+
+        function test()
+        {
+            window.setTimeout(function() {
+                document.body.offsetTop;
+                if (window.internals)
+                    window.internals.startTrackingRepaints(document);
+
+                document.getElementById('box').classList.add('moved');
+
+                if (window.internals)
+                    document.getElementById('repaintRects').textContent = window.internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_REPAINT_RECTS);
+
+                if (window.testRunner)
+                    testRunner.notifyDone();
+            }, 0);
+        }
+        window.addEventListener('load', test, false);
+    </script>
+</head>
+<body>
+
+    <div id="box" class="composited box"></div>
+    <pre id="repaintRects"></pre>
+</body>
+</html>

Modified: trunk/Source/WebCore/ChangeLog (151621 => 151622)


--- trunk/Source/WebCore/ChangeLog	2013-06-16 15:06:30 UTC (rev 151621)
+++ trunk/Source/WebCore/ChangeLog	2013-06-16 16:57:14 UTC (rev 151622)
@@ -1,3 +1,31 @@
+2013-06-15  Simon Fraser  <[email protected]>
+
+        webkit-backface-visibility on a parent element stops background-position from updating
+        https://bugs.webkit.org/show_bug.cgi?id=116319
+
+        Reviewed by Darin Adler.
+
+        The optimization added in r102952 was incorrect in the case where a style change
+        resulted in a positioned-movement-only layout but also required a repaint; it assumed
+        that a composited layer did not need to be repainted for a a positioned-movement-only layout.
+        
+        Fix by making RenderObject::setNeedsLayoutForPositionedMovement() check whether the
+        style change requires a repaint, and calling setLayerNeedsFullRepaint() in that situation.
+
+        Test: compositing/repaint/positioned-movement.html
+
+        * rendering/RenderLayer.h: RepaintStatus values do not need to be bit flags.
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::setStyle): Pass the old style to setNeedsPositionedMovementLayout().
+        (WebCore::RenderObject::styleDidChange): Ditto.
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::setNeedsPositionedMovementLayout): Now takes a const RenderStyle*.
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::diff): Remove a comment now that this bug is fixed.
+        (WebCore::RenderStyle::diffRequiresRepaint): Public wrapper for changeRequiresRepaint().
+        That function never uses contextSensitiveProperties so we can safely ignore them.
+        * rendering/style/RenderStyle.h: Expose a way to call changeRequiresRepaint().
+
 2013-06-15  Darin Adler  <[email protected]>
 
         Try to fix iOS after last Pasteboard change.

Modified: trunk/Source/WebCore/rendering/RenderLayer.h (151621 => 151622)


--- trunk/Source/WebCore/rendering/RenderLayer.h	2013-06-16 15:06:30 UTC (rev 151621)
+++ trunk/Source/WebCore/rendering/RenderLayer.h	2013-06-16 16:57:14 UTC (rev 151622)
@@ -79,9 +79,9 @@
 enum IncludeSelfOrNot { IncludeSelf, ExcludeSelf };
 
 enum RepaintStatus {
-    NeedsNormalRepaint = 0,
-    NeedsFullRepaint = 1 << 0,
-    NeedsFullRepaintForPositionedMovementLayout = 1 << 1
+    NeedsNormalRepaint,
+    NeedsFullRepaint,
+    NeedsFullRepaintForPositionedMovementLayout
 };
 
 class ClipRect {

Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (151621 => 151622)


--- trunk/Source/WebCore/rendering/RenderObject.cpp	2013-06-16 15:06:30 UTC (rev 151621)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp	2013-06-16 16:57:14 UTC (rev 151622)
@@ -1868,9 +1868,9 @@
         if (updatedDiff == StyleDifferenceLayout)
             setNeedsLayoutAndPrefWidthsRecalc();
         else if (updatedDiff == StyleDifferenceLayoutPositionedMovementOnly)
-            setNeedsPositionedMovementLayout();
+            setNeedsPositionedMovementLayout(oldStyle.get());
         else if (updatedDiff == StyleDifferenceSimplifiedLayoutAndPositionedMovement) {
-            setNeedsPositionedMovementLayout();
+            setNeedsPositionedMovementLayout(oldStyle.get());
             setNeedsSimplifiedNormalFlowLayout();
         } else if (updatedDiff == StyleDifferenceSimplifiedLayout)
             setNeedsSimplifiedNormalFlowLayout();
@@ -2022,10 +2022,10 @@
         else
             setNeedsSimplifiedNormalFlowLayout();
     } else if (diff == StyleDifferenceSimplifiedLayoutAndPositionedMovement) {
-        setNeedsPositionedMovementLayout();
+        setNeedsPositionedMovementLayout(oldStyle);
         setNeedsSimplifiedNormalFlowLayout();
     } else if (diff == StyleDifferenceLayoutPositionedMovementOnly)
-        setNeedsPositionedMovementLayout();
+        setNeedsPositionedMovementLayout(oldStyle);
 
     // Don't check for repaint here; we need to wait until the layer has been
     // updated by subclasses before we know if we have to repaint (in setStyle()).

Modified: trunk/Source/WebCore/rendering/RenderObject.h (151621 => 151622)


--- trunk/Source/WebCore/rendering/RenderObject.h	2013-06-16 15:06:30 UTC (rev 151621)
+++ trunk/Source/WebCore/rendering/RenderObject.h	2013-06-16 16:57:14 UTC (rev 151622)
@@ -665,7 +665,7 @@
     void markContainingBlocksForLayout(bool scheduleRelayout = true, RenderObject* newRoot = 0);
     void setNeedsLayout(bool needsLayout, MarkingBehavior = MarkContainingBlockChain);
     void setChildNeedsLayout(bool childNeedsLayout, MarkingBehavior = MarkContainingBlockChain);
-    void setNeedsPositionedMovementLayout();
+    void setNeedsPositionedMovementLayout(const RenderStyle* oldStyle);
     void setNeedsSimplifiedNormalFlowLayout();
     void setPreferredLogicalWidthsDirty(bool, MarkingBehavior = MarkContainingBlockChain);
     void invalidateContainerPreferredLogicalWidths();
@@ -1244,15 +1244,19 @@
     }
 }
 
-inline void RenderObject::setNeedsPositionedMovementLayout()
+inline void RenderObject::setNeedsPositionedMovementLayout(const RenderStyle* oldStyle)
 {
     bool alreadyNeededLayout = needsPositionedMovementLayout();
     setNeedsPositionedMovementLayout(true);
     ASSERT(!isSetNeedsLayoutForbidden());
     if (!alreadyNeededLayout) {
         markContainingBlocksForLayout();
-        if (hasLayer())
-            setLayerNeedsFullRepaintForPositionedMovementLayout();
+        if (hasLayer()) {
+            if (oldStyle && m_style->diffRequiresRepaint(oldStyle))
+                setLayerNeedsFullRepaint();
+            else
+                setLayerNeedsFullRepaintForPositionedMovementLayout();
+        }
     }
 }
 

Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (151621 => 151622)


--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp	2013-06-16 15:06:30 UTC (rev 151621)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp	2013-06-16 16:57:14 UTC (rev 151622)
@@ -767,8 +767,6 @@
         return svgChange;
 #endif
 
-    // FIXME: we need to also check for repaint changes after a PositionedMovementOnly change
-    // on a composited layer: https://bugs.webkit.org/show_bug.cgi?id=116319
     if (changeRequiresPositionedLayoutOnly(other, changedContextSensitiveProperties))
         return StyleDifferenceLayoutPositionedMovementOnly;
 
@@ -794,6 +792,12 @@
     return StyleDifferenceEqual;
 }
 
+bool RenderStyle::diffRequiresRepaint(const RenderStyle* style) const
+{
+    unsigned changedContextSensitiveProperties = 0;
+    return changeRequiresRepaint(style, changedContextSensitiveProperties);
+}
+
 void RenderStyle::setClip(Length top, Length right, Length bottom, Length left)
 {
     StyleVisualData* data = ""

Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (151621 => 151622)


--- trunk/Source/WebCore/rendering/style/RenderStyle.h	2013-06-16 15:06:30 UTC (rev 151621)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h	2013-06-16 16:57:14 UTC (rev 151622)
@@ -1535,6 +1535,7 @@
     bool inheritedDataShared(const RenderStyle*) const;
 
     StyleDifference diff(const RenderStyle*, unsigned& changedContextSensitiveProperties) const;
+    bool diffRequiresRepaint(const RenderStyle*) const;
 
     bool isDisplayReplacedType() const { return isDisplayReplacedType(display()); }
     bool isDisplayInlineType() const { return isDisplayInlineType(display()); }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to