OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "platform/scroll/ProgrammaticScrollAnimator.h" | 5 #include "platform/scroll/ProgrammaticScrollAnimator.h" |
6 | 6 |
7 #include "platform/animation/CompositorAnimation.h" | 7 #include "platform/animation/CompositorAnimation.h" |
8 #include "platform/animation/CompositorScrollOffsetAnimationCurve.h" | 8 #include "platform/animation/CompositorScrollOffsetAnimationCurve.h" |
9 #include "platform/geometry/IntPoint.h" | 9 #include "platform/geometry/IntPoint.h" |
10 #include "platform/graphics/CompositorFactory.h" | 10 #include "platform/graphics/CompositorFactory.h" |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 void ProgrammaticScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint
& offset) | 45 void ProgrammaticScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint
& offset) |
46 { | 46 { |
47 cancelAnimation(); | 47 cancelAnimation(); |
48 notifyPositionChanged(offset); | 48 notifyPositionChanged(offset); |
49 } | 49 } |
50 | 50 |
51 void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset) | 51 void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset) |
52 { | 52 { |
53 m_startTime = 0.0; | 53 m_startTime = 0.0; |
54 m_targetOffset = offset; | 54 m_targetOffset = offset; |
55 m_animationCurve = adoptPtr(CompositorFactory::current().createScrollOffsetA
nimationCurve( | 55 m_animationCurve = CompositorFactory::current().createScrollOffsetAnimationC
urve( |
56 m_targetOffset, | 56 m_targetOffset, |
57 CompositorAnimationCurve::TimingFunctionTypeEaseInOut, | 57 CompositorAnimationCurve::TimingFunctionTypeEaseInOut, |
58 CompositorScrollOffsetAnimationCurve::ScrollDurationDeltaBased)); | 58 CompositorScrollOffsetAnimationCurve::ScrollDurationDeltaBased); |
59 | 59 |
60 m_scrollableArea->registerForAnimation(); | 60 m_scrollableArea->registerForAnimation(); |
61 if (!m_scrollableArea->scheduleAnimation()) { | 61 if (!m_scrollableArea->scheduleAnimation()) { |
62 resetAnimationState(); | 62 resetAnimationState(); |
63 notifyPositionChanged(IntPoint(offset.x(), offset.y())); | 63 notifyPositionChanged(IntPoint(offset.x(), offset.y())); |
64 } | 64 } |
65 m_runState = RunState::WaitingToSendToCompositor; | 65 m_runState = RunState::WaitingToSendToCompositor; |
66 } | 66 } |
67 | 67 |
68 void ProgrammaticScrollAnimator::cancelAnimation() | 68 void ProgrammaticScrollAnimator::cancelAnimation() |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 if (m_runState == RunState::WaitingToCancelOnCompositor) { | 107 if (m_runState == RunState::WaitingToCancelOnCompositor) { |
108 resetAnimationState(); | 108 resetAnimationState(); |
109 return; | 109 return; |
110 } | 110 } |
111 } | 111 } |
112 | 112 |
113 if (m_runState == RunState::WaitingToSendToCompositor) { | 113 if (m_runState == RunState::WaitingToSendToCompositor) { |
114 bool sentToCompositor = false; | 114 bool sentToCompositor = false; |
115 | 115 |
116 if (!m_scrollableArea->shouldScrollOnMainThread()) { | 116 if (!m_scrollableArea->shouldScrollOnMainThread()) { |
117 OwnPtr<CompositorAnimation> animation = adoptPtr(CompositorFactory::
current().createAnimation(*m_animationCurve, CompositorAnimation::TargetProperty
ScrollOffset)); | 117 OwnPtr<CompositorAnimation> animation = CompositorFactory::current()
.createAnimation(*m_animationCurve, CompositorAnimation::TargetPropertyScrollOff
set); |
118 | 118 |
119 int animationId = animation->id(); | 119 int animationId = animation->id(); |
120 int animationGroupId = animation->group(); | 120 int animationGroupId = animation->group(); |
121 | 121 |
122 if (addAnimation(animation.release())) { | 122 if (addAnimation(animation.release())) { |
123 sentToCompositor = true; | 123 sentToCompositor = true; |
124 m_runState = RunState::RunningOnCompositor; | 124 m_runState = RunState::RunningOnCompositor; |
125 m_compositorAnimationId = animationId; | 125 m_compositorAnimationId = animationId; |
126 m_compositorAnimationGroupId = animationGroupId; | 126 m_compositorAnimationGroupId = animationGroupId; |
127 } | 127 } |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId); | 163 ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId); |
164 } | 164 } |
165 | 165 |
166 DEFINE_TRACE(ProgrammaticScrollAnimator) | 166 DEFINE_TRACE(ProgrammaticScrollAnimator) |
167 { | 167 { |
168 visitor->trace(m_scrollableArea); | 168 visitor->trace(m_scrollableArea); |
169 ScrollAnimatorCompositorCoordinator::trace(visitor); | 169 ScrollAnimatorCompositorCoordinator::trace(visitor); |
170 } | 170 } |
171 | 171 |
172 } // namespace blink | 172 } // namespace blink |
OLD | NEW |