Change cc::ElementId to be a uint64_t

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include <memory>
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 696 matching lines @@
     last_scroll_offset = scroll_offset;
   };
 
   gfx::ScrollOffset last_scroll_offset;
   unsigned did_scroll_count;
 };
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, OneScrollNode) {
   FakeScrollClient scroll_client;
 
-  CompositorElementId expected_compositor_element_id =
-      CompositorElementId(2, 0);
+  CompositorElementId expected_compositor_element_id;
+  expected_compositor_element_id.id = 2;
   RefPtr<TransformPaintPropertyNode> scroll_translation =
       TransformPaintPropertyNode::CreateScrollTranslation(
           TransformPaintPropertyNode::Root(),
           TransformationMatrix().Translate(7, 9), FloatPoint3D(), false, 0,
           kCompositingReasonNone, expected_compositor_element_id,
           ScrollPaintPropertyNode::Root(), IntSize(11, 13), IntSize(27, 31),
           true, false, 0 /* mainThreadScrollingReasons */, &scroll_client);
 
   TestPaintArtifact artifact;
   artifact
@@ skipping 87 matching lines @@
   EXPECT_EQ(scroll_transform_node.id,
             ContentLayerAt(0)->transform_tree_index());
   EXPECT_NE(scroll_transform_node.id,
             ContentLayerAt(1)->transform_tree_index());
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, NestedScrollNodes) {
   RefPtr<EffectPaintPropertyNode> effect =
       CreateOpacityOnlyEffect(EffectPaintPropertyNode::Root(), 0.5);
 
-  CompositorElementId expected_compositor_element_id_a =
-      CompositorElementId(2, 0);
+  CompositorElementId expected_compositor_element_id_a;
+  expected_compositor_element_id_a.id = 2;
   RefPtr<TransformPaintPropertyNode> scroll_translation_a =
       TransformPaintPropertyNode::CreateScrollTranslation(
           TransformPaintPropertyNode::Root(),
           TransformationMatrix().Translate(11, 13), FloatPoint3D(), false, 0,
           kCompositingReasonLayerForScrollingContents,
           expected_compositor_element_id_a, ScrollPaintPropertyNode::Root(),
           IntSize(2, 3), IntSize(5, 7), false, true,
           MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects,
           nullptr);
 
-  CompositorElementId expected_compositor_element_id_b =
-      CompositorElementId(3, 0);
+  CompositorElementId expected_compositor_element_id_b;
+  expected_compositor_element_id_b.id = 3;
   RefPtr<TransformPaintPropertyNode> scroll_translation_b =
       TransformPaintPropertyNode::CreateScrollTranslation(
           scroll_translation_a, TransformationMatrix().Translate(37, 41),
           FloatPoint3D(), false, 0, kCompositingReasonNone,
           expected_compositor_element_id_b, scroll_translation_a->ScrollNode(),
           IntSize(19, 23), IntSize(29, 31), true, false,
           0 /* mainThreadScrollingReasons */, nullptr);
   TestPaintArtifact artifact;
   artifact.Chunk(scroll_translation_a, ClipPaintPropertyNode::Root(), effect)
       .RectDrawing(FloatRect(7, 11, 13, 17), Color::kWhite);
@@ skipping 787 matching lines @@
   chunk3.properties.property_tree_state = chunk1.properties.property_tree_state;
   chunk3.bounds = FloatRect(0, 0, 50, 60);
   chunk3.known_to_be_opaque = true;
   pending_layer.Merge(PaintArtifactCompositor::PendingLayer(chunk3, false));
 
   // Chunk 3 covers the entire layer, so now it's opaque.
   EXPECT_TRUE(pending_layer.known_to_be_opaque);
 }
 
 PassRefPtr<EffectPaintPropertyNode> CreateSampleEffectNodeWithElementId() {
-  CompositorElementId expected_compositor_element_id(2, 0);
+  CompositorElementId expected_compositor_element_id;
+  expected_compositor_element_id.id = 2;
   float opacity = 2.0 / 255.0;
   return EffectPaintPropertyNode::Create(
       EffectPaintPropertyNode::Root(), TransformPaintPropertyNode::Root(),
       ClipPaintPropertyNode::Root(), kColorFilterNone,
       CompositorFilterOperations(), opacity, SkBlendMode::kSrcOver,
       kCompositingReasonActiveAnimation, expected_compositor_element_id);
 }
 
 PassRefPtr<TransformPaintPropertyNode>
 CreateSampleTransformNodeWithElementId() {
-  CompositorElementId expected_compositor_element_id(3, 0);
+  CompositorElementId expected_compositor_element_id;
+  expected_compositor_element_id.id = 3;
   return TransformPaintPropertyNode::Create(
       TransformPaintPropertyNode::Root(), TransformationMatrix().Rotate(90),
       FloatPoint3D(100, 100, 0), false, 0, kCompositingReason3DTransform,
       expected_compositor_element_id);
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, TransformWithElementId) {
   RefPtr<TransformPaintPropertyNode> transform =
       CreateSampleTransformNodeWithElementId();
   TestPaintArtifact artifact;
@@ skipping 418 matching lines @@
       .RectDrawing(FloatRect(0, 0, 100, 100), Color::kBlack)
       .Chunk(TransformPaintPropertyNode::Root(), ClipPaintPropertyNode::Root(),
              effect.Get())
       .RectDrawing(FloatRect(100, 100, 200, 100), Color::kBlack);
 
   CompositorElementIdSet composited_element_ids;
   Update(artifact.Build(), composited_element_ids);
 
   EXPECT_EQ(2u, composited_element_ids.size());
   EXPECT_TRUE(
-      composited_element_ids.Contains(transform->GetCompositorElementId()));
+      composited_element_ids.Contains(transform->GetCompositorElementId().id));
   EXPECT_TRUE(
-      composited_element_ids.Contains(effect->GetCompositorElementId()));
+      composited_element_ids.Contains(effect->GetCompositorElementId().id));
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, SkipChunkWithOpacityZero) {
   {
     TestPaintArtifact artifact;
     CreateSimpleArtifactWithOpacity(artifact, 0, false, false);
     ASSERT_EQ(0u, ContentLayerCount());
   }
   {
     TestPaintArtifact artifact;
@@ skipping 150 matching lines @@
   TestPaintArtifact artifact;
   artifact
       .Chunk(TransformPaintPropertyNode::Root(), ClipPaintPropertyNode::Root(),
              visibleEffect)
       .RectDrawing(FloatRect(0, 0, 100, 100), Color::kBlack);
   Update(artifact.Build());
   ASSERT_EQ(0u, ContentLayerCount());
 }
 
 }  // namespace blink