Source/core/layout/LayoutBlock.cpp - Issue 1120313003: [New Multicolumn] Simplified layout also needs to mark spanner placeholders for layout.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/layout/LayoutBlock.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 | « LayoutTests/fast/multicol/dynamic/relayout-abspos-in-relpos-spanner-expected.html ('k') | Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/layout/LayoutBlock.cpp

diff --git a/Source/core/layout/LayoutBlock.cpp b/Source/core/layout/LayoutBlock.cpp

index 6aa189fc9eb98f54b55729fc7bac7f14d579b22c..b7c6b4a47ac070a48fd6bafa60eddaa52841e439 100644

--- a/Source/core/layout/LayoutBlock.cpp

+++ b/Source/core/layout/LayoutBlock.cpp

@@ -46,6 +46,7 @@

#include "core/layout/LayoutFlowThread.h"

#include "core/layout/LayoutGrid.h"

#include "core/layout/LayoutInline.h"

+#include "core/layout/LayoutMultiColumnSpannerPlaceholder.h"

#include "core/layout/LayoutObject.h"

#include "core/layout/LayoutRegion.h"

#include "core/layout/LayoutTableCell.h"

@@ -1568,8 +1569,11 @@ void LayoutBlock::simplifiedNormalFlowLayout()

}

} else {

for (LayoutBox* box = firstChildBox(); box; box = box->nextSiblingBox()) {

- if (!box->isOutOfFlowPositioned())

+ if (!box->isOutOfFlowPositioned()) {

+ if (box->isLayoutMultiColumnSpannerPlaceholder())

+ toLayoutMultiColumnSpannerPlaceholder(box)->markForLayoutIfObjectInFlowThreadNeedsLayout();

box->layoutIfNeeded();

+ }

}