Migrate CompositingReasons to uint64.

We've already used up the 32-bit enum, and planning to continue adding more 
compositing reasons, so we need to expand to 64-bit values.

Blink side is here: https://codereview.chromium.org/16994010/.

BUG=240946

Review URL: https://chromiumcodereview.appspot.com/17138004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207515 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 39 insertions, 37 deletions

diff --git a/webkit/renderer/compositor_bindings/web_compositing_reasons.cc b/webkit/renderer/compositor_bindings/web_compositing_reasons.cc
index 1364f6e..75b9fd6 100644
--- a/webkit/renderer/compositor_bindings/web_compositing_reasons.cc
+++ b/webkit/renderer/compositor_bindings/web_compositing_reasons.cc
@@ -3,142 +3,144 @@
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
+#include "base/port.h"
 #include "cc/layers/compositing_reasons.h"
 #include "third_party/WebKit/public/platform/WebCompositingReasons.h"
 
-#define COMPILE_ASSERT_MATCHING_ENUMS(cc_name, webkit_name)             \
-    COMPILE_ASSERT(                                                     \
-        static_cast<int>(cc_name) == static_cast<int>(webkit_name),     \
-        mismatching_enums)
+#define COMPILE_ASSERT_MATCHING_UINT64(cc_name, webkit_name)                  \
+    COMPILE_ASSERT(                                                           \
+        static_cast<uint64>(cc_name) ==                                       \
+            (static_cast<uint64>(webkit_name) & GG_UINT64_C(0xffffffff)),     \
+        mismatching_uint64)
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonUnknown,
     WebKit::CompositingReasonUnknown);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReason3DTransform,
     WebKit::CompositingReason3DTransform);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonVideo,
     WebKit::CompositingReasonVideo);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonCanvas,
     WebKit::CompositingReasonCanvas);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonPlugin,
     WebKit::CompositingReasonPlugin);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonIFrame,
     WebKit::CompositingReasonIFrame);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonBackfaceVisibilityHidden,
     WebKit::CompositingReasonBackfaceVisibilityHidden);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonAnimation,
     WebKit::CompositingReasonAnimation);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonFilters,
     WebKit::CompositingReasonFilters);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonPositionFixed,
     WebKit::CompositingReasonPositionFixed);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonPositionSticky,
     WebKit::CompositingReasonPositionSticky);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonOverflowScrollingTouch,
     WebKit::CompositingReasonOverflowScrollingTouch);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonBlending,
     WebKit::CompositingReasonBlending);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonAssumedOverlap,
     WebKit::CompositingReasonAssumedOverlap);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonOverlap,
     WebKit::CompositingReasonOverlap);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonNegativeZIndexChildren,
     WebKit::CompositingReasonNegativeZIndexChildren);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonTransformWithCompositedDescendants,
     WebKit::CompositingReasonTransformWithCompositedDescendants);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonOpacityWithCompositedDescendants,
     WebKit::CompositingReasonOpacityWithCompositedDescendants);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonMaskWithCompositedDescendants,
     WebKit::CompositingReasonMaskWithCompositedDescendants);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonReflectionWithCompositedDescendants,
     WebKit::CompositingReasonReflectionWithCompositedDescendants);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonFilterWithCompositedDescendants,
     WebKit::CompositingReasonFilterWithCompositedDescendants);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonBlendingWithCompositedDescendants,
     WebKit::CompositingReasonBlendingWithCompositedDescendants);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonClipsCompositingDescendants,
     WebKit::CompositingReasonClipsCompositingDescendants);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonPerspective,
     WebKit::CompositingReasonPerspective);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonPreserve3D,
     WebKit::CompositingReasonPreserve3D);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonReflectionOfCompositedParent,
     WebKit::CompositingReasonReflectionOfCompositedParent);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonRoot,
     WebKit::CompositingReasonRoot);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonLayerForClip,
     WebKit::CompositingReasonLayerForClip);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonLayerForScrollbar,
     WebKit::CompositingReasonLayerForScrollbar);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonLayerForScrollingContainer,
     WebKit::CompositingReasonLayerForScrollingContainer);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonLayerForForeground,
     WebKit::CompositingReasonLayerForForeground);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonLayerForBackground,
     WebKit::CompositingReasonLayerForBackground);
 
-COMPILE_ASSERT_MATCHING_ENUMS(
+COMPILE_ASSERT_MATCHING_UINT64(
     cc::kCompositingReasonLayerForMask,
     WebKit::CompositingReasonLayerForMask);