OLD | NEW |
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 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
484 cloneBlock->setContinuation(oldCont); | 484 cloneBlock->setContinuation(oldCont); |
485 | 485 |
486 if (!beforeChild && isAfterContent(lastChild())) | 486 if (!beforeChild && isAfterContent(lastChild())) |
487 beforeChild = lastChild(); | 487 beforeChild = lastChild(); |
488 | 488 |
489 // If we are moving inline children from |this| to cloneBlock, then we need | 489 // If we are moving inline children from |this| to cloneBlock, then we need |
490 // to clear our line box tree. | 490 // to clear our line box tree. |
491 if (beforeChild && childrenInline()) | 491 if (beforeChild && childrenInline()) |
492 deleteLineBoxTree(); | 492 deleteLineBoxTree(); |
493 | 493 |
| 494 // We have to remove the descendant child from our positioned objects list |
| 495 // before we do the split and move some of the children to cloneBlock. Since |
| 496 // we are doing layout anyway, it is easier to blow away the entire list, th
an |
| 497 // traversing down the subtree looking for positioned childs and then remove
them |
| 498 // from our positioned objects list. |
| 499 if (beforeChild) |
| 500 removePositionedObjects(0); |
| 501 |
494 // Now take all of the children from beforeChild to the end and remove | 502 // Now take all of the children from beforeChild to the end and remove |
495 // them from |this| and place them in the clone. | 503 // them from |this| and place them in the clone. |
496 moveChildrenTo(cloneBlock, beforeChild, 0, true); | 504 moveChildrenTo(cloneBlock, beforeChild, 0, true); |
497 | 505 |
498 // Hook |clone| up as the continuation of the middle block. | 506 // Hook |clone| up as the continuation of the middle block. |
499 if (!cloneBlock->isAnonymousBlock()) | 507 if (!cloneBlock->isAnonymousBlock()) |
500 middleBlock->setContinuation(cloneBlock); | 508 middleBlock->setContinuation(cloneBlock); |
501 | 509 |
502 // We have been reparented and are now under the fromBlock. We need | 510 // We have been reparented and are now under the fromBlock. We need |
503 // to walk up our block parent chain until we hit the containing anonymous c
olumns block. | 511 // to walk up our block parent chain until we hit the containing anonymous c
olumns block. |
(...skipping 6697 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
7201 } | 7209 } |
7202 | 7210 |
7203 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) | 7211 String ValueToString<RenderBlock::FloatingObject*>::string(const RenderBlock::Fl
oatingObject* floatingObject) |
7204 { | 7212 { |
7205 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); | 7213 return String::format("%p (%dx%d %dx%d)", floatingObject, floatingObject->x(
), floatingObject->y(), floatingObject->maxX(), floatingObject->maxY()); |
7206 } | 7214 } |
7207 | 7215 |
7208 #endif | 7216 #endif |
7209 | 7217 |
7210 } // namespace WebCore | 7218 } // namespace WebCore |
OLD | NEW |