| 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 1b64042e1b0b87a92d3e41a6e0e1298a907d381f..3c6b59d257f81b05416e0eb57154de529032b02d 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp
|
| @@ -538,8 +538,6 @@ inline bool LayoutBlockFlow::layoutBlockFlow(bool relayoutChildren,
|
|
|
| TextAutosizer::LayoutScope textAutosizerLayoutScope(this, &layoutScope);
|
|
|
| - bool preferredLogicalWidthsWereDirty = preferredLogicalWidthsDirty();
|
| -
|
| // Reset the flag here instead of in layoutInlineChildren() in case that
|
| // all inline children are removed from this block.
|
| setContainsInlineWithOutlineAndContinuation(false);
|
| @@ -548,17 +546,6 @@ inline bool LayoutBlockFlow::layoutBlockFlow(bool relayoutChildren,
|
| else
|
| layoutBlockChildren(relayoutChildren, layoutScope, beforeEdge, afterEdge);
|
|
|
| - bool preferredLogicalWidthsBecameDirty =
|
| - !preferredLogicalWidthsWereDirty && preferredLogicalWidthsDirty();
|
| - if (preferredLogicalWidthsBecameDirty) {
|
| - // The only thing that should dirty preferred widths at this point is the
|
| - // addition of overflow:auto scrollbars in a descendant. To avoid a
|
| - // potential infinite loop, run layout again with auto scrollbars frozen in
|
| - // their current state.
|
| - PaintLayerScrollableArea::FreezeScrollbarsScope freezeScrollbars;
|
| - return layoutBlockFlow(relayoutChildren, pageLogicalHeight, layoutScope);
|
| - }
|
| -
|
| // Expand our intrinsic height to encompass floats.
|
| if (lowestFloatLogicalBottom() > (logicalHeight() - afterEdge) &&
|
| createsNewFormattingContext())
|
|
|