Changeset 160717 in webkit

Timestamp:

Dec 17, 2013 10:46:04 AM (10 years ago)

Author:

mihnea@adobe.com

Message:

[CSSRegions] Incorrect repaint of fixed element with transformed parent
​https://bugs.webkit.org/show_bug.cgi?id=125756

Reviewed by Darin Adler.

Source/WebCore:

When collecting the layers for fixed positioned elements with named flow
as a containing block, use layers collection at named flow layer level
instead of relying on the positioned elements collection.

Modified also FlowThreadController::collectFixedPositionedLayers function
to always return the layers sorted by z-index, as this operation was always
done at the call sites.

Tests: fast/regions/repaint/fixed-in-named-flow-cb-changed.html

fast/regions/repaint/fixed-in-named-flow-cb-changed2.html

• rendering/FlowThreadController.cpp:

(WebCore::compareZIndex):
(WebCore::FlowThreadController::collectFixedPositionedLayers):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::paintFixedLayersInNamedFlows):
(WebCore::RenderLayer::hitTestFixedLayersInNamedFlows):

LayoutTests:

Add tests for a fixed positioned element with a parent that:

1. dynamically gets a transform, in which case the fixed positioned element should be positioned

relative to its parent

2. dynamically loses its transform, in which case the fixed positioned element should be positioned

relative to the view.

• fast/regions/repaint/fixed-in-named-flow-cb-changed-expected.txt: Added.
• fast/regions/repaint/fixed-in-named-flow-cb-changed.html: Added.
• fast/regions/repaint/fixed-in-named-flow-cb-changed2-expected.txt: Added.
• fast/regions/repaint/fixed-in-named-flow-cb-changed2.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed-expected.txt (added)
• LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed.html (added)
• LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed2-expected.txt (added)
• LayoutTests/fast/regions/repaint/fixed-in-named-flow-cb-changed2.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/FlowThreadController.cpp (modified) (3 diffs)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-12-17  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] Incorrect repaint of fixed element with transformed parent
+        https://bugs.webkit.org/show_bug.cgi?id=125756
+
+        Reviewed by Darin Adler.
+
+        Add tests for a fixed positioned element with a parent that:
+        1. dynamically gets a transform, in which case the fixed positioned element should be positioned
+        relative to its parent
+        2. dynamically loses its transform, in which case the fixed positioned element should be positioned
+        relative to the view.
+
+        * fast/regions/repaint/fixed-in-named-flow-cb-changed-expected.txt: Added.
+        * fast/regions/repaint/fixed-in-named-flow-cb-changed.html: Added.
+        * fast/regions/repaint/fixed-in-named-flow-cb-changed2-expected.txt: Added.
+        * fast/regions/repaint/fixed-in-named-flow-cb-changed2.html: Added.
+
 2013-12-17  Bem Jones-Bey  <bjonesbe@adobe.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-17  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] Incorrect repaint of fixed element with transformed parent
+        https://bugs.webkit.org/show_bug.cgi?id=125756
+
+        Reviewed by Darin Adler.
+
+        When collecting the layers for fixed positioned elements with named flow
+        as a containing block, use layers collection at named flow layer level
+        instead of relying on the positioned elements collection.
+
+        Modified also FlowThreadController::collectFixedPositionedLayers function
+        to always return the layers sorted by z-index, as this operation was always
+        done at the call sites.
+
+        Tests: fast/regions/repaint/fixed-in-named-flow-cb-changed.html
+               fast/regions/repaint/fixed-in-named-flow-cb-changed2.html
+
+        * rendering/FlowThreadController.cpp:
+        (WebCore::compareZIndex):
+        (WebCore::FlowThreadController::collectFixedPositionedLayers):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::paintFixedLayersInNamedFlows):
+        (WebCore::RenderLayer::hitTestFixedLayersInNamedFlows):
+
 2013-12-17  Bem Jones-Bey  <bjonesbe@adobe.com>
 

trunk/Source/WebCore/rendering/FlowThreadController.cpp

@@ -29 +29 @@
 
 #include "config.h"
-
 #include "FlowThreadController.h"
 
@@ -281 +280 @@
 }
 
-// Collect the fixed positioned layers that have the named flows as containing block
+// Helper for the sorting of layers by z-index.
+static inline bool compareZIndex(RenderLayer* first, RenderLayer* second)
+{
+    return first->zIndex() < second->zIndex();
+}
+
+// Collect the fixed positioned layers that have the named flows as containing block.
 // These layers are painted and hit-tested starting from RenderView not from regions.
+// The list of layers is returned sorted by z-index.
 void FlowThreadController::collectFixedPositionedLayers(Vector<RenderLayer*>& fixedPosLayers) const
 {
@@ -293 +299 @@
             continue;
 
-        // Iterate over the fixed positioned elements in the flow thread
-        TrackedRendererListHashSet* positionedDescendants = flowRenderer->positionedObjects();
-        if (positionedDescendants) {
-            for (auto it = positionedDescendants->begin(), end = positionedDescendants->end(); it != end; ++it) {
-                RenderBox* box = *it;
-                if (!box->fixedPositionedWithNamedFlowContainingBlock())
+        RenderLayer* flowThreadLayer = flowRenderer->layer();
+        if (Vector<RenderLayer*>* negZOrderList = flowThreadLayer->negZOrderList()) {
+            for (size_t i = 0, size = negZOrderList->size(); i < size; ++i) {
+                RenderLayer* currLayer = negZOrderList->at(i);
+                if (currLayer->renderer().style().position() != FixedPosition)
                     continue;
-                fixedPosLayers.append(box->layer());
+                fixedPosLayers.append(currLayer);
             }
         }
-    }
+
+        if (Vector<RenderLayer*>* posZOrderList = flowThreadLayer->posZOrderList()) {
+            for (size_t i = 0, size = posZOrderList->size(); i < size; ++i) {
+                RenderLayer* currLayer = posZOrderList->at(i);
+                if (currLayer->renderer().style().position() != FixedPosition)
+                    continue;
+                fixedPosLayers.append(currLayer);
+            }
+        }
+    }
+
+    std::stable_sort(fixedPosLayers.begin(), fixedPosLayers.end(), compareZIndex);
 }
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -4045 +4045 @@
     renderer().view().flowThreadController().collectFixedPositionedLayers(fixedLayers);
 
-    // Sort the fixed layers list
-    std::stable_sort(fixedLayers.begin(), fixedLayers.end(), compareZIndex);
-
     // Paint the layers
     for (size_t i = 0; i < fixedLayers.size(); ++i) {
@@ -4794 +4791 @@
     Vector<RenderLayer*> fixedLayers;
     renderer().view().flowThreadController().collectFixedPositionedLayers(fixedLayers);
-
-    // Sort the fixed layers list
-    std::stable_sort(fixedLayers.begin(), fixedLayers.end(), compareZIndex);
 
     // Hit test the layers