| Index: third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp
|
| index f8e7fcc8448d90eeb847a49dadac91d888681e41..702e643087258cdf81e2c0f7783471c49ab46100 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutDeprecatedFlexibleBox.cpp
|
| @@ -456,7 +456,7 @@ void LayoutDeprecatedFlexibleBox::layoutHorizontalBox(bool relayoutChildren) {
|
| gatherFlexChildrenInfo(iterator, relayoutChildren, highestFlexGroup,
|
| lowestFlexGroup, haveFlex);
|
|
|
| - PaintLayerScrollableArea::DelayScrollPositionClampScope delayClampScope;
|
| + PaintLayerScrollableArea::DelayScrollOffsetClampScope delayClampScope;
|
|
|
| // We do 2 passes. The first pass is simply to lay everyone out at
|
| // their preferred widths. The second pass handles flexing the children.
|
| @@ -802,7 +802,7 @@ void LayoutDeprecatedFlexibleBox::layoutVerticalBox(bool relayoutChildren) {
|
| if (haveLineClamp)
|
| applyLineClamp(iterator, relayoutChildren);
|
|
|
| - PaintLayerScrollableArea::DelayScrollPositionClampScope delayClampScope;
|
| + PaintLayerScrollableArea::DelayScrollOffsetClampScope delayClampScope;
|
|
|
| // We do 2 passes. The first pass is simply to lay everyone out at
|
| // their preferred widths. The second pass handles flexing the children.
|
|
|