| 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" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 static_cast<cc::Animation::TargetProperty>(target_property)); | 66 static_cast<cc::Animation::TargetProperty>(target_property)); |
| 67 } | 67 } |
| 68 | 68 |
| 69 WebCompositorAnimationImpl::~WebCompositorAnimationImpl() { | 69 WebCompositorAnimationImpl::~WebCompositorAnimationImpl() { |
| 70 } | 70 } |
| 71 | 71 |
| 72 int WebCompositorAnimationImpl::id() { | 72 int WebCompositorAnimationImpl::id() { |
| 73 return animation_->id(); | 73 return animation_->id(); |
| 74 } | 74 } |
| 75 | 75 |
| 76 int WebCompositorAnimationImpl::group() { |
| 77 return animation_->group(); |
| 78 } |
| 79 |
| 76 blink::WebCompositorAnimation::TargetProperty | 80 blink::WebCompositorAnimation::TargetProperty |
| 77 WebCompositorAnimationImpl::targetProperty() const { | 81 WebCompositorAnimationImpl::targetProperty() const { |
| 78 return static_cast<WebCompositorAnimationImpl::TargetProperty>( | 82 return static_cast<WebCompositorAnimationImpl::TargetProperty>( |
| 79 animation_->target_property()); | 83 animation_->target_property()); |
| 80 } | 84 } |
| 81 | 85 |
| 82 double WebCompositorAnimationImpl::iterations() const { | 86 double WebCompositorAnimationImpl::iterations() const { |
| 83 return animation_->iterations(); | 87 return animation_->iterations(); |
| 84 } | 88 } |
| 85 | 89 |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 break; | 191 break; |
| 188 } | 192 } |
| 189 } | 193 } |
| 190 | 194 |
| 191 scoped_ptr<cc::Animation> WebCompositorAnimationImpl::PassAnimation() { | 195 scoped_ptr<cc::Animation> WebCompositorAnimationImpl::PassAnimation() { |
| 192 animation_->set_needs_synchronized_start_time(true); | 196 animation_->set_needs_synchronized_start_time(true); |
| 193 return animation_.Pass(); | 197 return animation_.Pass(); |
| 194 } | 198 } |
| 195 | 199 |
| 196 } // namespace cc_blink | 200 } // namespace cc_blink |
| OLD | NEW |