| 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 57b0a06242d65daf7d7c4b1828221da15edb9fa6..2e69829b2ac331b700c38b47eeb98faa02bf4815 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| @@ -4710,9 +4710,11 @@ bool LayoutBox::shouldBeConsideredAsReplaced() const {
|
|
|
| DISABLE_CFI_PERF
|
| bool LayoutBox::avoidsFloats() const {
|
| + // crbug.com/460704: This should be merged with createsNewFormattingContext().
|
| return shouldBeConsideredAsReplaced() || hasOverflowClip() || isHR() ||
|
| isLegend() || isWritingModeRoot() || isFlexItemIncludingDeprecated() ||
|
| - style()->containsPaint() || style()->containsLayout();
|
| + style()->containsPaint() || style()->containsLayout() ||
|
| + style()->display() == EDisplay::FlowRoot;
|
| }
|
|
|
| bool LayoutBox::hasNonCompositedScrollbars() const {
|
|
|