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

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

Issue 656143003: Ignore continuations when collapsing an anonymous block. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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/nested-multicol-two-spanners-dynamic-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 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 if (child->beingDestroyed()) 1115 if (child->beingDestroyed())
1116 return; 1116 return;
1117 parent->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); 1117 parent->setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
1118 parent->setChildrenInline(child->childrenInline()); 1118 parent->setChildrenInline(child->childrenInline());
1119 RenderObject* nextSibling = child->nextSibling(); 1119 RenderObject* nextSibling = child->nextSibling();
1120 1120
1121 RenderFlowThread* childFlowThread = child->flowThreadContainingBlock(); 1121 RenderFlowThread* childFlowThread = child->flowThreadContainingBlock();
1122 CurrentRenderFlowThreadMaintainer flowThreadMaintainer(childFlowThread); 1122 CurrentRenderFlowThreadMaintainer flowThreadMaintainer(childFlowThread);
1123 1123
1124 parent->children()->removeChildNode(parent, child, child->hasLayer()); 1124 parent->children()->removeChildNode(parent, child, child->hasLayer());
1125 // FIXME: Get rid of the temporary disabling of continuations. This is neede d by the old
1126 // multicol implementation, because of buggy block continuation handling (wh ich is hard and
1127 // rather pointless to fix at this point). Support for block continuations c an be removed
1128 // together with the old multicol implementation. crbug.com/408123
1129 RenderBoxModelObject* temporarilyInactiveContinuation = parent->continuation ();
1130 if (temporarilyInactiveContinuation)
1131 parent->setContinuation(0);
1125 child->moveAllChildrenTo(parent, nextSibling, child->hasLayer()); 1132 child->moveAllChildrenTo(parent, nextSibling, child->hasLayer());
1133 if (temporarilyInactiveContinuation)
1134 parent->setContinuation(temporarilyInactiveContinuation);
1126 // Explicitly delete the child's line box tree, or the special anonymous 1135 // Explicitly delete the child's line box tree, or the special anonymous
1127 // block handling in willBeDestroyed will cause problems. 1136 // block handling in willBeDestroyed will cause problems.
1128 child->deleteLineBoxTree(); 1137 child->deleteLineBoxTree();
1129 child->destroy(); 1138 child->destroy();
1130 } 1139 }
1131 1140
1132 void RenderBlock::removeChild(RenderObject* oldChild) 1141 void RenderBlock::removeChild(RenderObject* oldChild)
1133 { 1142 {
1134 // No need to waste time in merging or removing empty anonymous blocks. 1143 // No need to waste time in merging or removing empty anonymous blocks.
1135 // We can just bail out if our document is getting destroyed. 1144 // We can just bail out if our document is getting destroyed.
(...skipping 3232 matching lines...) Expand 10 before | Expand all | Expand 10 after
4368 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 4377 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
4369 { 4378 {
4370 showRenderObject(); 4379 showRenderObject();
4371 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 4380 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
4372 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 4381 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
4373 } 4382 }
4374 4383
4375 #endif 4384 #endif
4376 4385
4377 } // namespace blink 4386 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/multicol/nested-multicol-two-spanners-dynamic-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698