| 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 fc48cab3e05c766569f25454af712a7460b27e11..ed57b14281abc0817e7f64ea341d6833c4d2e6bb 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| @@ -673,10 +673,10 @@ void LayoutBox::scrollRectToVisible(const LayoutRect& rect,
|
| }
|
| }
|
|
|
| - // If we are fixed-position and scroll with the viewport, it is useless to
|
| + // If we are fixed-position and stick to the viewport, it is useless to
|
| // scroll the parent.
|
| if (style()->position() == FixedPosition && hasLayer() &&
|
| - layer()->scrollsWithViewport()) {
|
| + layer()->sticksToViewport()) {
|
| return;
|
| }
|
|
|
| @@ -1022,12 +1022,14 @@ IntSize LayoutBox::calculateAutoscrollDirection(
|
| }
|
|
|
| LayoutBox* LayoutBox::findAutoscrollable(LayoutObject* layoutObject) {
|
| + layoutObject->frameView()->updateAllLifecyclePhasesExceptPaint();
|
| +
|
| while (
|
| layoutObject &&
|
| !(layoutObject->isBox() && toLayoutBox(layoutObject)->canAutoscroll())) {
|
| // Do not start autoscroll when the node is inside a fixed-position element.
|
| if (layoutObject->isBox() && toLayoutBox(layoutObject)->hasLayer() &&
|
| - toLayoutBox(layoutObject)->layer()->scrollsWithViewport()) {
|
| + toLayoutBox(layoutObject)->layer()->sticksToViewport()) {
|
| return nullptr;
|
| }
|
|
|
|
|