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_float_animation_curve_impl.h" | 5 #include "cc/blink/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 "cc/blink/web_animation_curve_common.h" | 10 #include "cc/blink/web_animation_curve_common.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 WebFloatAnimationCurveImpl::type() const { | 24 WebFloatAnimationCurveImpl::type() const { |
25 return blink::WebCompositorAnimationCurve::AnimationCurveTypeFloat; | 25 return blink::WebCompositorAnimationCurve::AnimationCurveTypeFloat; |
26 } | 26 } |
27 | 27 |
28 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe) { | 28 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe) { |
29 add(keyframe, TimingFunctionTypeEase); | 29 add(keyframe, TimingFunctionTypeEase); |
30 } | 30 } |
31 | 31 |
32 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, | 32 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, |
33 TimingFunctionType type) { | 33 TimingFunctionType type) { |
34 curve_->AddKeyframe(cc::FloatKeyframe::Create( | 34 curve_->AddKeyframe( |
35 keyframe.time, keyframe.value, CreateTimingFunction(type))); | 35 cc::FloatKeyframe::Create(base::TimeDelta::FromSecondsD(keyframe.time), |
| 36 keyframe.value, CreateTimingFunction(type))); |
36 } | 37 } |
37 | 38 |
38 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, | 39 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, |
39 double x1, | 40 double x1, |
40 double y1, | 41 double y1, |
41 double x2, | 42 double x2, |
42 double y2) { | 43 double y2) { |
43 curve_->AddKeyframe(cc::FloatKeyframe::Create( | 44 curve_->AddKeyframe(cc::FloatKeyframe::Create( |
44 keyframe.time, | 45 base::TimeDelta::FromSecondsD(keyframe.time), keyframe.value, |
45 keyframe.value, | |
46 cc::CubicBezierTimingFunction::Create(x1, y1, x2, y2))); | 46 cc::CubicBezierTimingFunction::Create(x1, y1, x2, y2))); |
47 } | 47 } |
48 | 48 |
49 void WebFloatAnimationCurveImpl::setTimingFunction(TimingFunctionType type) { | 49 void WebFloatAnimationCurveImpl::setTimingFunction(TimingFunctionType type) { |
50 curve_->SetTimingFunction(CreateTimingFunction(type)); | 50 curve_->SetTimingFunction(CreateTimingFunction(type)); |
51 } | 51 } |
52 | 52 |
53 void WebFloatAnimationCurveImpl::setTimingFunction(double x1, | 53 void WebFloatAnimationCurveImpl::setTimingFunction(double x1, |
54 double y1, | 54 double y1, |
55 double x2, | 55 double x2, |
56 double y2) { | 56 double y2) { |
57 curve_->SetTimingFunction( | 57 curve_->SetTimingFunction( |
58 cc::CubicBezierTimingFunction::Create(x1, y1, x2, y2).Pass()); | 58 cc::CubicBezierTimingFunction::Create(x1, y1, x2, y2).Pass()); |
59 } | 59 } |
60 | 60 |
61 float WebFloatAnimationCurveImpl::getValue(double time) const { | 61 float WebFloatAnimationCurveImpl::getValue(double time) const { |
62 return curve_->GetValue(time); | 62 return curve_->GetValue(base::TimeDelta::FromSecondsD(time)); |
63 } | 63 } |
64 | 64 |
65 scoped_ptr<cc::AnimationCurve> | 65 scoped_ptr<cc::AnimationCurve> |
66 WebFloatAnimationCurveImpl::CloneToAnimationCurve() const { | 66 WebFloatAnimationCurveImpl::CloneToAnimationCurve() const { |
67 return curve_->Clone(); | 67 return curve_->Clone(); |
68 } | 68 } |
69 | 69 |
70 } // namespace cc_blink | 70 } // namespace cc_blink |
OLD | NEW |