Title: [283027] trunk/Source/WebCore
- Revision
- 283027
- Author
- [email protected]
- Date
- 2021-09-23 23:52:53 -0700 (Thu, 23 Sep 2021)
Log Message
RenderElement::moveLayers should take reference
https://bugs.webkit.org/show_bug.cgi?id=230706
Patch by Rob Buis <[email protected]> on 2021-09-23
Reviewed by Simon Fraser.
RenderElement::moveLayers should take reference for newParent
since it is always non-null.
* rendering/RenderElement.cpp:
(WebCore::RenderElement::moveLayers):
* rendering/RenderElement.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::insertOnlyThisLayer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (283026 => 283027)
--- trunk/Source/WebCore/ChangeLog 2021-09-24 05:07:19 UTC (rev 283026)
+++ trunk/Source/WebCore/ChangeLog 2021-09-24 06:52:53 UTC (rev 283027)
@@ -1,3 +1,19 @@
+2021-09-23 Rob Buis <[email protected]>
+
+ RenderElement::moveLayers should take reference
+ https://bugs.webkit.org/show_bug.cgi?id=230706
+
+ Reviewed by Simon Fraser.
+
+ RenderElement::moveLayers should take reference for newParent
+ since it is always non-null.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::moveLayers):
+ * rendering/RenderElement.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::insertOnlyThisLayer):
+
2021-09-23 Simon Fraser <[email protected]>
Move ScrollSnapAnimatorState's ScrollAnimationMomentum into ScrollingEffectsController
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (283026 => 283027)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2021-09-24 05:07:19 UTC (rev 283026)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2021-09-24 06:52:53 UTC (rev 283027)
@@ -706,17 +706,14 @@
child.removeLayers(parentLayer);
}
-void RenderElement::moveLayers(RenderLayer* oldParent, RenderLayer* newParent)
+void RenderElement::moveLayers(RenderLayer* oldParent, RenderLayer& newParent)
{
- if (!newParent)
- return;
-
if (hasLayer()) {
RenderLayer* layer = downcast<RenderLayerModelObject>(*this).layer();
ASSERT(oldParent == layer->parent());
if (oldParent)
oldParent->removeChild(*layer);
- newParent->addChild(*layer);
+ newParent.addChild(*layer);
return;
}
Modified: trunk/Source/WebCore/rendering/RenderElement.h (283026 => 283027)
--- trunk/Source/WebCore/rendering/RenderElement.h 2021-09-24 05:07:19 UTC (rev 283026)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2021-09-24 06:52:53 UTC (rev 283027)
@@ -109,7 +109,7 @@
// can contain a mixture of boxes and other object types, these functions need to be in the base class.
void addLayers(RenderLayer* parentLayer);
void removeLayers(RenderLayer* parentLayer);
- void moveLayers(RenderLayer* oldParent, RenderLayer* newParent);
+ void moveLayers(RenderLayer* oldParent, RenderLayer& newParent);
RenderLayer* findNextLayer(RenderLayer* parentLayer, RenderObject* startPoint, bool checkParent = true);
virtual void dirtyLinesFromChangedChild(RenderObject&) { }
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (283026 => 283027)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2021-09-24 05:07:19 UTC (rev 283026)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2021-09-24 06:52:53 UTC (rev 283027)
@@ -490,7 +490,7 @@
// 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(m_parent, *this);
if (parent()) {
if (timing == LayerChangeTiming::StyleChange)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
