Changeset 161960 in webkit

Timestamp:

Jan 14, 2014 6:51:03 AM (10 years ago)

Author:

mihnea@adobe.com

Message:

[CSSRegions] The list of fixed positioned layers in named flows should be sorted by z-index
​https://bugs.webkit.org/show_bug.cgi?id=126978

Reviewed by Antti Koivisto.

Return the list of fixed positioned layers sorted by z-index from
FlowThreadController::collectFixedPositionedLayers instead of manually sort it
every time we need it (RenderLayer::paintFixedLayersInNamedFlows, RenderLayer::hitTestFixedLayersInNamedFlows).
Refactoring covered by existing regions tests.

• rendering/FlowThreadController.cpp:

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

• rendering/RenderLayer.cpp:

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/FlowThreadController.cpp (modified) (3 diffs)
• rendering/RenderLayer.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-14  Mihnea Ovidenie  <mihnea@adobe.com>
+
+        [CSSRegions] The list of fixed positioned layers in named flows should be sorted by z-index
+        https://bugs.webkit.org/show_bug.cgi?id=126978
+
+        Reviewed by Antti Koivisto.
+
+        Return the list of fixed positioned layers sorted by z-index from
+        FlowThreadController::collectFixedPositionedLayers instead of manually sort it
+        every time we need it (RenderLayer::paintFixedLayersInNamedFlows, RenderLayer::hitTestFixedLayersInNamedFlows).
+        Refactoring covered by existing regions tests.
+
+        * rendering/FlowThreadController.cpp:
+        (WebCore::compareZIndex):
+        (WebCore::FlowThreadController::collectFixedPositionedLayers):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::paintFixedLayersInNamedFlows):
+        (WebCore::RenderLayer::hitTestFixedLayersInNamedFlows):
+
 2014-01-14  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/FlowThreadController.cpp

@@ -29 +29 @@
 
 #include "config.h"
-
 #include "FlowThreadController.h"
 
@@ -281 +280 @@
 }
 
+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.
@@ -304 +308 @@
         }
     }
+
+    std::stable_sort(fixedPosLayers.begin(), fixedPosLayers.end(), compareZIndex);
 }
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -4062 +4062 @@
     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) {
@@ -4811 +4808 @@
     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