Replace usage of SurfaceId's client_id with FrameSinkId

cc/surfaces/surface_hittest_unittest.cc

 // Copyright 2015 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 <stddef.h>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_hittest.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/test/surface_hittest_test_helpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
 
 namespace {
 
+static constexpr FrameSinkId kArbitraryFrameSinkId(1, 1);
+
 struct TestCase {
   SurfaceId input_surface_id;
   gfx::Point input_point;
   SurfaceId expected_compositor_frame_sink_id;
   gfx::Point expected_output_point;
 };
 
 void RunTests(SurfaceHittestDelegate* delegate,
               SurfaceManager* manager,
               TestCase* tests,
@@ skipping 29 matching lines @@
   SurfaceManager manager;
   EmptySurfaceFactoryClient client;
   SurfaceFactory factory(&manager, &client);
 
   // Creates a root surface.
   gfx::Rect root_rect(300, 300);
   RenderPass* root_pass = nullptr;
   CompositorFrame root_frame = CreateCompositorFrame(root_rect, &root_pass);
 
   // Add a reference to a non-existant child surface on the root surface.
-  SurfaceId child_surface_id(3, 0xdeadbeef, 0);
+  SurfaceId child_surface_id(kArbitraryFrameSinkId, 0xdeadbeef, 0);
   gfx::Rect child_rect(200, 200);
   CreateSurfaceDrawQuad(root_pass,
                         gfx::Transform(),
                         root_rect,
                         child_rect,
                         child_surface_id);
 
   // Submit the root frame.
-  SurfaceIdAllocator root_allocator(2);
+  SurfaceIdAllocator root_allocator(FrameSinkId(2, 2));
   SurfaceId root_surface_id = root_allocator.GenerateId();
   factory.Create(root_surface_id);
   factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
                                 SurfaceFactory::DrawCallback());
 
   {
     SurfaceHittest hittest(nullptr, &manager);
     // It is expected this test will complete without crashes.
     gfx::Transform transform;
     EXPECT_EQ(root_surface_id,
               hittest.GetTargetSurfaceAtPoint(
                   root_surface_id, gfx::Point(100, 100), &transform));
   }
 
   factory.Destroy(root_surface_id);
 }
 
 TEST(SurfaceHittestTest, Hittest_SingleSurface) {
   SurfaceManager manager;
   EmptySurfaceFactoryClient client;
   SurfaceFactory factory(&manager, &client);
 
   // Creates a root surface.
   gfx::Rect root_rect(300, 300);
   RenderPass* root_pass = nullptr;
   CompositorFrame root_frame = CreateCompositorFrame(root_rect, &root_pass);
 
   // Submit the root frame.
-  SurfaceIdAllocator root_allocator(2);
+  SurfaceIdAllocator root_allocator(FrameSinkId(2, 2));
   SurfaceId root_surface_id = root_allocator.GenerateId();
   factory.Create(root_surface_id);
   factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
                                 SurfaceFactory::DrawCallback());
   TestCase tests[] = {
     {
       root_surface_id,
       gfx::Point(100, 100),
       root_surface_id,
       gfx::Point(100, 100)
     },
   };
 
   RunTests(nullptr, &manager, tests, arraysize(tests));
 
   factory.Destroy(root_surface_id);
 }
 
 TEST(SurfaceHittestTest, Hittest_ChildSurface) {
   SurfaceManager manager;
   EmptySurfaceFactoryClient client;
   SurfaceFactory factory(&manager, &client);
 
   // Creates a root surface.
   gfx::Rect root_rect(300, 300);
   RenderPass* root_pass = nullptr;
   CompositorFrame root_frame = CreateCompositorFrame(root_rect, &root_pass);
 
   // Add a reference to the child surface on the root surface.
-  SurfaceIdAllocator child_allocator(3);
+  SurfaceIdAllocator child_allocator(FrameSinkId(3, 3));
   SurfaceId child_surface_id = child_allocator.GenerateId();
   gfx::Rect child_rect(200, 200);
   CreateSurfaceDrawQuad(root_pass,
                         gfx::Transform(1.0f, 0.0f, 0.0f, 50.0f,
                                         0.0f, 1.0f, 0.0f, 50.0f,
                                         0.0f, 0.0f, 1.0f, 0.0f,
                                         0.0f, 0.0f, 0.0f, 1.0f),
                         root_rect,
                         child_rect,
                         child_surface_id);
 
   // Submit the root frame.
-  SurfaceIdAllocator root_allocator(2);
+  SurfaceIdAllocator root_allocator(FrameSinkId(2, 2));
   SurfaceId root_surface_id = root_allocator.GenerateId();
   factory.Create(root_surface_id);
   factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
                                 SurfaceFactory::DrawCallback());
 
   // Creates a child surface.
   RenderPass* child_pass = nullptr;
   CompositorFrame child_frame = CreateCompositorFrame(child_rect, &child_pass);
 
   // Add a solid quad in the child surface.
@@ skipping 104 matching lines @@
   CompositorFrame root_frame = CreateCompositorFrame(root_rect, &root_pass);
 
   // Create a RenderPassDrawQuad to a non-existant RenderPass.
   CreateRenderPassDrawQuad(root_pass,
                            gfx::Transform(),
                            root_rect,
                            root_rect,
                            RenderPassId(1337, 1337));
 
   // Add a reference to the child surface on the root surface.
-  SurfaceIdAllocator child_allocator(3);
+  SurfaceIdAllocator child_allocator(FrameSinkId(3, 3));
   SurfaceId child_surface_id = child_allocator.GenerateId();
   gfx::Rect child_rect(200, 200);
   CreateSurfaceDrawQuad(root_pass,
                         gfx::Transform(1.0f, 0.0f, 0.0f, 50.0f,
                                        0.0f, 1.0f, 0.0f, 50.0f,
                                        0.0f, 0.0f, 1.0f, 0.0f,
                                        0.0f, 0.0f, 0.0f, 1.0f),
                         root_rect,
                         child_rect,
                         child_surface_id);
 
   // Submit the root frame.
-  SurfaceIdAllocator root_allocator(2);
+  SurfaceIdAllocator root_allocator(FrameSinkId(2, 2));
   SurfaceId root_surface_id = root_allocator.GenerateId();
   factory.Create(root_surface_id);
   factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
                                 SurfaceFactory::DrawCallback());
 
   // Creates a child surface.
   RenderPass* child_pass = nullptr;
   CompositorFrame child_frame = CreateCompositorFrame(child_rect, &child_pass);
 
   // Add a solid quad in the child surface.
@@ skipping 97 matching lines @@
   // Add a solid quad in the child render pass.
   RenderPass* child_render_pass =
       root_frame.delegated_frame_data->render_pass_list.front().get();
   gfx::Rect child_solid_quad_rect(100, 100);
   CreateSolidColorDrawQuad(child_render_pass,
                            gfx::Transform(),
                            gfx::Rect(100, 100),
                            child_solid_quad_rect);
 
   // Submit the root frame.
-  SurfaceIdAllocator root_allocator(1);
+  SurfaceIdAllocator root_allocator(FrameSinkId(1, 1));
   SurfaceId root_surface_id = root_allocator.GenerateId();
   factory.Create(root_surface_id);
   factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
                                 SurfaceFactory::DrawCallback());
 
   TestCase tests[] = {
     // These tests just miss the RenderPassDrawQuad.
     {
       root_surface_id,
       gfx::Point(49, 49),
@@ skipping 45 matching lines @@
   SurfaceManager manager;
   EmptySurfaceFactoryClient client;
   SurfaceFactory factory(&manager, &client);
 
   // Creates a root surface.
   gfx::Rect root_rect(300, 300);
   RenderPass* root_pass = nullptr;
   CompositorFrame root_frame = CreateCompositorFrame(root_rect, &root_pass);
 
   // Add a reference to the child surface on the root surface.
-  SurfaceIdAllocator child_allocator(3);
+  SurfaceIdAllocator child_allocator(FrameSinkId(3, 3));
   SurfaceId child_surface_id = child_allocator.GenerateId();
   gfx::Rect child_rect(200, 200);
   CreateSurfaceDrawQuad(
       root_pass,
       gfx::Transform(1.0f, 0.0f, 0.0f, 50.0f,
                      0.0f, 1.0f, 0.0f, 50.0f,
                      0.0f, 0.0f, 1.0f, 0.0f,
                      0.0f, 0.0f, 0.0f, 1.0f),
       root_rect, child_rect, child_surface_id);
 
   // Submit the root frame.
-  SurfaceIdAllocator root_allocator(2);
+  SurfaceIdAllocator root_allocator(FrameSinkId(2, 2));
   SurfaceId root_surface_id = root_allocator.GenerateId();
   factory.Create(root_surface_id);
   factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
                                 SurfaceFactory::DrawCallback());
 
   // Creates a child surface.
   RenderPass* child_pass = nullptr;
   CompositorFrame child_frame = CreateCompositorFrame(child_rect, &child_pass);
 
   // Add a solid quad in the child surface.
@@ skipping 83 matching lines @@
            arraysize(test_expectations_with_accept_insets));
 
   // Verify that insets have affected hit targeting.
   EXPECT_EQ(0, accept_delegate.reject_target_overrides());
   EXPECT_EQ(2, accept_delegate.accept_target_overrides());
 
   factory.Destroy(root_surface_id);
 }
 
 }  // namespace cc