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

Unified Diff: cc/animation/timing_function.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, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/animation/scroll_offset_animation_curve.cc ('k') | cc/base/math_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/timing_function.cc
diff --git a/cc/animation/timing_function.cc b/cc/animation/timing_function.cc
index 2531cc69f36457ccac33f807ad39ce960002f147..97e0d4bc0b13aff704921a5c8cec943723291e76 100644
--- a/cc/animation/timing_function.cc
+++ b/cc/animation/timing_function.cc
@@ -42,25 +42,30 @@
}
scoped_ptr<TimingFunction> CubicBezierTimingFunction::Clone() const {
- return make_scoped_ptr(new CubicBezierTimingFunction(*this));
+ return make_scoped_ptr(new CubicBezierTimingFunction(*this))
+ .PassAs<TimingFunction>();
}
// These numbers come from
// http://www.w3.org/TR/css3-transitions/#transition-timing-function_tag.
scoped_ptr<TimingFunction> EaseTimingFunction::Create() {
- return CubicBezierTimingFunction::Create(0.25, 0.1, 0.25, 1.0);
+ return CubicBezierTimingFunction::Create(
+ 0.25, 0.1, 0.25, 1.0).PassAs<TimingFunction>();
}
scoped_ptr<TimingFunction> EaseInTimingFunction::Create() {
- return CubicBezierTimingFunction::Create(0.42, 0.0, 1.0, 1.0);
+ return CubicBezierTimingFunction::Create(
+ 0.42, 0.0, 1.0, 1.0).PassAs<TimingFunction>();
}
scoped_ptr<TimingFunction> EaseOutTimingFunction::Create() {
- return CubicBezierTimingFunction::Create(0.0, 0.0, 0.58, 1.0);
+ return CubicBezierTimingFunction::Create(
+ 0.0, 0.0, 0.58, 1.0).PassAs<TimingFunction>();
}
scoped_ptr<TimingFunction> EaseInOutTimingFunction::Create() {
- return CubicBezierTimingFunction::Create(0.42, 0.0, 0.58, 1);
+ return CubicBezierTimingFunction::Create(
+ 0.42, 0.0, 0.58, 1).PassAs<TimingFunction>();
}
} // namespace cc
« no previous file with comments | « cc/animation/scroll_offset_animation_curve.cc ('k') | cc/base/math_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698