Diff
Modified: trunk/Source/WebCore/ChangeLog (228549 => 228550)
--- trunk/Source/WebCore/ChangeLog 2018-02-16 03:08:06 UTC (rev 228549)
+++ trunk/Source/WebCore/ChangeLog 2018-02-16 03:28:24 UTC (rev 228550)
@@ -1,3 +1,27 @@
+2018-02-15 Zalan Bujtas <[email protected]>
+
+ [RenderTreeBuilder] parent.Render*::addChild() cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=182842
+ <rdar://problem/37585524>
+
+ Reviewed by Antti Koivisto.
+
+ No change in functionality.
+
+ * rendering/updating/RenderTreeBuilderBlock.cpp:
+ (WebCore::RenderTreeBuilder::Block::insertChildIgnoringContinuation):
+ * rendering/updating/RenderTreeBuilderFormControls.cpp:
+ (WebCore::RenderTreeBuilder::FormControls::createInnerRendererIfNeeded):
+ * rendering/updating/RenderTreeBuilderInline.cpp:
+ (WebCore::RenderTreeBuilder::Inline::insertChildIgnoringContinuation):
+ * rendering/updating/RenderTreeBuilderMathML.cpp:
+ (WebCore::RenderTreeBuilder::MathML::makeFences):
+ (WebCore::RenderTreeBuilder::MathML::insertChild):
+ * rendering/updating/RenderTreeBuilderSVG.cpp:
+ (WebCore::RenderTreeBuilder::SVG::insertChild):
+ * rendering/updating/RenderTreeBuilderTable.cpp:
+ (WebCore::RenderTreeBuilder::Table::insertChild):
+
2018-02-15 Megan Gardner <[email protected]>
Support scrolling for non-editable web-selection and start autoscroll when near screen edges
Modified: trunk/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp (228549 => 228550)
--- trunk/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp 2018-02-16 03:08:06 UTC (rev 228549)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp 2018-02-16 03:28:24 UTC (rev 228550)
@@ -223,7 +223,7 @@
// No suitable existing anonymous box - create a new one.
auto newBox = parent.createAnonymousBlock();
auto& box = *newBox;
- parent.RenderBox::addChild(m_builder, WTFMove(newBox), beforeChild);
+ parent.RenderElement::addChild(m_builder, WTFMove(newBox), beforeChild);
m_builder.insertChild(box, WTFMove(child));
return;
}
@@ -231,7 +231,7 @@
parent.invalidateLineLayoutPath();
- parent.RenderBox::addChild(m_builder, WTFMove(child), beforeChild);
+ parent.RenderElement::addChild(m_builder, WTFMove(child), beforeChild);
if (madeBoxesNonInline && is<RenderBlock>(parent.parent()) && parent.isAnonymousBlock())
removeLeftoverAnonymousBlock(parent);
Modified: trunk/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp (228549 => 228550)
--- trunk/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp 2018-02-16 03:08:06 UTC (rev 228549)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeBuilderFormControls.cpp 2018-02-16 03:28:24 UTC (rev 228550)
@@ -56,7 +56,7 @@
auto wrapper = parent.createAnonymousBlock(parent.style().display());
innerRenderer = wrapper.get();
- parent.RenderFlexibleBox::addChild(m_builder, WTFMove(wrapper));
+ parent.RenderBlock::addChild(m_builder, WTFMove(wrapper));
parent.setInnerRenderer(*innerRenderer);
return *innerRenderer;
}
@@ -69,7 +69,7 @@
auto wrapper = parent.createAnonymousBlock();
innerRenderer = wrapper.get();
- parent.RenderFlexibleBox::addChild(m_builder, WTFMove(wrapper));
+ parent.RenderBlock::addChild(m_builder, WTFMove(wrapper));
parent.setInnerRenderer(*innerRenderer);
return *innerRenderer;
}
Modified: trunk/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp (228549 => 228550)
--- trunk/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp 2018-02-16 03:08:06 UTC (rev 228549)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeBuilderInline.cpp 2018-02-16 03:28:24 UTC (rev 228550)
@@ -188,7 +188,7 @@
}
auto& childToAdd = *child;
- parent.RenderBoxModelObject::addChild(m_builder, WTFMove(child), beforeChild);
+ parent.RenderElement::addChild(m_builder, WTFMove(child), beforeChild);
childToAdd.setNeedsLayoutAndPrefWidthsRecalc();
}
Modified: trunk/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.cpp (228549 => 228550)
--- trunk/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.cpp 2018-02-16 03:08:06 UTC (rev 228549)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeBuilderMathML.cpp 2018-02-16 03:28:24 UTC (rev 228550)
@@ -47,11 +47,11 @@
void RenderTreeBuilder::MathML::makeFences(RenderMathMLFenced& parent)
{
auto openFence = createMathMLOperator(parent, parent.openingBrace(), MathMLOperatorDictionary::Prefix, MathMLOperatorDictionary::Fence);
- parent.RenderMathMLRow::addChild(m_builder, WTFMove(openFence), parent.firstChild());
+ parent.RenderBlock::addChild(m_builder, WTFMove(openFence), parent.firstChild());
auto closeFence = createMathMLOperator(parent, parent.closingBrace(), MathMLOperatorDictionary::Postfix, MathMLOperatorDictionary::Fence);
parent.setCloseFenceRenderer(*closeFence);
- parent.RenderMathMLRow::addChild(m_builder, WTFMove(closeFence));
+ parent.RenderBlock::addChild(m_builder, WTFMove(closeFence));
}
void RenderTreeBuilder::MathML::insertChild(RenderMathMLFenced& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
@@ -95,14 +95,14 @@
if (beforeChild) {
// Adding |x| before an existing |y| e.g. in element (y) - first insert our new child |x|, then its separator, to get (x, y).
- parent.RenderMathMLRow::addChild(m_builder, WTFMove(child), beforeChild);
+ parent.RenderBlock::addChild(m_builder, WTFMove(child), beforeChild);
if (separatorRenderer)
parent.RenderMathMLRow::addChild(m_builder, WTFMove(separatorRenderer), beforeChild);
} else {
// Adding |y| at the end of an existing element e.g. (x) - insert the separator first before the closing fence, then |y|, to get (x, y).
if (separatorRenderer)
- parent.RenderMathMLRow::addChild(m_builder, WTFMove(separatorRenderer), parent.closeFenceRenderer());
- parent.RenderMathMLRow::addChild(m_builder, WTFMove(child), parent.closeFenceRenderer());
+ parent.RenderBlock::addChild(m_builder, WTFMove(separatorRenderer), parent.closeFenceRenderer());
+ parent.RenderBlock::addChild(m_builder, WTFMove(child), parent.closeFenceRenderer());
}
}
Modified: trunk/Source/WebCore/rendering/updating/RenderTreeBuilderSVG.cpp (228549 => 228550)
--- trunk/Source/WebCore/rendering/updating/RenderTreeBuilderSVG.cpp 2018-02-16 03:08:06 UTC (rev 228549)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeBuilderSVG.cpp 2018-02-16 03:28:24 UTC (rev 228550)
@@ -60,7 +60,7 @@
void RenderTreeBuilder::SVG::insertChild(RenderSVGRoot& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
{
auto& childToAdd = *child;
- parent.RenderReplaced::addChild(m_builder, WTFMove(child), beforeChild);
+ parent.RenderElement::addChild(m_builder, WTFMove(child), beforeChild);
SVGResourcesCache::clientWasAddedToTree(childToAdd);
}
Modified: trunk/Source/WebCore/rendering/updating/RenderTreeBuilderTable.cpp (228549 => 228550)
--- trunk/Source/WebCore/rendering/updating/RenderTreeBuilderTable.cpp 2018-02-16 03:08:06 UTC (rev 228549)
+++ trunk/Source/WebCore/rendering/updating/RenderTreeBuilderTable.cpp 2018-02-16 03:28:24 UTC (rev 228550)
@@ -168,7 +168,7 @@
auto& newChild = *child.get();
ASSERT(!beforeChild || is<RenderTableCell>(*beforeChild));
- parent.RenderBox::addChild(m_builder, WTFMove(child), beforeChild);
+ parent.RenderElement::addChild(m_builder, WTFMove(child), beforeChild);
// FIXME: child should always be a RenderTableCell at this point.
if (is<RenderTableCell>(newChild))
parent.didInsertTableCell(downcast<RenderTableCell>(newChild), beforeChild);
@@ -183,7 +183,7 @@
if (is<RenderTableRow>(*child.get()))
parent.willInsertTableRow(downcast<RenderTableRow>(*child.get()), beforeChild);
ASSERT(!beforeChild || is<RenderTableRow>(*beforeChild));
- parent.RenderBox::addChild(m_builder, WTFMove(child), beforeChild);
+ parent.RenderElement::addChild(m_builder, WTFMove(child), beforeChild);
}
void RenderTreeBuilder::Table::insertChild(RenderTable& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild)
@@ -197,7 +197,7 @@
else if (is<RenderTableCol>(newChild))
parent.willInsertTableColumn(downcast<RenderTableCol>(newChild), beforeChild);
- parent.RenderBox::addChild(m_builder, WTFMove(child), beforeChild);
+ parent.RenderElement::addChild(m_builder, WTFMove(child), beforeChild);
}
bool RenderTreeBuilder::Table::childRequiresTable(const RenderElement& parent, const RenderObject& child)
