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

Unified Diff: content/child/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: Changing dependencies due to failing ios bots 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
« no previous file with comments | « build/all.gyp ('k') | content/content_child.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/assert_matching_enums.cc
diff --git a/content/public/common/assert_matching_enums.cc b/content/child/assert_matching_enums.cc
similarity index 74%
rename from content/public/common/assert_matching_enums.cc
rename to content/child/assert_matching_enums.cc
index a21ea1b823fbe82f8223705b6ac7fbbe2a1e8a72..f52f6ad4c8f106b42f0429626ec2ba2bea2b6044 100644
--- a/content/public/common/assert_matching_enums.cc
+++ b/content/child/assert_matching_enums.cc
@@ -6,8 +6,10 @@
// from Blink are valid.
#include "base/macros.h"
+#include "cc/animation/animation.h"
#include "content/public/common/screen_orientation_values.h"
#include "net/base/mime_util.h"
+#include "third_party/WebKit/public/platform/WebAnimation.h"
#include "third_party/WebKit/public/platform/WebMimeRegistry.h"
#include "third_party/WebKit/public/platform/WebScreenOrientationLockType.h"
@@ -42,4 +44,16 @@ COMPILE_ASSERT_MATCHING_ENUM(blink::WebMimeRegistry::IsSupported,
COMPILE_ASSERT_MATCHING_ENUM(blink::WebMimeRegistry::MayBeSupported,
net::MayBeSupported);
+// TargetProperty
+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
« no previous file with comments | « build/all.gyp ('k') | content/content_child.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698