| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "webkit/renderer/compositor_bindings/web_float_animation_curve_impl.h" | 5 #include "webkit/renderer/compositor_bindings/web_float_animation_curve_impl.h" |
| 6 | 6 |
| 7 #include "cc/animation/animation_curve.h" | 7 #include "cc/animation/animation_curve.h" |
| 8 #include "cc/animation/keyframed_animation_curve.h" | 8 #include "cc/animation/keyframed_animation_curve.h" |
| 9 #include "cc/animation/timing_function.h" | 9 #include "cc/animation/timing_function.h" |
| 10 #include "webkit/renderer/compositor_bindings/web_animation_curve_common.h" | 10 #include "webkit/renderer/compositor_bindings/web_animation_curve_common.h" |
| 11 | 11 |
| 12 using WebKit::WebFloatKeyframe; | 12 using blink::WebFloatKeyframe; |
| 13 | 13 |
| 14 namespace webkit { | 14 namespace webkit { |
| 15 | 15 |
| 16 WebFloatAnimationCurveImpl::WebFloatAnimationCurveImpl() | 16 WebFloatAnimationCurveImpl::WebFloatAnimationCurveImpl() |
| 17 : curve_(cc::KeyframedFloatAnimationCurve::Create()) {} | 17 : curve_(cc::KeyframedFloatAnimationCurve::Create()) {} |
| 18 | 18 |
| 19 WebFloatAnimationCurveImpl::~WebFloatAnimationCurveImpl() {} | 19 WebFloatAnimationCurveImpl::~WebFloatAnimationCurveImpl() {} |
| 20 | 20 |
| 21 WebKit::WebAnimationCurve::AnimationCurveType | 21 blink::WebAnimationCurve::AnimationCurveType |
| 22 WebFloatAnimationCurveImpl::type() const { | 22 WebFloatAnimationCurveImpl::type() const { |
| 23 return WebKit::WebAnimationCurve::AnimationCurveTypeFloat; | 23 return blink::WebAnimationCurve::AnimationCurveTypeFloat; |
| 24 } | 24 } |
| 25 | 25 |
| 26 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe) { | 26 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe) { |
| 27 add(keyframe, TimingFunctionTypeEase); | 27 add(keyframe, TimingFunctionTypeEase); |
| 28 } | 28 } |
| 29 | 29 |
| 30 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, | 30 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, |
| 31 TimingFunctionType type) { | 31 TimingFunctionType type) { |
| 32 curve_->AddKeyframe(cc::FloatKeyframe::Create( | 32 curve_->AddKeyframe(cc::FloatKeyframe::Create( |
| 33 keyframe.time, keyframe.value, CreateTimingFunction(type))); | 33 keyframe.time, keyframe.value, CreateTimingFunction(type))); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 48 float WebFloatAnimationCurveImpl::getValue(double time) const { | 48 float WebFloatAnimationCurveImpl::getValue(double time) const { |
| 49 return curve_->GetValue(time); | 49 return curve_->GetValue(time); |
| 50 } | 50 } |
| 51 | 51 |
| 52 scoped_ptr<cc::AnimationCurve> | 52 scoped_ptr<cc::AnimationCurve> |
| 53 WebFloatAnimationCurveImpl::CloneToAnimationCurve() const { | 53 WebFloatAnimationCurveImpl::CloneToAnimationCurve() const { |
| 54 return curve_->Clone(); | 54 return curve_->Clone(); |
| 55 } | 55 } |
| 56 | 56 |
| 57 } // namespace webkit | 57 } // namespace webkit |
| OLD | NEW |