Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(889)

Unified Diff: Source/core/rendering/RenderBlockFlow.cpp

Issue 568443002: [New Multicolumn] A renderer can't be both a parent and a sibling of another renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/multicol/empty-list-item-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlockFlow.cpp
diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
index 84aff4e1773ccbdeee660f2284e8a6a517dd8001..b6450a70f7de902c1db987e2c4b4bf276cf5a001 100644
--- a/Source/core/rendering/RenderBlockFlow.cpp
+++ b/Source/core/rendering/RenderBlockFlow.cpp
@@ -1978,6 +1978,9 @@ void RenderBlockFlow::setStaticInlinePositionForChild(RenderBox* child, LayoutUn
void RenderBlockFlow::addChild(RenderObject* newChild, RenderObject* beforeChild)
{
if (RenderMultiColumnFlowThread* flowThread = multiColumnFlowThread()) {
+ if (beforeChild == flowThread)
+ beforeChild = flowThread->firstChild();
+ ASSERT(!beforeChild || beforeChild->isDescendantOf(flowThread));
flowThread->addChild(newChild, beforeChild);
return;
}
« no previous file with comments | « LayoutTests/fast/multicol/empty-list-item-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698