third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp - Issue 1513303005: Clear child's floats when moving from parent with block children to parent with inline children

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: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

Issue 1513303005: Clear child's floats when moving from parent with block children to parent with inline children (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updated Created 5 years 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 | « third_party/WebKit/LayoutTests/fast/block/float/clear-intruding-floats-when-moving-to-inline-parent-3-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

index 5d5ecdd338f009522a661c96cd1d18eb341f76bc..411183ed1f7cda4b7d6a3066e1bf6ce26024b8a9 100644

--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

@@ -1015,7 +1015,7 @@ void LayoutBoxModelObject::moveChildTo(LayoutBoxModelObject* toBoxModelObject, L

// the child can no longer do so. This can happen if a block becomes floating or out-of-flow and is moved

// to an anonymous block. Remove all floats from their float-lists immediately as markAllDescendantsWithFloatsForLayout

// won't attempt to remove floats from parents that have inline-flow if we try later.

- if (child->isLayoutBlockFlow() && toBoxModelObject->childrenInline() && !child->childrenInline() && !childrenInline()) {

+ if (child->isLayoutBlockFlow() && toBoxModelObject->childrenInline() && !childrenInline()) {

toLayoutBlockFlow(child)->removeFloatingObjectsFromDescendants();

ASSERT(!toLayoutBlockFlow(child)->containsFloats());

}