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

Unified Diff: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp

Issue 2383113003: Refactor ScrollableArea::setScrollPosition. (Closed)
Patch Set: Fix clamping, comment tweaks Created 4 years, 2 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: third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
index 1184db856fce0f2a876889e27720a0f51ce5dcf5..39d68eecfaebc6682a408db6c6fab2d54c6d029c 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollableArea.cpp
@@ -178,22 +178,28 @@ ScrollResult ScrollableArea::userScroll(ScrollGranularity granularity,
void ScrollableArea::setScrollPosition(const DoublePoint& position,
ScrollType scrollType,
ScrollBehavior behavior) {
+ DoublePoint clampedPosition = clampScrollPosition(position);
+ if (shouldUseIntegerScrollOffset())
+ clampedPosition = flooredIntPoint(clampedPosition);
+ if (clampedPosition == scrollPositionDouble())
+ return;
+
if (behavior == ScrollBehaviorAuto)
behavior = scrollBehaviorStyle();
switch (scrollType) {
case CompositorScroll:
- scrollPositionChanged(clampScrollPosition(position), scrollType);
+ scrollPositionChanged(clampedPosition, scrollType);
break;
case AnchoringScroll:
- scrollAnimator().adjustAnimationAndSetScrollPosition(position,
+ scrollAnimator().adjustAnimationAndSetScrollPosition(clampedPosition,
scrollType);
break;
case ProgrammaticScroll:
- programmaticScrollHelper(position, behavior);
+ programmaticScrollHelper(clampedPosition, behavior);
break;
case UserScroll:
- userScrollHelper(position, behavior);
+ userScrollHelper(clampedPosition, behavior);
break;
default:
ASSERT_NOT_REACHED();

Powered by Google App Engine
This is Rietveld 408576698