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

Side by Side Diff: Source/WebCore/rendering/RenderBlock.cpp

Issue 9569036: Merge 108875 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/963/
Patch Set: Created 8 years, 9 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 unified diff | Download patch
« no previous file with comments | « LayoutTests/fast/multicol/span/positioned-child-not-removed-crash-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 cloneBlock->setContinuation(oldCont); 478 cloneBlock->setContinuation(oldCont);
479 479
480 if (!beforeChild && isAfterContent(lastChild())) 480 if (!beforeChild && isAfterContent(lastChild()))
481 beforeChild = lastChild(); 481 beforeChild = lastChild();
482 482
483 // If we are moving inline children from |this| to cloneBlock, then we need 483 // If we are moving inline children from |this| to cloneBlock, then we need
484 // to clear our line box tree. 484 // to clear our line box tree.
485 if (beforeChild && childrenInline()) 485 if (beforeChild && childrenInline())
486 deleteLineBoxTree(); 486 deleteLineBoxTree();
487 487
488 // We have to remove the descendant child from our positioned objects list
489 // before we do the split and move some of the children to cloneBlock. Since
490 // we are doing layout anyway, it is easier to blow away the entire list, th an
491 // traversing down the subtree looking for positioned childs and then remove them
492 // from our positioned objects list.
493 if (beforeChild)
494 removePositionedObjects(0);
495
488 // Now take all of the children from beforeChild to the end and remove 496 // Now take all of the children from beforeChild to the end and remove
489 // them from |this| and place them in the clone. 497 // them from |this| and place them in the clone.
490 moveChildrenTo(cloneBlock, beforeChild, 0, true); 498 moveChildrenTo(cloneBlock, beforeChild, 0, true);
491 499
492 // Hook |clone| up as the continuation of the middle block. 500 // Hook |clone| up as the continuation of the middle block.
493 if (!cloneBlock->isAnonymousBlock()) 501 if (!cloneBlock->isAnonymousBlock())
494 middleBlock->setContinuation(cloneBlock); 502 middleBlock->setContinuation(cloneBlock);
495 503
496 // We have been reparented and are now under the fromBlock. We need 504 // We have been reparented and are now under the fromBlock. We need
497 // to walk up our block parent chain until we hit the containing anonymous c olumns block. 505 // to walk up our block parent chain until we hit the containing anonymous c olumns block.
(...skipping 6672 matching lines...) Expand 10 before | Expand all | Expand 10 after
7170 } 7178 }
7171 7179
7172 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject) 7180 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl oatingObject* floatingObject)
7173 { 7181 {
7174 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x( ), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); 7182 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x( ), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY());
7175 } 7183 }
7176 7184
7177 #endif 7185 #endif
7178 7186
7179 } // namespace WebCore 7187 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/multicol/span/positioned-child-not-removed-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698