| 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 "cc/blink/web_to_cc_animation_delegate_adapter.h" | 5 #include "cc/blink/web_to_cc_animation_delegate_adapter.h" |
| 6 #include "third_party/WebKit/public/platform/WebCompositorAnimationDelegate.h" | 6 #include "third_party/WebKit/public/platform/WebCompositorAnimationDelegate.h" |
| 7 | 7 |
| 8 namespace cc_blink { | 8 namespace cc_blink { |
| 9 | 9 |
| 10 WebToCCAnimationDelegateAdapter::WebToCCAnimationDelegateAdapter( | 10 WebToCCAnimationDelegateAdapter::WebToCCAnimationDelegateAdapter( |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 delegate_->notifyAnimationFinished( | 33 delegate_->notifyAnimationFinished( |
| 34 (monotonic_time - base::TimeTicks()).InSecondsF(), | 34 (monotonic_time - base::TimeTicks()).InSecondsF(), |
| 35 #if WEB_COMPOSITOR_ANIMATION_DELEGATE_TAKES_GROUP | 35 #if WEB_COMPOSITOR_ANIMATION_DELEGATE_TAKES_GROUP |
| 36 group); | 36 group); |
| 37 #else | 37 #else |
| 38 static_cast<blink::WebCompositorAnimation::TargetProperty>( | 38 static_cast<blink::WebCompositorAnimation::TargetProperty>( |
| 39 target_property)); | 39 target_property)); |
| 40 #endif | 40 #endif |
| 41 } | 41 } |
| 42 | 42 |
| 43 void WebToCCAnimationDelegateAdapter::NotifyAnimationAborted( |
| 44 base::TimeTicks monotonic_time, |
| 45 cc::Animation::TargetProperty target_property, |
| 46 int group) { |
| 47 delegate_->notifyAnimationAborted( |
| 48 (monotonic_time - base::TimeTicks()).InSecondsF(), group); |
| 49 } |
| 50 |
| 43 } // namespace cc_blink | 51 } // namespace cc_blink |
| OLD | NEW |