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/compositor_bindings/web_transform_animation_curve_impl.h" | 5 #include "webkit/compositor_bindings/web_transform_animation_curve_impl.h" |
6 | 6 |
7 #include "cc/keyframed_animation_curve.h" | 7 #include "cc/keyframed_animation_curve.h" |
8 #include "cc/timing_function.h" | 8 #include "cc/timing_function.h" |
9 #include "cc/transform_operations.h" | 9 #include "cc/transform_operations.h" |
10 #include "webkit/compositor_bindings/web_animation_curve_common.h" | 10 #include "webkit/compositor_bindings/web_animation_curve_common.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
46 .AsTransformOperations(); | 46 .AsTransformOperations(); |
47 curve_->addKeyframe(cc::TransformKeyframe::create( | 47 curve_->addKeyframe(cc::TransformKeyframe::create( |
48 keyframe.time(), | 48 keyframe.time(), |
49 transform_operations, | 49 transform_operations, |
50 cc::CubicBezierTimingFunction::create(x1, y1, x2, y2) | 50 cc::CubicBezierTimingFunction::create(x1, y1, x2, y2) |
51 .PassAs<cc::TimingFunction>())); | 51 .PassAs<cc::TimingFunction>())); |
52 } | 52 } |
53 | 53 |
54 WebTransformationMatrix WebTransformAnimationCurveImpl::getValue( | 54 WebTransformationMatrix WebTransformAnimationCurveImpl::getValue( |
55 double time) const { | 55 double time) const { |
56 return webkit::WebTransformationMatrixUtil::ToWebTransformationMatrix( | 56 return WebTransformationMatrix(); |
jamesr
2013/03/07 23:33:15
Nobody calls getValue(), but it's defined as pure
| |
57 curve_->getValue(time)); | |
58 } | 57 } |
59 | 58 |
60 scoped_ptr<cc::AnimationCurve> | 59 scoped_ptr<cc::AnimationCurve> |
61 WebTransformAnimationCurveImpl::cloneToAnimationCurve() const { | 60 WebTransformAnimationCurveImpl::cloneToAnimationCurve() const { |
62 return curve_->clone(); | 61 return curve_->clone(); |
63 } | 62 } |
64 | 63 |
65 } // namespace WebKit | 64 } // namespace WebKit |
OLD | NEW |