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

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

Issue 2387883002: Use float for scroll offset. (Closed)
Patch Set: Fix README.md 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/ProgrammaticScrollAnimator.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp b/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp
index 8fc9ce52aad55d0148ba8c5ae28e03077df7c33d..68ae706917453283778525c5599924a6b8e7fffc 100644
--- a/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp
@@ -6,7 +6,7 @@
#include "platform/animation/CompositorAnimation.h"
#include "platform/animation/CompositorScrollOffsetAnimationCurve.h"
-#include "platform/geometry/IntPoint.h"
+#include "platform/geometry/IntSize.h"
#include "platform/graphics/GraphicsLayer.h"
#include "platform/scroll/ScrollableArea.h"
#include "public/platform/Platform.h"
@@ -28,18 +28,18 @@ void ProgrammaticScrollAnimator::resetAnimationState() {
m_startTime = 0.0;
}
-void ProgrammaticScrollAnimator::notifyPositionChanged(
- const DoublePoint& offset) {
- scrollPositionChanged(offset, ProgrammaticScroll);
+void ProgrammaticScrollAnimator::notifyOffsetChanged(
+ const ScrollOffset& offset) {
+ scrollOffsetChanged(offset, ProgrammaticScroll);
}
void ProgrammaticScrollAnimator::scrollToOffsetWithoutAnimation(
- const FloatPoint& offset) {
+ const ScrollOffset& offset) {
cancelAnimation();
- notifyPositionChanged(offset);
+ notifyOffsetChanged(offset);
}
-void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset) {
+void ProgrammaticScrollAnimator::animateToOffset(const ScrollOffset& offset) {
if (m_runState == RunState::PostAnimationCleanup)
resetAnimationState();
@@ -52,7 +52,7 @@ void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset) {
m_scrollableArea->registerForAnimation();
if (!m_scrollableArea->scheduleAnimation()) {
resetAnimationState();
- notifyPositionChanged(IntPoint(offset.x(), offset.y()));
+ notifyOffsetChanged(offset);
}
m_runState = RunState::WaitingToSendToCompositor;
}
@@ -70,14 +70,14 @@ void ProgrammaticScrollAnimator::tickAnimation(double monotonicTime) {
m_startTime = monotonicTime;
double elapsedTime = monotonicTime - m_startTime;
bool isFinished = (elapsedTime > m_animationCurve->duration());
- FloatPoint offset =
+ ScrollOffset offset =
blinkOffsetFromCompositorOffset(m_animationCurve->getValue(elapsedTime));
- notifyPositionChanged(IntPoint(offset.x(), offset.y()));
+ notifyOffsetChanged(offset);
if (isFinished) {
m_runState = RunState::PostAnimationCleanup;
} else if (!m_scrollableArea->scheduleAnimation()) {
- notifyPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
+ notifyOffsetChanged(offset);
resetAnimationState();
}
}
@@ -133,10 +133,10 @@ void ProgrammaticScrollAnimator::updateCompositorAnimations() {
if (!sentToCompositor) {
m_runState = RunState::RunningOnMainThread;
- m_animationCurve->setInitialValue(compositorOffsetFromBlinkOffset(
- FloatPoint(m_scrollableArea->scrollPosition())));
+ m_animationCurve->setInitialValue(
+ compositorOffsetFromBlinkOffset(m_scrollableArea->scrollOffset()));
if (!m_scrollableArea->scheduleAnimation()) {
- notifyPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
+ notifyOffsetChanged(m_targetOffset);
resetAnimationState();
}
}
@@ -154,12 +154,12 @@ void ProgrammaticScrollAnimator::layerForCompositedScrollingDidChange(
m_runState = RunState::RunningOnMainThread;
m_compositorAnimationId = 0;
m_compositorAnimationGroupId = 0;
- m_animationCurve->setInitialValue(compositorOffsetFromBlinkOffset(
- FloatPoint(m_scrollableArea->scrollPosition())));
+ m_animationCurve->setInitialValue(
+ compositorOffsetFromBlinkOffset(m_scrollableArea->scrollOffset()));
m_scrollableArea->registerForAnimation();
if (!m_scrollableArea->scheduleAnimation()) {
resetAnimationState();
- notifyPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
+ notifyOffsetChanged(m_targetOffset);
}
}
}

Powered by Google App Engine
This is Rietveld 408576698