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

Unified Diff: cc/blink/web_animation_curve_common.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/base/scoped_ptr_vector.h ('k') | cc/blink/web_filter_animation_curve_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/blink/web_animation_curve_common.cc
diff --git a/cc/blink/web_animation_curve_common.cc b/cc/blink/web_animation_curve_common.cc
index 8230fab67eb1a6310ca8bec6642e927869522ad9..5abcf10f9a61659b0fbaf13b56679d8332d3e1b1 100644
--- a/cc/blink/web_animation_curve_common.cc
+++ b/cc/blink/web_animation_curve_common.cc
@@ -20,9 +20,9 @@
case blink::WebCompositorAnimationCurve::TimingFunctionTypeEaseInOut:
return cc::EaseInOutTimingFunction::Create();
case blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear:
- return nullptr;
+ return scoped_ptr<cc::TimingFunction>();
}
- return nullptr;
+ return scoped_ptr<cc::TimingFunction>();
}
} // namespace cc_blink
« no previous file with comments | « cc/base/scoped_ptr_vector.h ('k') | cc/blink/web_filter_animation_curve_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698