Changeset 292596 in webkit

Timestamp:

Apr 8, 2022, 2:59:15 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Take top layers into account in addLayers/removeLayers
​https://bugs.webkit.org/show_bug.cgi?id=238946

Patch by Rob Buis <​rbuis@igalia.com> on 2022-04-08
Reviewed by Simon Fraser.

Take top layers into account in addLayers/removeLayers, they
should use the RenderView layer as parent (emulating layerParent).

• rendering/RenderElement.cpp:

(WebCore::addLayers):
(WebCore::RenderElement::addLayers):
(WebCore::RenderElement::removeLayers):
(WebCore::RenderElement::willBeRemovedFromTree):

• rendering/RenderElement.h:
• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::calculateClipRects const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (4 diffs)
• rendering/RenderElement.h (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-08  Rob Buis  <rbuis@igalia.com>
+
+        Take top layers into account in addLayers/removeLayers
+        https://bugs.webkit.org/show_bug.cgi?id=238946
+
+        Reviewed by Simon Fraser.
+
+        Take top layers into account in addLayers/removeLayers, they
+        should use the RenderView layer as parent (emulating layerParent).
+
+        * rendering/RenderElement.cpp:
+        (WebCore::addLayers):
+        (WebCore::RenderElement::addLayers):
+        (WebCore::RenderElement::removeLayers):
+        (WebCore::RenderElement::willBeRemovedFromTree):
+        * rendering/RenderElement.h:
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects const):
+
 2022-04-07  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -640 +640 @@
 }
 
-static void addLayers(const RenderElement& addedRenderer, RenderElement& currentRenderer, RenderLayer& parentLayer, std::optional<RenderLayer*>& beforeChild)
+static void addLayers(const RenderElement& addedRenderer, RenderElement& currentRenderer, RenderLayer* parentLayer)
 {
     if (currentRenderer.hasLayer()) {
-        if (!beforeChild.has_value())
-            beforeChild = layerNextSiblingRespectingTopLayer(addedRenderer, parentLayer);
-
-        parentLayer.addChild(*downcast<RenderLayerModelObject>(currentRenderer).layer(), beforeChild.value());
+        if (isInTopLayerOrBackdrop(currentRenderer.style(), currentRenderer.element()))
+            parentLayer = addedRenderer.view().layer();
+        RenderLayer* beforeChild = layerNextSiblingRespectingTopLayer(addedRenderer, *parentLayer);
+        parentLayer->addChild(*downcast<RenderLayerModelObject>(currentRenderer).layer(), beforeChild);
         return;
     }
 
     for (auto& child : childrenOfType<RenderElement>(currentRenderer))
-        addLayers(addedRenderer, child, parentLayer, beforeChild);
+        addLayers(addedRenderer, child, parentLayer);
 }
 
@@ -659 +659 @@
         return;
 
-    std::optional<RenderLayer*> beforeChild;
-    WebCore::addLayers(*this, *this, *parentLayer, beforeChild);
-}
-
-void RenderElement::removeLayers(RenderLayer* parentLayer)
-{
+    WebCore::addLayers(*this, *this, parentLayer);
+}
+
+void RenderElement::removeLayers()
+{
+    RenderLayer* parentLayer = layerParent();
     if (!parentLayer)
         return;
@@ -674 +674 @@
 
     for (auto& child : childrenOfType<RenderElement>(*this))
-        child.removeLayers(parentLayer);
+        child.removeLayers();
 }
 
@@ -966 +966 @@
     }
     // Keep our layer hierarchy updated.
-    if (firstChild() || hasLayer()) {
-        auto* parentLayer = layerParent();
-        removeLayers(parentLayer);
-    }
+    if (firstChild() || hasLayer())
+        removeLayers();
 
     if (isOutOfFlowPositioned() && parent()->childrenInline())

trunk/Source/WebCore/rendering/RenderElement.h

@@ -112 +112 @@
     RenderLayer* layerNextSibling(RenderLayer& parentLayer) const;
     void addLayers(RenderLayer* parentLayer);
-    void removeLayers(RenderLayer* parentLayer);
+    void removeLayers();
     void moveLayers(RenderLayer* oldParent, RenderLayer& newParent);
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -5573 +5573 @@
 void RenderLayer::removeReflection()
 {
-    if (!m_reflection->renderTreeBeingDestroyed())
-        m_reflection->removeLayers(this);
+    if (!m_reflection->renderTreeBeingDestroyed()) {
+        if (auto* layer = m_reflection->layer())
+            removeChild(*layer);
+    }
 
     m_reflection->setParent(nullptr);