Title: [226833] branches/safari-605-branch/Source/WebCore
- Revision
- 226833
- Author
- jmarc...@apple.com
- Date
- 2018-01-11 17:50:46 -0800 (Thu, 11 Jan 2018)
Log Message
Revert r226196. rdar://problem/36157613
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226832 => 226833)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-12 01:50:44 UTC (rev 226832)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-12 01:50:46 UTC (rev 226833)
@@ -1,5 +1,9 @@
2018-01-11 Jason Marcell <jmarc...@apple.com>
+ Revert r226196. rdar://problem/36157613
+
+2018-01-11 Jason Marcell <jmarc...@apple.com>
+
Revert r226221. rdar://problem/36167692
2018-01-11 Jason Marcell <jmarc...@apple.com>
Modified: branches/safari-605-branch/Source/WebCore/rendering/RenderBlock.cpp (226832 => 226833)
--- branches/safari-605-branch/Source/WebCore/rendering/RenderBlock.cpp 2018-01-12 01:50:44 UTC (rev 226832)
+++ branches/safari-605-branch/Source/WebCore/rendering/RenderBlock.cpp 2018-01-12 01:50:46 UTC (rev 226833)
@@ -562,9 +562,9 @@
) {
// Insert the child into the anonymous block box instead of here.
if (newChild->isInline() || beforeChild->parent()->firstChild() != beforeChild)
- builder.insertChild(*beforeChild->parent(), WTFMove(newChild), beforeChild);
+ beforeChild->parent()->addChild(builder, WTFMove(newChild), beforeChild);
else
- builder.insertChild(*this, WTFMove(newChild), beforeChild->parent());
+ addChild(builder, WTFMove(newChild), beforeChild->parent());
return;
}
Modified: branches/safari-605-branch/Source/WebCore/rendering/RenderElement.cpp (226832 => 226833)
--- branches/safari-605-branch/Source/WebCore/rendering/RenderElement.cpp 2018-01-12 01:50:44 UTC (rev 226832)
+++ branches/safari-605-branch/Source/WebCore/rendering/RenderElement.cpp 2018-01-12 01:50:46 UTC (rev 226833)
@@ -511,11 +511,6 @@
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: branches/safari-605-branch/Source/WebCore/rendering/RenderElement.h (226832 => 226833)
--- branches/safari-605-branch/Source/WebCore/rendering/RenderElement.h 2018-01-12 01:50:44 UTC (rev 226832)
+++ branches/safari-605-branch/Source/WebCore/rendering/RenderElement.h 2018-01-12 01:50:46 UTC (rev 226833)
@@ -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&, RenderPtr<RenderObject> newChild, RenderObject* beforeChild = nullptr);
+ virtual void addChildIgnoringContinuation(RenderTreeBuilder& builder, RenderPtr<RenderObject> newChild, RenderObject* beforeChild = nullptr) { addChild(builder, WTFMove(newChild), beforeChild); }
virtual RenderPtr<RenderObject> takeChild(RenderObject&) WARN_UNUSED_RETURN;
void removeAndDestroyChild(RenderObject&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
