| Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| index 1c2b242686ddfa326f0731fffe2d3a4938ecb3b6..b01da8d3b3445e15b912267c019740df4a0fe142 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| @@ -3074,6 +3074,12 @@ void LayoutBlockFlow::collapseAnonymousBlockChild(LayoutBlockFlow* child) {
|
| LayoutInvalidationReason::ChildAnonymousBlockChanged);
|
|
|
| child->moveAllChildrenTo(this, child->nextSibling(), child->hasLayer());
|
| + // If we make an object's children inline we are going to frustrate any future
|
| + // attempts to remove floats from its children's float-lists before the next
|
| + // layout happens so clear down all the floatlists now - they will be rebuilt
|
| + // at layout.
|
| + if (child->childrenInline())
|
| + removeFloatingObjectsFromDescendants();
|
| setChildrenInline(child->childrenInline());
|
|
|
| children()->removeChildNode(this, child, child->hasLayer());
|
|
|