Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(588)

Side by Side Diff: cc/blink/web_float_animation_curve_impl.cc

Issue 608503005: Revert of cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 25 matching lines...) Expand all
36 } 36 }
37 37
38 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe, 38 void WebFloatAnimationCurveImpl::add(const WebFloatKeyframe& keyframe,
39 double x1, 39 double x1,
40 double y1, 40 double y1,
41 double x2, 41 double x2,
42 double y2) { 42 double y2) {
43 curve_->AddKeyframe(cc::FloatKeyframe::Create( 43 curve_->AddKeyframe(cc::FloatKeyframe::Create(
44 keyframe.time, 44 keyframe.time,
45 keyframe.value, 45 keyframe.value,
46 cc::CubicBezierTimingFunction::Create(x1, y1, x2, y2))); 46 cc::CubicBezierTimingFunction::Create(x1, y1, x2, y2)
47 .PassAs<cc::TimingFunction>()));
47 } 48 }
48 49
49 float WebFloatAnimationCurveImpl::getValue(double time) const { 50 float WebFloatAnimationCurveImpl::getValue(double time) const {
50 return curve_->GetValue(time); 51 return curve_->GetValue(time);
51 } 52 }
52 53
53 scoped_ptr<cc::AnimationCurve> 54 scoped_ptr<cc::AnimationCurve>
54 WebFloatAnimationCurveImpl::CloneToAnimationCurve() const { 55 WebFloatAnimationCurveImpl::CloneToAnimationCurve() const {
55 return curve_->Clone(); 56 return curve_->Clone();
56 } 57 }
57 58
58 } // namespace cc_blink 59 } // namespace cc_blink
OLDNEW
« no previous file with comments | « cc/blink/web_filter_animation_curve_impl.cc ('k') | cc/blink/web_transform_animation_curve_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698