CC Animation: Expose TargetProperty enum to be aliased in Blink Platform.

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 "cc/animation/animation.h"
 #include "cc/animation/animation_curve.h"
 #include "cc/animation/animation_id_provider.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 {
 
-#define STATIC_ASSERT_ENUM(a, b)                              \
-    static_assert(static_cast<int>(a) == static_cast<int>(b), \
-        "mismatching enums: " #a)
-
-// TargetProperty
-STATIC_ASSERT_ENUM(CompositorAnimation::TargetPropertyTransform, cc::Animation::TRANSFORM);
-STATIC_ASSERT_ENUM(CompositorAnimation::TargetPropertyOpacity, cc::Animation::OPACITY);
-STATIC_ASSERT_ENUM(CompositorAnimation::TargetPropertyFilter, cc::Animation::FILTER);
-STATIC_ASSERT_ENUM(CompositorAnimation::TargetPropertyScrollOffset, cc::Animation::SCROLL_OFFSET);
-
-CompositorAnimation::CompositorAnimation(const CompositorAnimationCurve& webCurve, TargetProperty targetProperty, int animationId, int groupId)
+CompositorAnimation::CompositorAnimation(const CompositorAnimationCurve& webCurve, CompositorTargetProperty::Type targetProperty, int animationId, int groupId)
 {
     if (!animationId)
         animationId = AnimationIdProvider::NextAnimationId();
     if (!groupId)
         groupId = AnimationIdProvider::NextGroupId();
 
     CompositorAnimationCurve::AnimationCurveType curveType = webCurve.type();
     scoped_ptr<cc::AnimationCurve> curve;
     switch (curveType) {
     case CompositorAnimationCurve::AnimationCurveTypeFloat: {
@@ skipping 10 matching lines @@
         const blink::CompositorFilterAnimationCurve* filterCurve = static_cast<const blink::CompositorFilterAnimationCurve*>(&webCurve);
         curve = filterCurve->cloneToAnimationCurve();
         break;
     }
     case CompositorAnimationCurve::AnimationCurveTypeScrollOffset: {
         const blink::CompositorScrollOffsetAnimationCurve* scrollCurve = static_cast<const blink::CompositorScrollOffsetAnimationCurve*>(&webCurve);
         curve = scrollCurve->cloneToAnimationCurve();
         break;
     }
     }
-    m_animation = Animation::Create(
-        std::move(curve), animationId, groupId,
-        static_cast<cc::Animation::TargetProperty>(targetProperty));
+    m_animation = Animation::Create(std::move(curve), animationId, groupId, targetProperty);
 }
 
 CompositorAnimation::CompositorAnimation() {}
 
 CompositorAnimation::~CompositorAnimation() {}
 
 int CompositorAnimation::id()
 {
     return m_animation->id();
 }
 
 int CompositorAnimation::group()
 {
     return m_animation->group();
 }
 
-blink::CompositorAnimation::TargetProperty CompositorAnimation::targetProperty() const
+CompositorTargetProperty::Type CompositorAnimation::targetProperty() const
 {
-    return static_cast<CompositorAnimation::TargetProperty>(m_animation->target_property());
+    return m_animation->target_property();
 }
 
 double CompositorAnimation::iterations() const
 {
     return m_animation->iterations();
 }
 
 void CompositorAnimation::setIterations(double n)
 {
     m_animation->set_iterations(n);
@@ skipping 116 matching lines @@
     return std::move(m_animation);
 }
 
 cc::Animation* CompositorAnimation::releaseCCAnimation()
 {
     m_animation->set_needs_synchronized_start_time(true);
     return m_animation.release();
 }
 
 } // namespace blink