Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

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)