Blink Compositor Animation: Make Animation and Curve methods non-virtual.

third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp

Index: third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp
diff --git a/third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp b/third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp
index 7d07a5bb69805fef4ec0a2f0f68aa8fc79de4f42..2b73cd831014f25808bf54d6b22619cb0e570c4c 100644
--- a/third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp
+++ b/third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp
@@ -4,8 +4,10 @@
 
 #include "platform/animation/CompositorAnimation.h"
 
+#include "base/memory/ptr_util.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/animation_id_provider.h"
+#include "cc/animation/keyframed_animation_curve.h"
 #include "platform/animation/CompositorAnimationCurve.h"
 #include "platform/animation/CompositorFilterAnimationCurve.h"
 #include "platform/animation/CompositorFloatAnimationCurve.h"
@@ -30,16 +32,14 @@ CompositorAnimation::CompositorAnimation(const CompositorAnimationCurve& curve,
     m_animation = Animation::Create(curve.cloneToAnimationCurve(), animationId, groupId, targetProperty);
 }
 
-CompositorAnimation::CompositorAnimation() {}
-
 CompositorAnimation::~CompositorAnimation() {}
 
-int CompositorAnimation::id()
+int CompositorAnimation::id() const
 {
     return m_animation->id();
 }
 
-int CompositorAnimation::group()
+int CompositorAnimation::group() const
 {
     return m_animation->group();
 }
@@ -126,4 +126,13 @@ std::unique_ptr<cc::Animation> CompositorAnimation::passAnimation()
     return std::move(m_animation);
 }
 
+PassOwnPtr<CompositorFloatAnimationCurve> CompositorAnimation::floatCurveForTesting() const
+{
+    const cc::AnimationCurve* curve = m_animation->curve();
+    DCHECK_EQ(cc::AnimationCurve::FLOAT, curve->Type());
+
+    auto keyframedCurve = base::WrapUnique(static_cast<cc::KeyframedFloatAnimationCurve*>(curve->Clone().release()));
+    return CompositorFloatAnimationCurve::CreateForTesting(std::move(keyframedCurve));
+}
+
 } // namespace blink