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/CompositorFactory.h" |
| 8 #include "platform/animation/WebScrollOffsetAnimationCurve.h" |
7 #include "platform/geometry/IntPoint.h" | 9 #include "platform/geometry/IntPoint.h" |
8 #include "platform/graphics/GraphicsLayer.h" | 10 #include "platform/graphics/GraphicsLayer.h" |
9 #include "platform/scroll/ScrollableArea.h" | 11 #include "platform/scroll/ScrollableArea.h" |
10 #include "public/platform/Platform.h" | 12 #include "public/platform/Platform.h" |
11 #include "public/platform/WebCompositorAnimation.h" | 13 #include "public/platform/WebCompositorAnimation.h" |
12 #include "public/platform/WebCompositorSupport.h" | 14 #include "public/platform/WebCompositorSupport.h" |
13 #include "public/platform/WebScrollOffsetAnimationCurve.h" | |
14 | 15 |
15 namespace blink { | 16 namespace blink { |
16 | 17 |
17 PassOwnPtrWillBeRawPtr<ProgrammaticScrollAnimator> ProgrammaticScrollAnimator::c
reate(ScrollableArea* scrollableArea) | 18 PassOwnPtrWillBeRawPtr<ProgrammaticScrollAnimator> ProgrammaticScrollAnimator::c
reate(ScrollableArea* scrollableArea) |
18 { | 19 { |
19 return adoptPtrWillBeNoop(new ProgrammaticScrollAnimator(scrollableArea)); | 20 return adoptPtrWillBeNoop(new ProgrammaticScrollAnimator(scrollableArea)); |
20 } | 21 } |
21 | 22 |
22 ProgrammaticScrollAnimator::ProgrammaticScrollAnimator(ScrollableArea* scrollabl
eArea) | 23 ProgrammaticScrollAnimator::ProgrammaticScrollAnimator(ScrollableArea* scrollabl
eArea) |
23 : m_scrollableArea(scrollableArea) | 24 : m_scrollableArea(scrollableArea) |
(...skipping 20 matching lines...) Expand all Loading... |
44 void ProgrammaticScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint
& offset) | 45 void ProgrammaticScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint
& offset) |
45 { | 46 { |
46 cancelAnimation(); | 47 cancelAnimation(); |
47 notifyPositionChanged(offset); | 48 notifyPositionChanged(offset); |
48 } | 49 } |
49 | 50 |
50 void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset) | 51 void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset) |
51 { | 52 { |
52 m_startTime = 0.0; | 53 m_startTime = 0.0; |
53 m_targetOffset = offset; | 54 m_targetOffset = offset; |
54 m_animationCurve = adoptPtr(Platform::current()->compositorSupport()->create
ScrollOffsetAnimationCurve( | 55 m_animationCurve = adoptPtr(CompositorFactory::current().createScrollOffsetA
nimationCurve( |
55 m_targetOffset, | 56 m_targetOffset, |
56 WebCompositorAnimationCurve::TimingFunctionTypeEaseInOut, | 57 WebCompositorAnimationCurve::TimingFunctionTypeEaseInOut, |
57 WebScrollOffsetAnimationCurve::ScrollDurationDeltaBased)); | 58 WebScrollOffsetAnimationCurve::ScrollDurationDeltaBased)); |
58 | 59 |
59 m_scrollableArea->registerForAnimation(); | 60 m_scrollableArea->registerForAnimation(); |
60 if (!m_scrollableArea->scheduleAnimation()) { | 61 if (!m_scrollableArea->scheduleAnimation()) { |
61 resetAnimationState(); | 62 resetAnimationState(); |
62 notifyPositionChanged(IntPoint(offset.x(), offset.y())); | 63 notifyPositionChanged(IntPoint(offset.x(), offset.y())); |
63 } | 64 } |
64 m_runState = RunState::WaitingToSendToCompositor; | 65 m_runState = RunState::WaitingToSendToCompositor; |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
164 ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId); | 165 ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId); |
165 } | 166 } |
166 | 167 |
167 DEFINE_TRACE(ProgrammaticScrollAnimator) | 168 DEFINE_TRACE(ProgrammaticScrollAnimator) |
168 { | 169 { |
169 visitor->trace(m_scrollableArea); | 170 visitor->trace(m_scrollableArea); |
170 ScrollAnimatorCompositorCoordinator::trace(visitor); | 171 ScrollAnimatorCompositorCoordinator::trace(visitor); |
171 } | 172 } |
172 | 173 |
173 } // namespace blink | 174 } // namespace blink |
OLD | NEW |