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 "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "WebAnimationCurveCommon.h" | 7 #include "WebAnimationCurveCommon.h" |
8 | 8 |
9 #include "CCTimingFunction.h" | 9 #include "CCTimingFunction.h" |
10 | 10 |
| 11 #include <wtf/OwnPtr.h> |
| 12 #include <wtf/PassOwnPtr.h> |
| 13 |
11 namespace WebKit { | 14 namespace WebKit { |
12 | 15 |
13 scoped_ptr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingF
unctionType type) | 16 PassOwnPtr<cc::CCTimingFunction> createTimingFunction(WebAnimationCurve::TimingF
unctionType type) |
14 { | 17 { |
15 switch (type) { | 18 switch (type) { |
16 case WebAnimationCurve::TimingFunctionTypeEase: | 19 case WebAnimationCurve::TimingFunctionTypeEase: |
17 return cc::CCEaseTimingFunction::create(); | 20 return cc::CCEaseTimingFunction::create(); |
18 case WebAnimationCurve::TimingFunctionTypeEaseIn: | 21 case WebAnimationCurve::TimingFunctionTypeEaseIn: |
19 return cc::CCEaseInTimingFunction::create(); | 22 return cc::CCEaseInTimingFunction::create(); |
20 case WebAnimationCurve::TimingFunctionTypeEaseOut: | 23 case WebAnimationCurve::TimingFunctionTypeEaseOut: |
21 return cc::CCEaseOutTimingFunction::create(); | 24 return cc::CCEaseOutTimingFunction::create(); |
22 case WebAnimationCurve::TimingFunctionTypeEaseInOut: | 25 case WebAnimationCurve::TimingFunctionTypeEaseInOut: |
23 return cc::CCEaseInOutTimingFunction::create(); | 26 return cc::CCEaseInOutTimingFunction::create(); |
24 case WebAnimationCurve::TimingFunctionTypeLinear: | 27 case WebAnimationCurve::TimingFunctionTypeLinear: |
25 return scoped_ptr<cc::CCTimingFunction>(); | 28 return nullptr; |
26 } | 29 } |
27 return scoped_ptr<cc::CCTimingFunction>(); | 30 return nullptr; |
28 } | 31 } |
29 | 32 |
30 } // namespace WebKit | 33 } // namespace WebKit |
OLD | NEW |