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

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

Issue 10413057: Merge 116357 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 7 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/block/positioning/positioned-object-under-split-block-parent-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 118055)
+++ Source/WebCore/rendering/RenderBlock.cpp (working copy)
@@ -610,6 +610,13 @@
currChildNextSibling = 0; // We destroyed the last child, so now we need to update
// the value of currChildNextSibling.
+ // It is possible that positioned objects under blockCurr are going to be moved to cloneBlock.
+ // Since we are doing layout anyway, it is easier to blow away the entire list, than
+ // traversing down the subtree looking for positioned children and then remove them
+ // from our positioned objects list.
+ if (currChildNextSibling)
+ blockCurr->removePositionedObjects(0);
+
// Now we need to take all of the children starting from the first child
// *after* currChild and append them all to the clone.
blockCurr->moveChildrenTo(cloneBlock, currChildNextSibling, 0, true);
« no previous file with comments | « LayoutTests/fast/block/positioning/positioned-object-under-split-block-parent-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698