| 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 e0c059fc871205d9503b781749f343435571bcf9..fa85bd3df828cb0893bc5f3169433e097da611fa 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
|
| @@ -113,7 +113,7 @@ LayoutRect RootFrameViewport::scrollIntoView(const LayoutRect& rectInContent, co
|
| ScrollAlignment::getRectToExpose(viewRectInContent, rectInContent, alignX, alignY);
|
| DoublePoint targetOffset(targetViewport.x(), targetViewport.y());
|
|
|
| - 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.
|
|
|