Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)

New snapshot

1 files changed, 45 insertions, 0 deletions

diff --git a/Source/WebKit/chromium/tests/CCAnimationTestCommon.cpp b/Source/WebKit/chromium/tests/CCAnimationTestCommon.cpp
index 76d1c0a3e..bb2141197 100644
--- a/Source/WebKit/chromium/tests/CCAnimationTestCommon.cpp
+++ b/Source/WebKit/chromium/tests/CCAnimationTestCommon.cpp
@@ -85,6 +85,16 @@ FakeFloatAnimationCurve::~FakeFloatAnimationCurve()
 {
 }
 
+double FakeFloatAnimationCurve::duration() const
+{
+    return 1;
+}
+
+float FakeFloatAnimationCurve::getValue(double now) const
+{
+    return 0;
+}
+
 PassOwnPtr<WebCore::CCAnimationCurve> FakeFloatAnimationCurve::clone() const
 {
     return adoptPtr(new FakeFloatAnimationCurve);
@@ -99,6 +109,11 @@ FakeTransformTransition::~FakeTransformTransition()
 {
 }
 
+double FakeTransformTransition::duration() const
+{
+    return m_duration;
+}
+
 WebKit::WebTransformationMatrix FakeTransformTransition::getValue(double time) const
 {
     return WebKit::WebTransformationMatrix();
@@ -121,6 +136,11 @@ FakeFloatTransition::~FakeFloatTransition()
 {
 }
 
+double FakeFloatTransition::duration() const
+{
+    return m_duration;
+}
+
 float FakeFloatTransition::getValue(double time) const
 {
     time /= m_duration;
@@ -138,6 +158,31 @@ FakeLayerAnimationControllerClient::~FakeLayerAnimationControllerClient()
 {
 }
 
+int FakeLayerAnimationControllerClient::id() const
+{
+    return 0;
+}
+
+void FakeLayerAnimationControllerClient::setOpacityFromAnimation(float opacity)
+{
+    m_opacity = opacity;
+}
+
+float FakeLayerAnimationControllerClient::opacity() const
+{
+    return m_opacity;
+}
+
+void FakeLayerAnimationControllerClient::setTransformFromAnimation(const WebKit::WebTransformationMatrix& transform)
+{
+    m_transform = transform;
+}
+
+const WebKit::WebTransformationMatrix& FakeLayerAnimationControllerClient::transform() const
+{
+    return m_transform;
+}
+
 PassOwnPtr<WebCore::CCAnimationCurve> FakeFloatTransition::clone() const
 {
     return adoptPtr(new FakeFloatTransition(*this));