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

Unified Diff: Source/core/layout/LayoutBlockFlow.cpp

Issue 1120313003: [New Multicolumn] Simplified layout also needs to mark spanner placeholders for layout. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutMultiColumnSpannerPlaceholder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBlockFlow.cpp
diff --git a/Source/core/layout/LayoutBlockFlow.cpp b/Source/core/layout/LayoutBlockFlow.cpp
index dfcebdc15f07bae306b16ed8f99c1a3684d8cde0..543d12b4c9e8ffa25c90f69ed899e8b58fa7206f 100644
--- a/Source/core/layout/LayoutBlockFlow.cpp
+++ b/Source/core/layout/LayoutBlockFlow.cpp
@@ -2007,11 +2007,8 @@ void LayoutBlockFlow::styleDidChange(StyleDifference diff, const ComputedStyle*
void LayoutBlockFlow::updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildren, LayoutBox& child)
{
- if (child.isLayoutMultiColumnSpannerPlaceholder() && toLayoutMultiColumnSpannerPlaceholder(child).layoutObjectInFlowThread()->needsLayout()) {
- // The containing block of a spanner is the multicol container (|this| block), but the spanner
- // is laid out via its spanner set (|child|), so we need to make sure that we enter it.
- child.setChildNeedsLayout(MarkOnlyThis);
- }
+ if (child.isLayoutMultiColumnSpannerPlaceholder())
+ toLayoutMultiColumnSpannerPlaceholder(child).markForLayoutIfObjectInFlowThreadNeedsLayout();
LayoutBlock::updateBlockChildDirtyBitsBeforeLayout(relayoutChildren, child);
}
« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutMultiColumnSpannerPlaceholder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698