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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 | 108 |
109 m_compositorAnimationId = 0; | 109 m_compositorAnimationId = 0; |
110 m_compositorAnimationGroupId = 0; | 110 m_compositorAnimationGroupId = 0; |
111 if (m_runState == RunState::WaitingToCancelOnCompositor) { | 111 if (m_runState == RunState::WaitingToCancelOnCompositor) { |
112 resetAnimationState(); | 112 resetAnimationState(); |
113 return; | 113 return; |
114 } | 114 } |
115 } | 115 } |
116 | 116 |
117 if (m_runState == RunState::WaitingToSendToCompositor) { | 117 if (m_runState == RunState::WaitingToSendToCompositor) { |
118 if (!m_compositorAnimationAttachedToElementId) | 118 if (!m_compositorAnimationAttachedToLayerId) |
119 reattachCompositorPlayerIfNeeded(getScrollableArea()->compositorAnim
ationTimeline()); | 119 reattachCompositorPlayerIfNeeded(getScrollableArea()->compositorAnim
ationTimeline()); |
120 | 120 |
121 bool sentToCompositor = false; | 121 bool sentToCompositor = false; |
122 | 122 |
123 if (!m_scrollableArea->shouldScrollOnMainThread()) { | 123 if (!m_scrollableArea->shouldScrollOnMainThread()) { |
124 OwnPtr<CompositorAnimation> animation = adoptPtr(CompositorFactory::
current().createAnimation(*m_animationCurve, CompositorTargetProperty::SCROLL_OF
FSET)); | 124 OwnPtr<CompositorAnimation> animation = adoptPtr(CompositorFactory::
current().createAnimation(*m_animationCurve, CompositorTargetProperty::SCROLL_OF
FSET)); |
125 | 125 |
126 int animationId = animation->id(); | 126 int animationId = animation->id(); |
127 int animationGroupId = animation->group(); | 127 int animationGroupId = animation->group(); |
128 | 128 |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId); | 172 ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId); |
173 } | 173 } |
174 | 174 |
175 DEFINE_TRACE(ProgrammaticScrollAnimator) | 175 DEFINE_TRACE(ProgrammaticScrollAnimator) |
176 { | 176 { |
177 visitor->trace(m_scrollableArea); | 177 visitor->trace(m_scrollableArea); |
178 ScrollAnimatorCompositorCoordinator::trace(visitor); | 178 ScrollAnimatorCompositorCoordinator::trace(visitor); |
179 } | 179 } |
180 | 180 |
181 } // namespace blink | 181 } // namespace blink |
OLD | NEW |