Source/core/rendering/RenderBlockFlow.cpp - Issue 850143002: Ensure we remove floats from descendants even if they have become inline

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 850143002: Ensure we remove floats from descendants even if they have become inline (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 11 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 0d371aa66d299744b416c0eaf228cff9323deac4..f4ffdc1212bad3b3f94f4e56fa325b9171ceb482 100644

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

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

@@ -1826,7 +1826,7 @@ void RenderBlockFlow::markAllDescendantsWithFloatsForLayout(RenderBox* floatToRe

removeFloatingObject(floatToRemove);

// Iterate over our children and mark them as needed.

- if (!childrenInline()) {

+ if (!childrenInline() || floatToRemove) {

Julien - ping for review 2015/01/22 14:34:47 Does the childrenInline check still make sense?

for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {

if ((!floatToRemove && child->isFloatingOrOutOfFlowPositioned()) || !child->isRenderBlock())

continue;

« no previous file with comments | « no previous file | Source/core/rendering/RenderHTMLCanvas.cpp » ('j') | Source/core/rendering/RenderHTMLCanvas.cpp » ('J')