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

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

Issue 2383113003: Refactor ScrollableArea::setScrollPosition. (Closed)
Patch Set: nits and rebase 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/ScrollAnimator.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp
index c3a8ee7654bd0bca004dc39b7b379819346a1622..7e37425c6e8419afcc0c608d11559e40d7bdb1f9 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.cpp
@@ -190,19 +190,18 @@ bool ScrollAnimator::willAnimateToOffset(const FloatPoint& targetPos) {
void ScrollAnimator::adjustAnimationAndSetScrollPosition(
const DoublePoint& position,
ScrollType scrollType) {
- DoublePoint adjustedPos = m_scrollableArea->clampScrollPosition(position);
- IntSize actualAdjustment =
- roundedIntPoint(adjustedPos) -
+ IntSize adjustment =
+ roundedIntPoint(position) -
roundedIntPoint(m_scrollableArea->scrollPositionDouble());
- scrollPositionChanged(adjustedPos, scrollType);
+ scrollPositionChanged(position, scrollType);
if (m_runState == RunState::Idle) {
- adjustImplOnlyScrollOffsetAnimation(actualAdjustment);
+ adjustImplOnlyScrollOffsetAnimation(adjustment);
} else if (hasRunningAnimation()) {
- m_targetOffset += toFloatSize(actualAdjustment);
+ m_targetOffset += toFloatSize(adjustment);
if (m_animationCurve) {
- m_animationCurve->applyAdjustment(actualAdjustment);
+ m_animationCurve->applyAdjustment(adjustment);
if (m_runState != RunState::RunningOnMainThread &&
registerAndScheduleAnimation())
m_runState = RunState::RunningOnCompositorButNeedsAdjustment;

Powered by Google App Engine
This is Rietveld 408576698