Merge WebKit at r67178 : Initial merge by git.

Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18

1 files changed, 5 insertions, 4 deletions

diff --git a/WebCore/platform/animation/Animation.h b/WebCore/platform/animation/Animation.h
index cabb0eb..9130415 100644
--- a/WebCore/platform/animation/Animation.h
+++ b/WebCore/platform/animation/Animation.h
@@ -26,6 +26,7 @@
 #define Animation_h
 
 #include "PlatformString.h"
+#include "RenderStyleConstants.h"
 #include "TimingFunction.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -94,7 +95,7 @@ public:
     const String& name() const { return m_name; }
     unsigned playState() const { return m_playState; }
     int property() const { return m_property; }
-    const TimingFunction& timingFunction() const { return m_timingFunction; }
+    const PassRefPtr<TimingFunction> timingFunction() const { return m_timingFunction; }
 
     void setDelay(double c) { m_delay = c; m_delaySet = true; }
     void setDirection(AnimationDirection d) { m_direction = d; m_directionSet = true; }
@@ -104,7 +105,7 @@ public:
     void setName(const String& n) { m_name = n; m_nameSet = true; }
     void setPlayState(unsigned d) { m_playState = d; m_playStateSet = true; }
     void setProperty(int t) { m_property = t; m_propertySet = true; }
-    void setTimingFunction(const TimingFunction& f) { m_timingFunction = f; m_timingFunctionSet = true; }
+    void setTimingFunction(PassRefPtr<TimingFunction> f) { m_timingFunction = f; m_timingFunctionSet = true; }
 
     void setIsNoneAnimation(bool n) { m_isNone = n; }
 
@@ -129,7 +130,7 @@ private:
     int m_iterationCount;
     double m_delay;
     double m_duration;
-    TimingFunction m_timingFunction;
+    RefPtr<TimingFunction> m_timingFunction;
     AnimationDirection m_direction : 1;
     unsigned m_fillMode : 2;
 
@@ -156,7 +157,7 @@ public:
     static String initialAnimationName() { return String("none"); }
     static unsigned initialAnimationPlayState() { return AnimPlayStatePlaying; }
     static int initialAnimationProperty() { return cAnimateAll; }
-    static TimingFunction initialAnimationTimingFunction() { return TimingFunction(); }
+    static PassRefPtr<TimingFunction> initialAnimationTimingFunction() { return CubicBezierTimingFunction::create(); }
 };
 
 } // namespace WebCore