| Index: third_party/WebKit/Source/core/frame/FrameView.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| index 0ac9a2b83253f07c93b5c44daff1e746881dddc2..525c8443685e591bd8443a1de623730db3326c7c 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -3670,7 +3670,7 @@ bool FrameView::shouldPlaceVerticalScrollbarOnLeft() const
|
| return false;
|
| }
|
|
|
| -LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent, const ScrollAlignment& alignX, const ScrollAlignment& alignY)
|
| +LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent, const ScrollAlignment& alignX, const ScrollAlignment& alignY, ScrollType scrollType)
|
| {
|
| LayoutRect viewRect(visibleContentRect());
|
| LayoutRect exposeRect = ScrollAlignment::getRectToExpose(viewRect, rectInContent, alignX, alignY);
|
| @@ -3678,7 +3678,7 @@ LayoutRect FrameView::scrollIntoView(const LayoutRect& rectInContent, const Scro
|
| double xOffset = exposeRect.x();
|
| double yOffset = exposeRect.y();
|
|
|
| - setScrollPosition(DoublePoint(xOffset, yOffset), ProgrammaticScroll);
|
| + setScrollPosition(DoublePoint(xOffset, yOffset), scrollType);
|
|
|
| // Scrolling the FrameView cannot change the input rect's location relative to the document.
|
| return rectInContent;
|
|
|