| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/animation/CompositorAnimationPlayer.h" | 5 #include "platform/animation/CompositorAnimationPlayer.h" |
| 6 | 6 |
| 7 #include "cc/animation/animation_id_provider.h" | 7 #include "cc/animation/animation_id_provider.h" |
| 8 #include "platform/animation/CompositorAnimation.h" | 8 #include "platform/animation/CompositorAnimation.h" |
| 9 #include "public/platform/WebCompositorAnimationDelegate.h" | 9 #include "public/platform/WebCompositorAnimationDelegate.h" |
| 10 #include "public/platform/WebLayer.h" | 10 #include "public/platform/WebLayer.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 | 88 |
| 89 void CompositorAnimationPlayer::NotifyAnimationAborted( | 89 void CompositorAnimationPlayer::NotifyAnimationAborted( |
| 90 base::TimeTicks monotonicTime, | 90 base::TimeTicks monotonicTime, |
| 91 cc::TargetProperty::Type targetProperty, | 91 cc::TargetProperty::Type targetProperty, |
| 92 int group) | 92 int group) |
| 93 { | 93 { |
| 94 if (m_delegate) | 94 if (m_delegate) |
| 95 m_delegate->notifyAnimationAborted((monotonicTime - base::TimeTicks()).I
nSecondsF(), group); | 95 m_delegate->notifyAnimationAborted((monotonicTime - base::TimeTicks()).I
nSecondsF(), group); |
| 96 } | 96 } |
| 97 | 97 |
| 98 void CompositorAnimationPlayer::NotifyAnimationTakeover( |
| 99 base::TimeTicks monotonicTime, |
| 100 double animationStartTime, |
| 101 scoped_ptr<cc::AnimationCurve> curve) |
| 102 { |
| 103 if (m_delegate) { |
| 104 m_delegate->notifyAnimationTakeover( |
| 105 (monotonicTime - base::TimeTicks()).InSecondsF(), |
| 106 animationStartTime, |
| 107 std::move(curve)); |
| 108 } |
| 109 } |
| 110 |
| 98 } // namespace blink | 111 } // namespace blink |
| OLD | NEW |