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 9e64a983ed273135f768d12e98d0c4a98780eba9..dd43de21ee964dcb6b99e61db1c51629f77acefd 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
@@ -71,6 +71,7 @@ |
#include "core/layout/compositing/CompositedSelection.h" |
#include "core/layout/compositing/PaintLayerCompositor.h" |
#include "core/layout/svg/LayoutSVGRoot.h" |
+#include "core/loader/DocumentLoader.h" |
#include "core/loader/FrameLoader.h" |
#include "core/loader/FrameLoaderClient.h" |
#include "core/page/AutoscrollController.h" |
@@ -3409,6 +3410,11 @@ void FrameView::setScrollOffset(const DoublePoint& offset, ScrollType scrollType |
frame().loader().saveScrollState(); |
frame().loader().client()->didChangeScrollOffset(); |
+ if (scrollType == CompositorScroll && m_frame->isMainFrame()) { |
+ if (DocumentLoader* documentLoader = m_frame->loader().documentLoader()) |
+ documentLoader->initialScrollState().wasScrolledByUser = true; |
+ } |
+ |
if (scrollType != AnchoringScroll) |
clearScrollAnchor(); |
} |