Changeset 292911 in webkit

Timestamp:

Apr 15, 2022, 10:11:58 AM (4 years ago)

Author:

Brandon

Message:

Parent Mismatch
​https://bugs.webkit.org/show_bug.cgi?id=239390

Reviewed by Simon Fraser.

The oldParent and layer->parent() may be different under certain circumstances.
To account for this, we can just use the layer->parent() and remove the use
of oldParent. This also has the benefit of simplifying the moveLayers() function.

• rendering/RenderElement.cpp:

(WebCore::RenderElement::moveLayers):

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

(WebCore::RenderLayer::insertOnlyThisLayer):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-15  Brandon Stewart  <brandonstewart@apple.com>
+
+        Parent Mismatch
+        https://bugs.webkit.org/show_bug.cgi?id=239390
+
+        Reviewed by Simon Fraser.
+
+        The oldParent and layer->parent() may be different under certain circumstances.
+        To account for this, we can just use the layer->parent() and remove the use
+        of oldParent. This also has the benefit of simplifying the moveLayers() function.
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::moveLayers):
+        * rendering/RenderElement.h:
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::insertOnlyThisLayer):
+
 2022-04-15  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -677 +677 @@
 }
 
-void RenderElement::moveLayers(RenderLayer* oldParent, RenderLayer& newParent)
+void RenderElement::moveLayers(RenderLayer& newParent)
 {
     if (hasLayer()) {
@@ -683 +683 @@
             return;
         RenderLayer* layer = downcast<RenderLayerModelObject>(*this).layer();
-        ASSERT(oldParent == layer->parent());
-        if (oldParent)
-            oldParent->removeChild(*layer);
+        auto* layerParent = layer->parent();
+        if (layerParent)
+            layerParent->removeChild(*layer);
         newParent.addChild(*layer);
         return;
@@ -691 +691 @@
 
     for (auto& child : childrenOfType<RenderElement>(*this))
-        child.moveLayers(oldParent, newParent);
+        child.moveLayers(newParent);
 }
 

trunk/Source/WebCore/rendering/RenderElement.h

@@ -113 +113 @@
     void addLayers(RenderLayer* parentLayer);
     void removeLayers();
-    void moveLayers(RenderLayer* oldParent, RenderLayer& newParent);
+    void moveLayers(RenderLayer& newParent);
 
     virtual void dirtyLinesFromChangedChild(RenderObject&) { }

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -499 +499 @@
     // Remove all descendant layers from the hierarchy and add them to the new position.
     for (auto& child : childrenOfType<RenderElement>(renderer()))
-        child.moveLayers(m_parent, *this);
+        child.moveLayers(*this);
 
     if (parent()) {