diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 04:59:34 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 04:59:34 +0000 |
| commit | 114e65d34c6f1a38bc447d70840e8ac2b30b953b (patch) | |
| tree | b810d0d9b81098d8cc8e720528fd01cd6bed8ade /cc/timing_function.h | |
| parent | 84b8bd1002a2a50e22fbc57fca169ebcbba35928 (diff) | |
| download | chromium_src-114e65d34c6f1a38bc447d70840e8ac2b30b953b.zip chromium_src-114e65d34c6f1a38bc447d70840e8ac2b30b953b.tar.gz chromium_src-114e65d34c6f1a38bc447d70840e8ac2b30b953b.tar.bz2 | |
cc: Replace the WebCore::UnitBezier class with the SkUnitCubicInterp() method from Skia.
This method exists in Skia, but is not publicly consumable/linkable with a
component build. Skia will expose this (or a similar) method through a proper
public API, and we should use it. But in the meantime, we make a copy of the
method in timing_function.cc, and use it there in place of WebCore's UnitBezier
class.
Tests:
cc_unittests:TimingFunctionTest.CubicBezierTimingFunction
This test compares the output of the timing function against baseline values
recorded with WebCore's UnitBezier class. If new methods are able to come
closer to those values, we should decrease the epsilon used in the test
accordingly.
R=jamesr
BUG=147395
Review URL: https://chromiumcodereview.appspot.com/11359077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/timing_function.h')
| -rw-r--r-- | cc/timing_function.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cc/timing_function.h b/cc/timing_function.h index df9e7ef..1150eba 100644 --- a/cc/timing_function.h +++ b/cc/timing_function.h @@ -5,9 +5,9 @@ #ifndef CC_TIMING_FUNCTION_H_ #define CC_TIMING_FUNCTION_H_ -#include "UnitBezier.h" #include "cc/animation_curve.h" #include "cc/cc_export.h" +#include "third_party/skia/include/core/SkScalar.h" namespace cc { @@ -35,7 +35,10 @@ public: protected: CubicBezierTimingFunction(double x1, double y1, double x2, double y2); - UnitBezier m_curve; + SkScalar m_x1; + SkScalar m_y1; + SkScalar m_x2; + SkScalar m_y2; }; class CC_EXPORT EaseTimingFunction { |