diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/platform/animation/TimingFunction.h | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/platform/animation/TimingFunction.h')
-rw-r--r-- | Source/WebCore/platform/animation/TimingFunction.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Source/WebCore/platform/animation/TimingFunction.h b/Source/WebCore/platform/animation/TimingFunction.h index 8ef2d8f..5ab3c1c 100644 --- a/Source/WebCore/platform/animation/TimingFunction.h +++ b/Source/WebCore/platform/animation/TimingFunction.h @@ -76,11 +76,16 @@ private: class CubicBezierTimingFunction : public TimingFunction { public: - static PassRefPtr<CubicBezierTimingFunction> create(double x1 = 0.25, double y1 = 0.1, double x2 = 0.25, double y2 = 1.0) + static PassRefPtr<CubicBezierTimingFunction> create(double x1, double y1, double x2, double y2) { return adoptRef(new CubicBezierTimingFunction(x1, y1, x2, y2)); } + static PassRefPtr<CubicBezierTimingFunction> create() + { + return adoptRef(new CubicBezierTimingFunction()); + } + ~CubicBezierTimingFunction() { } virtual bool operator==(const TimingFunction& other) @@ -97,8 +102,14 @@ public: double x2() const { return m_x2; } double y2() const { return m_y2; } + static const CubicBezierTimingFunction* defaultTimingFunction() + { + static const CubicBezierTimingFunction* dtf = create().leakRef(); + return dtf; + } + private: - CubicBezierTimingFunction(double x1, double y1, double x2, double y2) + CubicBezierTimingFunction(double x1 = 0.25, double y1 = 0.1, double x2 = 0.25, double y2 = 1.0) : TimingFunction(CubicBezierFunction) , m_x1(x1) , m_y1(y1) |