Title: [265133] trunk/Source/WebCore
Revision
265133
Author
[email protected]
Date
2020-07-30 23:05:29 -0700 (Thu, 30 Jul 2020)

Log Message

Minor RenderLayerCompositor::updateBackingAndHierarchy() cleanup
https://bugs.webkit.org/show_bug.cgi?id=215008

Reviewed by Zalan Bujtas.

Instead of setting child layers, and then adding another child (overflowControlLayer),
append overflowControlLayer to the vector and then set children.

No behavior change.

* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateBackingAndHierarchy):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (265132 => 265133)


--- trunk/Source/WebCore/ChangeLog	2020-07-31 05:51:38 UTC (rev 265132)
+++ trunk/Source/WebCore/ChangeLog	2020-07-31 06:05:29 UTC (rev 265133)
@@ -1,3 +1,18 @@
+2020-07-30  Simon Fraser  <[email protected]>
+
+        Minor RenderLayerCompositor::updateBackingAndHierarchy() cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=215008
+
+        Reviewed by Zalan Bujtas.
+
+        Instead of setting child layers, and then adding another child (overflowControlLayer),
+        append overflowControlLayer to the vector and then set children.
+
+        No behavior change.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateBackingAndHierarchy):
+
 2020-07-30  Sam Weinig  <[email protected]>
 
         It would be nice if the predicate taking functions in ParsingUtilities.h didn't require specifying the character type

Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (265132 => 265133)


--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2020-07-31 05:51:38 UTC (rev 265132)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp	2020-07-31 06:05:29 UTC (rev 265133)
@@ -1354,14 +1354,15 @@
             if (is<RenderWidget>(layer.renderer()))
                 parented = parentFrameContentLayers(downcast<RenderWidget>(layer.renderer()));
 
-            if (!parented)
+            if (!parented) {
+                // If the layer has a clipping layer the overflow controls layers will be siblings of the clipping layer.
+                // Otherwise, the overflow control layers are normal children.
+                if (!layerBacking->hasClippingLayer() && !layerBacking->hasScrollingLayer()) {
+                    if (auto* overflowControlLayer = layerBacking->overflowControlsContainer())
+                        layerChildren.append(*overflowControlLayer);
+                }
+
                 layerBacking->parentForSublayers()->setChildren(WTFMove(layerChildren));
-
-            // If the layer has a clipping layer the overflow controls layers will be siblings of the clipping layer.
-            // Otherwise, the overflow control layers are normal children.
-            if (!layerBacking->hasClippingLayer() && !layerBacking->hasScrollingLayer()) {
-                if (auto* overflowControlLayer = layerBacking->overflowControlsContainer())
-                    layerBacking->parentForSublayers()->addChild(*overflowControlLayer);
             }
         }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to