| 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_animation_impl.h" | 5 #include "cc/blink/web_animation_impl.h" |
| 6 | 6 |
| 7 #include "cc/animation/animation.h" | 7 #include "cc/animation/animation.h" |
| 8 #include "cc/animation/animation_curve.h" | 8 #include "cc/animation/animation_curve.h" |
| 9 #include "cc/animation/animation_id_provider.h" | 9 #include "cc/animation/animation_id_provider.h" |
| 10 #include "cc/blink/web_filter_animation_curve_impl.h" | 10 #include "cc/blink/web_filter_animation_curve_impl.h" |
| 11 #include "cc/blink/web_float_animation_curve_impl.h" | 11 #include "cc/blink/web_float_animation_curve_impl.h" |
| 12 #include "cc/blink/web_scroll_offset_animation_curve_impl.h" | 12 #include "cc/blink/web_scroll_offset_animation_curve_impl.h" |
| 13 #include "cc/blink/web_transform_animation_curve_impl.h" | 13 #include "cc/blink/web_transform_animation_curve_impl.h" |
| 14 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h" | 14 #include "third_party/WebKit/public/platform/WebCompositorAnimationCurve.h" |
| 15 | 15 |
| 16 using cc::Animation; | 16 using cc::Animation; |
| 17 using cc::AnimationIdProvider; | 17 using cc::AnimationIdProvider; |
| 18 | 18 |
| 19 using blink::WebCompositorAnimation; | 19 using blink::WebCompositorAnimation; |
| 20 using blink::WebCompositorAnimationCurve; | 20 using blink::WebCompositorAnimationCurve; |
| 21 | 21 |
| 22 namespace cc_blink { | 22 namespace cc_blink { |
| 23 | 23 |
| 24 WebCompositorAnimationImpl::WebCompositorAnimationImpl( | 24 WebCompositorAnimationImpl::WebCompositorAnimationImpl( |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 animation_->set_direction(cc::Animation::Normal); | 160 animation_->set_direction(cc::Animation::Normal); |
| 161 } | 161 } |
| 162 #endif | 162 #endif |
| 163 | 163 |
| 164 scoped_ptr<cc::Animation> WebCompositorAnimationImpl::PassAnimation() { | 164 scoped_ptr<cc::Animation> WebCompositorAnimationImpl::PassAnimation() { |
| 165 animation_->set_needs_synchronized_start_time(true); | 165 animation_->set_needs_synchronized_start_time(true); |
| 166 return animation_.Pass(); | 166 return animation_.Pass(); |
| 167 } | 167 } |
| 168 | 168 |
| 169 } // namespace cc_blink | 169 } // namespace cc_blink |
| OLD | NEW |