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