Changeset 294845 in webkit

Timestamp:

May 25, 2022, 4:49:59 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick r292596. rdar://problem/88862115

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):

Canonical link: ​https://commits.webkit.org/249429@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@292596 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/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)

branches/safari-613-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-19  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r292596. rdar://problem/88862115
+
+    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):
+    
+    Canonical link: https://commits.webkit.org/249429@main
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@292596 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    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-05-19  Alan Coon  <alancoon@apple.com>
 

branches/safari-613-branch/Source/WebCore/rendering/RenderElement.cpp

@@ -684 +684 @@
 }
 
-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);
 }
 
@@ -703 +703 @@
         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;
@@ -718 +718 @@
 
     for (auto& child : childrenOfType<RenderElement>(*this))
-        child.removeLayers(parentLayer);
+        child.removeLayers();
 }
 
@@ -1023 +1023 @@
     }
     // Keep our layer hierarchy updated.
-    if (firstChild() || hasLayer()) {
-        auto* parentLayer = layerParent();
-        removeLayers(parentLayer);
-    }
+    if (firstChild() || hasLayer())
+        removeLayers();
 
     if (isOutOfFlowPositioned() && parent()->childrenInline())

branches/safari-613-branch/Source/WebCore/rendering/RenderElement.h

@@ -111 +111 @@
     RenderLayer* layerNextSibling(RenderLayer& parentLayer) const;
     void addLayers(RenderLayer* parentLayer);
-    void removeLayers(RenderLayer* parentLayer);
-    void moveLayers(RenderLayer& newParent);
+    void removeLayers();
 
     virtual void dirtyLinesFromChangedChild(RenderObject&) { }

branches/safari-613-branch/Source/WebCore/rendering/RenderLayer.cpp

@@ -5442 +5442 @@
 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);