| Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp | 
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp | 
| index 05d55ffa18e60853fa851e01881dc856ea4d7827..9460837de934d171b87138dd10dc175b49815f74 100644 | 
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp | 
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp | 
| @@ -4761,6 +4761,7 @@ bool LayoutBox::avoidsFloats() const { | 
| // crbug.com/460704: This should be merged with createsNewFormattingContext(). | 
| return shouldBeConsideredAsReplaced() || hasOverflowClip() || isHR() || | 
| isLegend() || isWritingModeRoot() || isFlexItemIncludingDeprecated() || | 
| +         style()->getColumnSpan() == ColumnSpanAll || | 
| style()->containsPaint() || style()->containsLayout() || | 
| style()->display() == EDisplay::kFlowRoot; | 
| } | 
|  |