Change cc::ElementId to be a uint64_t

third_party/WebKit/Source/platform/graphics/paint/PropertyTreeStateTest.cpp

Index: third_party/WebKit/Source/platform/graphics/paint/PropertyTreeStateTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PropertyTreeStateTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PropertyTreeStateTest.cpp
index 6b1e01d4e9fbb96d8f12d9ef90385a1cc9a41f6f..54ada6f887226c8c02c6ecffa2eaeaf48c05a8d8 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PropertyTreeStateTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/PropertyTreeStateTest.cpp
@@ -196,8 +196,8 @@ TEST_F(PropertyTreeStateTest, CompositorElementIdNoElementIdOnAnyNode) {
 }
 
 TEST_F(PropertyTreeStateTest, CompositorElementIdWithElementIdOnTransformNode) {
-  CompositorElementId expected_compositor_element_id =
-      CompositorElementId(2, 0);
+  CompositorElementId expected_compositor_element_id;
+  expected_compositor_element_id.id = 2;
   RefPtr<TransformPaintPropertyNode> transform =
       TransformPaintPropertyNode::Create(TransformPaintPropertyNode::Root(),
                                          TransformationMatrix(), FloatPoint3D(),
@@ -210,8 +210,8 @@ TEST_F(PropertyTreeStateTest, CompositorElementIdWithElementIdOnTransformNode) {
 }
 
 TEST_F(PropertyTreeStateTest, CompositorElementIdWithElementIdOnEffectNode) {
-  CompositorElementId expected_compositor_element_id =
-      CompositorElementId(2, 0);
+  CompositorElementId expected_compositor_element_id;
+  expected_compositor_element_id.id = 2;
   RefPtr<EffectPaintPropertyNode> effect = EffectPaintPropertyNode::Create(
       EffectPaintPropertyNode::Root(), TransformPaintPropertyNode::Root(),
       ClipPaintPropertyNode::Root(), kColorFilterNone,
@@ -224,8 +224,8 @@ TEST_F(PropertyTreeStateTest, CompositorElementIdWithElementIdOnEffectNode) {
 }
 
 TEST_F(PropertyTreeStateTest, CompositorElementIdWithElementIdOnMultipleNodes) {
-  CompositorElementId expected_compositor_element_id =
-      CompositorElementId(2, 0);
+  CompositorElementId expected_compositor_element_id;
+  expected_compositor_element_id.id = 2;
   RefPtr<TransformPaintPropertyNode> transform =
       TransformPaintPropertyNode::Create(TransformPaintPropertyNode::Root(),
                                          TransformationMatrix(), FloatPoint3D(),
@@ -243,8 +243,10 @@ TEST_F(PropertyTreeStateTest, CompositorElementIdWithElementIdOnMultipleNodes) {
 }
 
 TEST_F(PropertyTreeStateTest, CompositorElementIdWithDifferingElementIds) {
-  CompositorElementId first_compositor_element_id = CompositorElementId(2, 0);
-  CompositorElementId second_compositor_element_id = CompositorElementId(3, 0);
+  CompositorElementId first_compositor_element_id;
+  first_compositor_element_id.id = 2;
+  CompositorElementId second_compositor_element_id;
+  second_compositor_element_id.id = 3;
   RefPtr<TransformPaintPropertyNode> transform =
       TransformPaintPropertyNode::Create(TransformPaintPropertyNode::Root(),
                                          TransformationMatrix(), FloatPoint3D(),
@@ -259,12 +261,12 @@ TEST_F(PropertyTreeStateTest, CompositorElementIdWithDifferingElementIds) {
                           effect.Get());
 
   CompositorElementIdSet composited_element_ids;
-  composited_element_ids.insert(first_compositor_element_id);
+  composited_element_ids.insert(first_compositor_element_id.id);
   EXPECT_EQ(second_compositor_element_id,
             state.GetCompositorElementId(composited_element_ids));
 
   composited_element_ids.clear();
-  composited_element_ids.insert(second_compositor_element_id);
+  composited_element_ids.insert(second_compositor_element_id.id);
   EXPECT_EQ(first_compositor_element_id,
             state.GetCompositorElementId(composited_element_ids));
 }