third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp - Issue 2860293002: Change cc::ElementId to be a uint64_t

Unified Diff: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

Issue 2860293002: Change cc::ElementId to be a uint64_t (Closed)

Patch Set: none Created 3 years, 7 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

« third_party/WebKit/Source/platform/graphics/CompositorElementId.cpp ('K') | « third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp ('k') | third_party/WebKit/Source/platform/graphics/paint/EffectPaintPropertyNode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

index 2c13bd2e5670e4d61dc7b300b0984a205c0b8b60..614331c0a4794824d789d3080aa40ef23e9e8aa7 100644

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

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

@@ -714,8 +714,7 @@ class FakeScrollClient : public WebLayerScrollClient {

TEST_F(PaintArtifactCompositorTestWithPropertyTrees, OneScrollNode) {

FakeScrollClient scroll_client;

- CompositorElementId expected_compositor_element_id =

- CompositorElementId(2, 0);

+ CompositorElementId expected_compositor_element_id = CompositorElementId(2);

RefPtr<TransformPaintPropertyNode> scroll_translation =

TransformPaintPropertyNode::CreateScrollTranslation(

TransformPaintPropertyNode::Root(),

@@ -823,8 +822,7 @@ 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 = CompositorElementId(2);

RefPtr<TransformPaintPropertyNode> scroll_translation_a =

TransformPaintPropertyNode::CreateScrollTranslation(

TransformPaintPropertyNode::Root(),

@@ -835,8 +833,7 @@ TEST_F(PaintArtifactCompositorTestWithPropertyTrees, NestedScrollNodes) {

MainThreadScrollingReason::kHasBackgroundAttachmentFixedObjects,

nullptr);

- CompositorElementId expected_compositor_element_id_b =

- CompositorElementId(3, 0);

+ CompositorElementId expected_compositor_element_id_b = CompositorElementId(3);

RefPtr<TransformPaintPropertyNode> scroll_translation_b =

TransformPaintPropertyNode::CreateScrollTranslation(

scroll_translation_a, TransformationMatrix().Translate(37, 41),

@@ -1644,7 +1641,7 @@ TEST_F(PaintArtifactCompositorTestWithPropertyTrees,

}

PassRefPtr<EffectPaintPropertyNode> CreateSampleEffectNodeWithElementId() {

- CompositorElementId expected_compositor_element_id(2, 0);

+ CompositorElementId expected_compositor_element_id(2);

float opacity = 2.0 / 255.0;

return EffectPaintPropertyNode::Create(

EffectPaintPropertyNode::Root(), TransformPaintPropertyNode::Root(),

@@ -1655,7 +1652,7 @@ PassRefPtr<EffectPaintPropertyNode> CreateSampleEffectNodeWithElementId() {

PassRefPtr<TransformPaintPropertyNode>

CreateSampleTransformNodeWithElementId() {

- CompositorElementId expected_compositor_element_id(3, 0);

+ CompositorElementId expected_compositor_element_id(3);

return TransformPaintPropertyNode::Create(

TransformPaintPropertyNode::Root(), TransformationMatrix().Rotate(90),

FloatPoint3D(100, 100, 0), false, 0, kCompositingReason3DTransform,