Source/core/rendering/RenderBlockFlow.cpp - Issue 242203003: [New Multicolumn] Make floats affect heights correctly.

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/rendering/RenderBlockFlow.cpp

Issue 242203003: [New Multicolumn] Make floats affect heights correctly. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 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

Index: Source/core/rendering/RenderBlockFlow.cpp

diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp

index 1ac818d3edd81b70fde14c786142593f90e75efa..04ad5cf9f919c1c61acba0d91ed49e0c364406d5 100644

--- a/Source/core/rendering/RenderBlockFlow.cpp

+++ b/Source/core/rendering/RenderBlockFlow.cpp

@@ -2448,7 +2448,7 @@ void RenderBlockFlow::addIntrudingFloats(RenderBlockFlow* prev, LayoutUnit logic

LayoutUnit RenderBlockFlow::addOverhangingFloats(RenderBlockFlow* child, bool makeChildPaintOtherFloats)

{

// Prevent floats from being added to the canvas by the root element, e.g., <html>.

- if (child->hasOverflowClip() || !child->containsFloats() || child->isDocumentElement() || child->hasColumns() || child->isWritingModeRoot())

+ if (child->hasOverflowClip() || !child->containsFloats() || child->isRenderFlowThread() || child->isRenderRegion() || child->isDocumentElement() || child->hasColumns() || child->isWritingModeRoot())

return 0;

LayoutUnit childLogicalTop = child->logicalTop();

« LayoutTests/fast/multicol/tall-float1.html ('K') | « Source/core/rendering/RenderBlock.cpp ('k') | no next file » | no next file with comments »