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

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "platform/animation/CompositorScrollOffsetAnimationCurve.h"
 #include "platform/animation/CompositorTransformAnimationCurve.h"
 
 using cc::Animation;
 using cc::AnimationIdProvider;
 
 using blink::CompositorAnimation;
 using blink::CompositorAnimationCurve;
 
 namespace blink {
 
 CompositorAnimation::CompositorAnimation(const CompositorAnimationCurve& curve, CompositorTargetProperty::Type targetProperty, int animationId, int groupId)
 {
     if (!animationId)
         animationId = AnimationIdProvider::NextAnimationId();
     if (!groupId)
         groupId = AnimationIdProvider::NextGroupId();
 
     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();
 }
 
 CompositorTargetProperty::Type CompositorAnimation::targetProperty() const
 {
     return m_animation->target_property();
 }
 
 double CompositorAnimation::iterations() const
@@ skipping 66 matching lines @@
 {
     m_animation->set_fill_mode(fillMode);
 }
 
 std::unique_ptr<cc::Animation> CompositorAnimation::passAnimation()
 {
     m_animation->set_needs_synchronized_start_time(true);
     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