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

Side by Side Diff: third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ScrollAnimatorCompositorCoordinator for MSVC. Created 4 years, 10 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 unified diff | Download patch
OLDNEW
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/WebCompositorAnimation.h"
9 #include "platform/animation/WebScrollOffsetAnimationCurve.h"
7 #include "platform/geometry/IntPoint.h" 10 #include "platform/geometry/IntPoint.h"
8 #include "platform/graphics/GraphicsLayer.h" 11 #include "platform/graphics/GraphicsLayer.h"
9 #include "platform/scroll/ScrollableArea.h" 12 #include "platform/scroll/ScrollableArea.h"
10 #include "public/platform/Platform.h" 13 #include "public/platform/Platform.h"
11 #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
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 if (m_runState == RunState::WaitingToCancelOnCompositor) { 107 if (m_runState == RunState::WaitingToCancelOnCompositor) {
107 resetAnimationState(); 108 resetAnimationState();
108 return; 109 return;
109 } 110 }
110 } 111 }
111 112
112 if (m_runState == RunState::WaitingToSendToCompositor) { 113 if (m_runState == RunState::WaitingToSendToCompositor) {
113 bool sentToCompositor = false; 114 bool sentToCompositor = false;
114 115
115 if (!m_scrollableArea->shouldScrollOnMainThread()) { 116 if (!m_scrollableArea->shouldScrollOnMainThread()) {
116 OwnPtr<WebCompositorAnimation> animation = adoptPtr(Platform::curren t()->compositorSupport()->createAnimation(*m_animationCurve, WebCompositorAnimat ion::TargetPropertyScrollOffset)); 117 OwnPtr<WebCompositorAnimation> animation = adoptPtr(CompositorFactor y::current().createAnimation(*m_animationCurve, WebCompositorAnimation::TargetPr opertyScrollOffset));
117 118
118 int animationId = animation->id(); 119 int animationId = animation->id();
119 int animationGroupId = animation->group(); 120 int animationGroupId = animation->group();
120 121
121 if (addAnimation(animation.release())) { 122 if (addAnimation(animation.release())) {
122 sentToCompositor = true; 123 sentToCompositor = true;
123 m_runState = RunState::RunningOnCompositor; 124 m_runState = RunState::RunningOnCompositor;
124 m_compositorAnimationId = animationId; 125 m_compositorAnimationId = animationId;
125 m_compositorAnimationGroupId = animationGroupId; 126 m_compositorAnimationGroupId = animationGroupId;
126 } 127 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId); 163 ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId);
163 } 164 }
164 165
165 DEFINE_TRACE(ProgrammaticScrollAnimator) 166 DEFINE_TRACE(ProgrammaticScrollAnimator)
166 { 167 {
167 visitor->trace(m_scrollableArea); 168 visitor->trace(m_scrollableArea);
168 ScrollAnimatorCompositorCoordinator::trace(visitor); 169 ScrollAnimatorCompositorCoordinator::trace(visitor);
169 } 170 }
170 171
171 } // namespace blink 172 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698