Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2504)

Unified Diff: Source/web/WebViewImpl.cpp

Issue 1158673006: Replace various ScrollableArea scroll methods with setScrollPosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Build fix Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/RotationViewportAnchor.cpp ('k') | Source/web/tests/PinchViewportTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 8d0187ebec2061a4fbc22b986e5f49193f386605..9159d76f62c574e3e1bb7e0542557a4d3359220a 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -904,7 +904,7 @@ bool WebViewImpl::startPageScaleAnimation(const IntPoint& targetPosition, bool u
FrameView* view = mainFrameImpl()->frameView();
if (view && view->scrollableArea())
- view->scrollableArea()->setScrollPosition(DoublePoint(clampedPoint.x, clampedPoint.y));
+ view->scrollableArea()->setScrollPosition(DoublePoint(clampedPoint.x, clampedPoint.y), ProgrammaticScroll);
return false;
}
@@ -3072,7 +3072,7 @@ void WebViewImpl::scrollAndRescaleViewports(float scaleFactor,
// Order is important: pinch viewport location is clamped based on
// main frame scroll position and pinch viewport scale.
- view->setScrollOffset(mainFrameOrigin);
+ view->setScrollPosition(mainFrameOrigin, ProgrammaticScroll);
setPageScaleFactor(scaleFactor);
« no previous file with comments | « Source/web/RotationViewportAnchor.cpp ('k') | Source/web/tests/PinchViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698