| 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) 2005 Allan Sandfeld Jensen (kde@carewolf.com) | 4 * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com) |
| 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com) |
| 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
| 7 * Copyright (C) 2010 Google Inc. All rights reserved. | 7 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 2611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2622 } | 2622 } |
| 2623 | 2623 |
| 2624 void RenderBoxModelObject::moveChildrenTo(RenderBoxModelObject* toBoxModelObject
, RenderObject* startChild, RenderObject* endChild, RenderObject* beforeChild, b
ool fullRemoveInsert) | 2624 void RenderBoxModelObject::moveChildrenTo(RenderBoxModelObject* toBoxModelObject
, RenderObject* startChild, RenderObject* endChild, RenderObject* beforeChild, b
ool fullRemoveInsert) |
| 2625 { | 2625 { |
| 2626 // This condition is rarely hit since this function is usually called on | 2626 // This condition is rarely hit since this function is usually called on |
| 2627 // anonymous blocks which can no longer carry positioned objects (see r12076
1) | 2627 // anonymous blocks which can no longer carry positioned objects (see r12076
1) |
| 2628 // or when fullRemoveInsert is false. | 2628 // or when fullRemoveInsert is false. |
| 2629 if (fullRemoveInsert && isRenderBlock()) { | 2629 if (fullRemoveInsert && isRenderBlock()) { |
| 2630 RenderBlock* block = toRenderBlock(this); | 2630 RenderBlock* block = toRenderBlock(this); |
| 2631 block->removePositionedObjects(0); | 2631 block->removePositionedObjects(0); |
| 2632 if (block->isRenderBlockFlow()) | |
| 2633 toRenderBlockFlow(block)->removeFloatingObjects(); | |
| 2634 } | 2632 } |
| 2635 | 2633 |
| 2636 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); | 2634 ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent()); |
| 2637 for (RenderObject* child = startChild; child && child != endChild; ) { | 2635 for (RenderObject* child = startChild; child && child != endChild; ) { |
| 2638 // Save our next sibling as moveChildTo will clear it. | 2636 // Save our next sibling as moveChildTo will clear it. |
| 2639 RenderObject* nextSibling = child->nextSibling(); | 2637 RenderObject* nextSibling = child->nextSibling(); |
| 2640 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); | 2638 moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert); |
| 2641 child = nextSibling; | 2639 child = nextSibling; |
| 2642 } | 2640 } |
| 2643 } | 2641 } |
| 2644 | 2642 |
| 2645 } // namespace blink | 2643 } // namespace blink |
| OLD | NEW |