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

Unified Diff: Source/platform/scroll/ScrollAnimatorNone.cpp

Issue 1298973004: Remove special wheel handling path from ScrollableArea (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed up test expectations - removed OSX #ifdef Created 5 years, 4 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/platform/scroll/ScrollAnimatorNone.cpp
diff --git a/Source/platform/scroll/ScrollAnimatorNone.cpp b/Source/platform/scroll/ScrollAnimatorNone.cpp
index 8c0df06c739c5a19ceb245d0db9040bb35404d5f..5aa4e199845f54d94b2da15189e863f0e60c6850 100644
--- a/Source/platform/scroll/ScrollAnimatorNone.cpp
+++ b/Source/platform/scroll/ScrollAnimatorNone.cpp
@@ -424,13 +424,14 @@ ScrollResultOneDimensional ScrollAnimatorNone::userScroll(ScrollbarOrientation o
PerAxisData& data = (orientation == VerticalScrollbar) ? m_verticalData : m_horizontalData;
bool needToScroll = data.updateDataFromParameters(step, delta, scrollableSize, WTF::monotonicallyIncreasingTime(), &parameters);
+ float unusedDelta = needToScroll ? delta - (data.m_desiredPosition - *data.m_currentPosition) : delta;
if (needToScroll && !animationTimerActive()) {
m_startTime = data.m_startTime;
animationWillStart();
animationTimerFired();
scrollableArea()->registerForAnimation();
}
- return ScrollResultOneDimensional(needToScroll);
+ return ScrollResultOneDimensional(needToScroll, unusedDelta);
}
void ScrollAnimatorNone::scrollToOffsetWithoutAnimation(const FloatPoint& offset)

Powered by Google App Engine
This is Rietveld 408576698