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

Unified Diff: Source/WebCore/rendering/RenderBlock.cpp

Issue 9071019: Merge 102263 - Crash from multicol spans with layers (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 12 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/span/removal-of-multicol-span-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/rendering/RenderBlock.cpp
===================================================================
--- Source/WebCore/rendering/RenderBlock.cpp (revision 103959)
+++ Source/WebCore/rendering/RenderBlock.cpp (working copy)
@@ -464,7 +464,7 @@
// them from |this| and place them in the clone.
if (!beforeChild && isAfterContent(lastChild()))
beforeChild = lastChild();
- moveChildrenTo(cloneBlock, beforeChild, 0);
+ moveChildrenTo(cloneBlock, beforeChild, 0, true);
// Hook |clone| up as the continuation of the middle block.
if (!cloneBlock->isAnonymousBlock())
@@ -506,8 +506,7 @@
// Now we need to take all of the children starting from the first child
// *after* currChild and append them all to the clone.
- RenderObject* afterContent = isAfterContent(cloneBlock->lastChild()) ? cloneBlock->lastChild() : 0;
- blockCurr->moveChildrenTo(cloneBlock, currChild->nextSibling(), 0, afterContent);
+ blockCurr->moveChildrenTo(cloneBlock, currChild->nextSibling(), 0, true);
// Keep walking up the chain.
currChild = curr;
@@ -519,7 +518,7 @@
// Now take all the children after currChild and remove them from the fromBlock
// and put them in the toBlock.
- fromBlock->moveChildrenTo(toBlock, currChild->nextSibling(), 0);
+ fromBlock->moveChildrenTo(toBlock, currChild->nextSibling(), 0, true);
}
void RenderBlock::splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox,
@@ -555,7 +554,7 @@
block->setChildrenInline(false);
if (madeNewBeforeBlock)
- block->moveChildrenTo(pre, boxFirst, 0);
+ block->moveChildrenTo(pre, boxFirst, 0, true);
splitBlocks(pre, post, newBlockBox, beforeChild, oldCont);
« no previous file with comments | « LayoutTests/fast/multicol/span/removal-of-multicol-span-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698