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

Unified Diff: content/common/assert_matching_enums.cc

Issue 317163002: Moving compositor_bindings from webkit to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Using layouttest_support to instantiate WebLayer Created 6 years, 6 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: content/common/assert_matching_enums.cc
diff --git a/content/public/common/assert_matching_enums.cc b/content/common/assert_matching_enums.cc
similarity index 66%
rename from content/public/common/assert_matching_enums.cc
rename to content/common/assert_matching_enums.cc
index 9a0e89884ce03655c156a2485a399229824d6e1d..a85617e780979829bc1a17e2ce169b8811107f37 100644
--- a/content/public/common/assert_matching_enums.cc
+++ b/content/common/assert_matching_enums.cc
@@ -6,7 +6,9 @@
// from Blink are valid.
#include "base/macros.h"
+#include "cc/animation/animation.h"
#include "content/public/common/screen_orientation_values.h"
+#include "third_party/WebKit/public/platform/WebAnimation.h"
#include "third_party/WebKit/public/platform/WebScreenOrientationLockType.h"
namespace content {
@@ -31,4 +33,15 @@ COMPILE_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockLandscape,
COMPILE_ASSERT_MATCHING_ENUM(blink::WebScreenOrientationLockPortrait,
PORTRAIT);
+COMPILE_ASSERT_MATCHING_ENUM(blink::WebAnimation::TargetPropertyTransform,
+ cc::Animation::Transform);
+COMPILE_ASSERT_MATCHING_ENUM(blink::WebAnimation::TargetPropertyOpacity,
+ cc::Animation::Opacity);
+COMPILE_ASSERT_MATCHING_ENUM(blink::WebAnimation::TargetPropertyFilter,
+ cc::Animation::Filter);
+#if WEB_SCROLL_OFFSET_ANIMATION_CURVE_IS_DEFINED
+COMPILE_ASSERT_MATCHING_ENUM(blink::WebAnimation::TargetPropertyScrollOffset,
+ cc::Animation::ScrollOffset);
+#endif
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698