Source/core/rendering/RenderBlock.cpp - Issue 14759010: Fix the float logic to not return an anonymous block ancestor

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/RenderBlock.cpp

Issue 14759010: Fix the float logic to not return an anonymous block ancestor (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Update as per Julien's comments. Created 7 years, 7 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

« LayoutTests/fast/block/float/float-not-removed-crash2.html ('K') | « LayoutTests/fast/block/float/float-not-removed-crash2-expected.txt ('k') | Source/core/rendering/RenderBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/RenderBlock.cpp

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

index 2218ef58cc7127d0831bc451adb4f5c91c9d7414..9681dc4e23d33c18a0c918addfc57e87eec7e2e4 100644

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

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

@@ -4744,7 +4744,7 @@ void RenderBlock::markAllDescendantsWithFloatsForLayout(RenderBox* floatToRemove

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

continue;

RenderBlock* childBlock = toRenderBlock(child);

- if ((floatToRemove ? childBlock->containsFloat(floatToRemove) : childBlock->containsFloats()) || childBlock->shrinkToAvoidFloats())

+ if (childBlock->isAnonymousBlock() || (floatToRemove ? childBlock->containsFloat(floatToRemove) : childBlock->containsFloats()) || childBlock->shrinkToAvoidFloats())

Julien - ping for review 2013/05/07 18:43:20 Based on our discussion, this is unneeded and will

childBlock->markAllDescendantsWithFloatsForLayout(floatToRemove, inLayout);

}