| 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" | |
| 6 | |
| 7 #include "cc/timing_function.h" | 5 #include "cc/timing_function.h" |
| 8 #include "third_party/skia/include/core/SkMath.h" | 6 #include "third_party/skia/include/core/SkMath.h" |
| 9 | 7 |
| 10 // TODO(danakj) These methods come from SkInterpolator.cpp. When such a method | 8 // TODO(danakj) These methods come from SkInterpolator.cpp. When such a method |
| 11 // is available in the public Skia API, we should switch to using that. | 9 // is available in the public Skia API, we should switch to using that. |
| 12 // http://crbug.com/159735 | 10 // http://crbug.com/159735 |
| 13 namespace { | 11 namespace { |
| 14 | 12 |
| 15 // Dot14 has 14 bits for decimal places, and the remainder for whole numbers. | 13 // Dot14 has 14 bits for decimal places, and the remainder for whole numbers. |
| 16 typedef int Dot14; | 14 typedef int Dot14; |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 { | 135 { |
| 138 return CubicBezierTimingFunction::create(0, 0, 0.58, 1).PassAs<TimingFunctio
n>(); | 136 return CubicBezierTimingFunction::create(0, 0, 0.58, 1).PassAs<TimingFunctio
n>(); |
| 139 } | 137 } |
| 140 | 138 |
| 141 scoped_ptr<TimingFunction> EaseInOutTimingFunction::create() | 139 scoped_ptr<TimingFunction> EaseInOutTimingFunction::create() |
| 142 { | 140 { |
| 143 return CubicBezierTimingFunction::create(0.42, 0, 0.58, 1).PassAs<TimingFunc
tion>(); | 141 return CubicBezierTimingFunction::create(0.42, 0, 0.58, 1).PassAs<TimingFunc
tion>(); |
| 144 } | 142 } |
| 145 | 143 |
| 146 } // namespace cc | 144 } // namespace cc |
| OLD | NEW |