| Index: third_party/WebKit/Source/core/frame/RootFrameViewport.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp b/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp
|
| index eb60da7f4533a3b0a955cb7d1f04706be97ba581..a02be4ccdbc1d8ca71a51b9643ab49e78b6b1759 100644
|
| --- a/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/RootFrameViewport.cpp
|
| @@ -93,7 +93,7 @@ ScrollBehavior RootFrameViewport::scrollBehaviorStyle() const
|
| return layoutViewport().scrollBehaviorStyle();
|
| }
|
|
|
| -LayoutRect RootFrameViewport::scrollIntoView(const LayoutRect& rectInContent, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
|
| +LayoutRect RootFrameViewport::scrollIntoView(const LayoutRect& rectInContent, const ScrollAlignment& alignX, const ScrollAlignment& alignY, ScrollType scrollType)
|
| {
|
| // We want to move the rect into the viewport that excludes the scrollbars so we intersect
|
| // the visual viewport with the scrollbar-excluded frameView content rect. However, we don't
|
| @@ -129,7 +129,7 @@ LayoutRect RootFrameViewport::scrollIntoView(const LayoutRect& rectInContent, co
|
| targetViewport.x() - centeringOffsetX,
|
| targetViewport.y() - centeringOffsetY);
|
|
|
| - setScrollPosition(targetOffset, ProgrammaticScroll);
|
| + setScrollPosition(targetOffset, scrollType, ScrollBehaviorInstant);
|
|
|
| // RootFrameViewport only changes the viewport relative to the document so we can't change the input
|
| // rect's location relative to the document origin.
|
|
|