| 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 5abcf10f9a61659b0fbaf13b56679d8332d3e1b1..8230fab67eb1a6310ca8bec6642e927869522ad9 100644
|
| --- a/cc/blink/web_animation_curve_common.cc
|
| +++ b/cc/blink/web_animation_curve_common.cc
|
| @@ -20,9 +20,9 @@ scoped_ptr<cc::TimingFunction> CreateTimingFunction(
|
| case blink::WebCompositorAnimationCurve::TimingFunctionTypeEaseInOut:
|
| return cc::EaseInOutTimingFunction::Create();
|
| case blink::WebCompositorAnimationCurve::TimingFunctionTypeLinear:
|
| - return scoped_ptr<cc::TimingFunction>();
|
| + return nullptr;
|
| }
|
| - return scoped_ptr<cc::TimingFunction>();
|
| + return nullptr;
|
| }
|
|
|
| } // namespace cc_blink
|
|
|