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 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1122 { | 1122 { |
1123 // It's possible that this block's destruction may have been triggered by th
e | 1123 // It's possible that this block's destruction may have been triggered by th
e |
1124 // child's removal. Just bail if the anonymous child block is already being | 1124 // child's removal. Just bail if the anonymous child block is already being |
1125 // destroyed. See crbug.com/282088 | 1125 // destroyed. See crbug.com/282088 |
1126 if (child->beingDestroyed()) | 1126 if (child->beingDestroyed()) |
1127 return; | 1127 return; |
1128 parent->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); | 1128 parent->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); |
1129 parent->setChildrenInline(child->childrenInline()); | 1129 parent->setChildrenInline(child->childrenInline()); |
1130 RenderObject* nextSibling = child->nextSibling(); | 1130 RenderObject* nextSibling = child->nextSibling(); |
1131 | 1131 |
1132 RenderFlowThread* childFlowThread = child->flowThreadContainingBlock(); | |
1133 CurrentRenderFlowThreadMaintainer flowThreadMaintainer(childFlowThread); | |
1134 | |
1135 parent->children()->removeChildNode(parent, child, child->hasLayer()); | 1132 parent->children()->removeChildNode(parent, child, child->hasLayer()); |
1136 // FIXME: Get rid of the temporary disabling of continuations. This is neede
d by the old | 1133 // FIXME: Get rid of the temporary disabling of continuations. This is neede
d by the old |
1137 // multicol implementation, because of buggy block continuation handling (wh
ich is hard and | 1134 // multicol implementation, because of buggy block continuation handling (wh
ich is hard and |
1138 // rather pointless to fix at this point). Support for block continuations c
an be removed | 1135 // rather pointless to fix at this point). Support for block continuations c
an be removed |
1139 // together with the old multicol implementation. crbug.com/408123 | 1136 // together with the old multicol implementation. crbug.com/408123 |
1140 RenderBoxModelObject* temporarilyInactiveContinuation = parent->continuation
(); | 1137 RenderBoxModelObject* temporarilyInactiveContinuation = parent->continuation
(); |
1141 if (temporarilyInactiveContinuation) | 1138 if (temporarilyInactiveContinuation) |
1142 parent->setContinuation(0); | 1139 parent->setContinuation(0); |
1143 child->moveAllChildrenTo(parent, nextSibling, child->hasLayer()); | 1140 child->moveAllChildrenTo(parent, nextSibling, child->hasLayer()); |
1144 if (temporarilyInactiveContinuation) | 1141 if (temporarilyInactiveContinuation) |
(...skipping 2773 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3918 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 3915 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
3919 { | 3916 { |
3920 showRenderObject(); | 3917 showRenderObject(); |
3921 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 3918 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
3922 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 3919 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
3923 } | 3920 } |
3924 | 3921 |
3925 #endif | 3922 #endif |
3926 | 3923 |
3927 } // namespace blink | 3924 } // namespace blink |
OLD | NEW |