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

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: Rebase 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
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 5b7842fa68deac801679a6f650775344e28bf1fe..e68f007c35595f9cc4c51a998126f6422b91a37a 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -903,7 +903,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;
}
@@ -3063,7 +3063,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);

Powered by Google App Engine
This is Rietveld 408576698