Title: [226196] trunk/Source/WebCore
- Revision
- 226196
- Author
- [email protected]
- Date
- 2017-12-20 12:07:52 -0800 (Wed, 20 Dec 2017)
Log Message
[RenderTreeBuilder] Replace remaining addChild calls with RenderTreeBuilder::insert
https://bugs.webkit.org/show_bug.cgi?id=181044
<rdar://problem/36157613>
Reviewed by Antti Koivisto.
Covered by existing test cases.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::addChildIgnoringContinuation):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::addChildIgnoringContinuation):
* rendering/RenderElement.h:
(WebCore::RenderElement::addChildIgnoringContinuation): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (226195 => 226196)
--- trunk/Source/WebCore/ChangeLog 2017-12-20 20:04:54 UTC (rev 226195)
+++ trunk/Source/WebCore/ChangeLog 2017-12-20 20:07:52 UTC (rev 226196)
@@ -1,3 +1,20 @@
+2017-12-20 Zalan Bujtas <[email protected]>
+
+ [RenderTreeBuilder] Replace remaining addChild calls with RenderTreeBuilder::insert
+ https://bugs.webkit.org/show_bug.cgi?id=181044
+ <rdar://problem/36157613>
+
+ Reviewed by Antti Koivisto.
+
+ Covered by existing test cases.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::addChildIgnoringContinuation):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::addChildIgnoringContinuation):
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::addChildIgnoringContinuation): Deleted.
+
2017-12-20 Daniel Bates <[email protected]>
Cleanup: Dereference value of optional directly instead of using checked value in WebCore::subdivide()
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (226195 => 226196)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-12-20 20:04:54 UTC (rev 226195)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2017-12-20 20:07:52 UTC (rev 226196)
@@ -562,9 +562,9 @@
) {
// Insert the child into the anonymous block box instead of here.
if (newChild->isInline() || beforeChild->parent()->firstChild() != beforeChild)
- beforeChild->parent()->addChild(builder, WTFMove(newChild), beforeChild);
+ builder.insertChild(*beforeChild->parent(), WTFMove(newChild), beforeChild);
else
- addChild(builder, WTFMove(newChild), beforeChild->parent());
+ builder.insertChild(*this, WTFMove(newChild), beforeChild->parent());
return;
}
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (226195 => 226196)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2017-12-20 20:04:54 UTC (rev 226195)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2017-12-20 20:07:52 UTC (rev 226196)
@@ -511,6 +511,11 @@
SVGRenderSupport::childAdded(*this, child);
}
+void RenderElement::addChildIgnoringContinuation(RenderTreeBuilder& builder, RenderPtr<RenderObject> newChild, RenderObject* beforeChild)
+{
+ builder.insertChild(*this, WTFMove(newChild), beforeChild);
+}
+
RenderPtr<RenderObject> RenderElement::takeChild(RenderObject& oldChild)
{
return takeChildInternal(oldChild);
Modified: trunk/Source/WebCore/rendering/RenderElement.h (226195 => 226196)
--- trunk/Source/WebCore/rendering/RenderElement.h 2017-12-20 20:04:54 UTC (rev 226195)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2017-12-20 20:07:52 UTC (rev 226196)
@@ -88,7 +88,7 @@
virtual bool isChildAllowed(const RenderObject&, const RenderStyle&) const { return true; }
virtual void addChild(RenderTreeBuilder&, RenderPtr<RenderObject>, RenderObject* beforeChild);
- virtual void addChildIgnoringContinuation(RenderTreeBuilder& builder, RenderPtr<RenderObject> newChild, RenderObject* beforeChild = nullptr) { addChild(builder, WTFMove(newChild), beforeChild); }
+ virtual void addChildIgnoringContinuation(RenderTreeBuilder&, RenderPtr<RenderObject> newChild, RenderObject* beforeChild = nullptr);
virtual RenderPtr<RenderObject> takeChild(RenderObject&) WARN_UNUSED_RETURN;
void removeAndDestroyChild(RenderObject&);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
