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

Unified Diff: Source/platform/scroll/ScrollAnimatorNone.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/platform/scroll/ScrollAnimatorNone.h ('k') | Source/platform/scroll/ScrollTypes.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/scroll/ScrollAnimatorNone.cpp
diff --git a/Source/platform/scroll/ScrollAnimatorNone.cpp b/Source/platform/scroll/ScrollAnimatorNone.cpp
index 8a1eff06e0f643c8a006bb02e8c7576bedbbbd6a..ceb757b16a23d25b742a17a67a183bb5f43dc217 100644
--- a/Source/platform/scroll/ScrollAnimatorNone.cpp
+++ b/Source/platform/scroll/ScrollAnimatorNone.cpp
@@ -433,7 +433,7 @@ ScrollResultOneDimensional ScrollAnimatorNone::userScroll(ScrollbarOrientation o
return ScrollResultOneDimensional(needToScroll);
}
-void ScrollAnimatorNone::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
+void ScrollAnimatorNone::scrollToOffsetWithoutAnimation(const FloatPoint& offset, ScrollType scrollType)
{
stopAnimationTimerIfNeeded();
@@ -447,7 +447,7 @@ void ScrollAnimatorNone::scrollToOffsetWithoutAnimation(const FloatPoint& offset
m_verticalData.m_desiredPosition = offset.y();
m_currentPosY = offset.y();
- notifyPositionChanged();
+ notifyPositionChanged(scrollType);
}
void ScrollAnimatorNone::cancelAnimations()
@@ -510,7 +510,7 @@ void ScrollAnimatorNone::animationTimerFired()
m_animationActive = false;
TRACE_EVENT0("blink", "ScrollAnimatorNone::notifyPositionChanged");
- notifyPositionChanged();
+ notifyPositionChanged(UserScroll);
if (!continueAnimation)
animationDidFinish();
« no previous file with comments | « Source/platform/scroll/ScrollAnimatorNone.h ('k') | Source/platform/scroll/ScrollTypes.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698