Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp

Issue 1700653002: CC Animation: Expose TargetProperty enum to be aliased in Blink Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 6dd71a6da3cc793cc95db808e888dc540f637bdb..2e8c2cc01938ebdc5ada46846b36832bc5fd696d 100644
--- a/third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp
+++ b/third_party/WebKit/Source/platform/animation/CompositorAnimation.cpp
@@ -21,17 +21,7 @@ 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();
@@ -62,9 +52,7 @@ CompositorAnimation::CompositorAnimation(const CompositorAnimationCurve& webCurv
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() {}
@@ -81,9 +69,9 @@ 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

Powered by Google App Engine
This is Rietveld 408576698