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

Unified Diff: Source/core/frame/LocalDOMWindow.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/core/frame/FrameView.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalDOMWindow.cpp
diff --git a/Source/core/frame/LocalDOMWindow.cpp b/Source/core/frame/LocalDOMWindow.cpp
index 97179dffc684d668a491d62c2e04e7a5c7423c7c..cb460df1aa23f7b577c547baac6faf76830c4dd4 100644
--- a/Source/core/frame/LocalDOMWindow.cpp
+++ b/Source/core/frame/LocalDOMWindow.cpp
@@ -1135,7 +1135,7 @@ void LocalDOMWindow::scrollBy(double x, double y, ScrollBehavior scrollBehavior)
DoublePoint currentOffset = view->scrollableArea()->scrollPositionDouble();
DoubleSize scaledDelta(x * frame()->pageZoomFactor(), y * frame()->pageZoomFactor());
- view->scrollableArea()->setScrollPosition(currentOffset + scaledDelta, scrollBehavior);
+ view->scrollableArea()->setScrollPosition(currentOffset + scaledDelta, ProgrammaticScroll, scrollBehavior);
}
void LocalDOMWindow::scrollBy(const ScrollToOptions& scrollToOptions) const
@@ -1169,7 +1169,7 @@ void LocalDOMWindow::scrollTo(double x, double y) const
document()->updateLayoutIgnorePendingStylesheets();
DoublePoint layoutPos(x * frame()->pageZoomFactor(), y * frame()->pageZoomFactor());
- view->scrollableArea()->setScrollPosition(layoutPos, ScrollBehaviorAuto);
+ view->scrollableArea()->setScrollPosition(layoutPos, ProgrammaticScroll, ScrollBehaviorAuto);
}
void LocalDOMWindow::scrollTo(const ScrollToOptions& scrollToOptions) const
@@ -1205,7 +1205,7 @@ void LocalDOMWindow::scrollTo(const ScrollToOptions& scrollToOptions) const
ScrollBehavior scrollBehavior = ScrollBehaviorAuto;
ScrollableArea::scrollBehaviorFromString(scrollToOptions.behavior(), scrollBehavior);
- view->scrollableArea()->setScrollPosition(DoublePoint(scaledX, scaledY), scrollBehavior);
+ view->scrollableArea()->setScrollPosition(DoublePoint(scaledX, scaledY), ProgrammaticScroll, scrollBehavior);
}
void LocalDOMWindow::moveBy(int x, int y, bool hasX, bool hasY) const
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/frame/LocalFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698