Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single 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"
@@ skipping 45 matching lines @@
 
 }  // namespace
 
 using namespace test;
 
 // This test verifies that hit testing on a surface that does not exist does
 // not crash.
 TEST(SurfaceHittestTest, Hittest_BadCompositorFrameDoesNotCrash) {
   SurfaceManager manager;
   EmptySurfaceFactoryClient client;
-  SurfaceFactory factory(&manager, &client);
+  FrameSinkId root_frame_sink_id(kArbitraryFrameSinkId);
+  SurfaceFactory root_factory(root_frame_sink_id, &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(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(FrameSinkId(2, 2));
+  SurfaceIdAllocator root_allocator(root_frame_sink_id);
   SurfaceId root_surface_id = root_allocator.GenerateId();
-  factory.Create(root_surface_id);
-  factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
-                                SurfaceFactory::DrawCallback());
+  root_factory.Create(root_surface_id);
+  root_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);
+  root_factory.Destroy(root_surface_id);
 }
 
 TEST(SurfaceHittestTest, Hittest_SingleSurface) {
   SurfaceManager manager;
-  EmptySurfaceFactoryClient client;
-  SurfaceFactory factory(&manager, &client);
+
+  // Set up root FrameSink.
+  EmptySurfaceFactoryClient root_client;
+  FrameSinkId root_frame_sink_id(1, 1);
+  SurfaceFactory root_factory(root_frame_sink_id, &manager, &root_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(FrameSinkId(2, 2));
+  SurfaceIdAllocator root_allocator(root_frame_sink_id);
   SurfaceId root_surface_id = root_allocator.GenerateId();
-  factory.Create(root_surface_id);
-  factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
-                                SurfaceFactory::DrawCallback());
+  root_factory.Create(root_surface_id);
+  root_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);
+  root_factory.Destroy(root_surface_id);
 }
 
 TEST(SurfaceHittestTest, Hittest_ChildSurface) {
   SurfaceManager manager;
-  EmptySurfaceFactoryClient client;
-  SurfaceFactory factory(&manager, &client);
+
+  // Set up root FrameSink.
+  EmptySurfaceFactoryClient root_client;
+  FrameSinkId root_frame_sink_id(1, 1);
+  SurfaceFactory root_factory(root_frame_sink_id, &manager, &root_client);
+
+  // Set up child FrameSink.
+  EmptySurfaceFactoryClient child_client;
+  FrameSinkId child_frame_sink_id(2, 2);
+  SurfaceFactory child_factory(child_frame_sink_id, &manager, &child_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(FrameSinkId(3, 3));
+  SurfaceIdAllocator child_allocator(child_frame_sink_id);
   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(FrameSinkId(2, 2));
+  SurfaceIdAllocator root_allocator(root_frame_sink_id);
   SurfaceId root_surface_id = root_allocator.GenerateId();
-  factory.Create(root_surface_id);
-  factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
-                                SurfaceFactory::DrawCallback());
+  root_factory.Create(root_surface_id);
+  root_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.
   gfx::Rect child_solid_quad_rect(100, 100);
   CreateSolidColorDrawQuad(
       child_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_solid_quad_rect);
 
   // Submit the frame.
-  factory.Create(child_surface_id);
-  factory.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
-                                SurfaceFactory::DrawCallback());
+  child_factory.Create(child_surface_id);
+  child_factory.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
+                                      SurfaceFactory::DrawCallback());
 
   TestCase tests[] = {
     {
       root_surface_id,
       gfx::Point(10, 10),
       root_surface_id,
       gfx::Point(10, 10)
     },
     {
       root_surface_id,
@@ skipping 32 matching lines @@
   // Submit another root frame, with a slightly perturbed child Surface.
   root_frame = CreateCompositorFrame(root_rect, &root_pass);
   CreateSurfaceDrawQuad(root_pass,
                         gfx::Transform(1.0f, 0.0f, 0.0f, 75.0f,
                                         0.0f, 1.0f, 0.0f, 75.0f,
                                         0.0f, 0.0f, 1.0f, 0.0f,
                                         0.0f, 0.0f, 0.0f, 1.0f),
                         root_rect,
                         child_rect,
                         child_surface_id);
-  factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
-                                SurfaceFactory::DrawCallback());
+  root_factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
+                                     SurfaceFactory::DrawCallback());
 
   // Verify that point (100, 100) no longer falls on the child surface.
   // Verify that the transform to the child surface's space has also shifted.
   {
     SurfaceHittest hittest(nullptr, &manager);
 
     gfx::Point point(100, 100);
     gfx::Transform transform;
     EXPECT_EQ(root_surface_id,
               hittest.GetTargetSurfaceAtPoint(root_surface_id, point,
                                               &transform));
     transform.TransformPoint(&point);
     EXPECT_EQ(gfx::Point(100, 100), point);
 
     gfx::Point point_in_target_space(100, 100);
     gfx::Transform target_transform;
     EXPECT_TRUE(hittest.GetTransformToTargetSurface(
         root_surface_id, child_surface_id, &target_transform));
     target_transform.TransformPoint(&point_in_target_space);
     EXPECT_NE(transform, target_transform);
     EXPECT_EQ(gfx::Point(25, 25), point_in_target_space);
   }
 
-  factory.Destroy(root_surface_id);
-  factory.Destroy(child_surface_id);
+  root_factory.Destroy(root_surface_id);
+  child_factory.Destroy(child_surface_id);
 }
 
 // This test verifies that hit testing will progress to the next quad if it
 // encounters an invalid RenderPassDrawQuad for whatever reason.
 TEST(SurfaceHittestTest, Hittest_InvalidRenderPassDrawQuad) {
   SurfaceManager manager;
-  EmptySurfaceFactoryClient client;
-  SurfaceFactory factory(&manager, &client);
+
+  // Set up root FrameSink.
+  EmptySurfaceFactoryClient root_client;
+  FrameSinkId root_frame_sink_id(1, 1);
+  SurfaceFactory root_factory(root_frame_sink_id, &manager, &root_client);
+
+  // Set up child FrameSink.
+  EmptySurfaceFactoryClient child_client;
+  FrameSinkId child_frame_sink_id(2, 2);
+  SurfaceFactory child_factory(child_frame_sink_id, &manager, &child_client);
 
   // Creates a root surface.
   gfx::Rect root_rect(300, 300);
   RenderPass* root_pass = nullptr;
   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(FrameSinkId(3, 3));
+  SurfaceIdAllocator child_allocator(child_frame_sink_id);
   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(FrameSinkId(2, 2));
+  SurfaceIdAllocator root_allocator(root_frame_sink_id);
   SurfaceId root_surface_id = root_allocator.GenerateId();
-  factory.Create(root_surface_id);
-  factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
-                                SurfaceFactory::DrawCallback());
+  root_factory.Create(root_surface_id);
+  root_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.
   gfx::Rect child_solid_quad_rect(100, 100);
   CreateSolidColorDrawQuad(child_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_solid_quad_rect);
 
   // Submit the frame.
-  factory.Create(child_surface_id);
-  factory.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
-                                SurfaceFactory::DrawCallback());
+  child_factory.Create(child_surface_id);
+  child_factory.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
+                                      SurfaceFactory::DrawCallback());
 
   TestCase tests[] = {
     {
       root_surface_id,
       gfx::Point(10, 10),
       root_surface_id,
       gfx::Point(10, 10)
     },
     {
       root_surface_id,
@@ skipping 22 matching lines @@
     {
       root_surface_id,
       gfx::Point(290, 290),
       root_surface_id,
       gfx::Point(290, 290)
     }
   };
 
   RunTests(nullptr, &manager, tests, arraysize(tests));
 
-  factory.Destroy(root_surface_id);
-  factory.Destroy(child_surface_id);
+  root_factory.Destroy(root_surface_id);
+  child_factory.Destroy(child_surface_id);
 }
 
 TEST(SurfaceHittestTest, Hittest_RenderPassDrawQuad) {
   SurfaceManager manager;
   EmptySurfaceFactoryClient client;
-  SurfaceFactory factory(&manager, &client);
+  SurfaceFactory factory(kArbitraryFrameSinkId, &manager, &client);
 
   // Create a CompostiorFrame with two RenderPasses.
   gfx::Rect root_rect(300, 300);
   RenderPassList render_pass_list;
 
   // Create a child RenderPass.
   RenderPassId child_render_pass_id(1, 3);
   gfx::Transform transform_to_root_target(1.0f, 0.0f, 0.0f, 50.0f,
                                           0.0f, 1.0f, 0.0f, 50.0f,
                                           0.0f, 0.0f, 1.0f, 0.0f,
@@ skipping 81 matching lines @@
     }
   };
 
   RunTests(nullptr, &manager, tests, arraysize(tests));
 
   factory.Destroy(root_surface_id);
 }
 
 TEST(SurfaceHittestTest, Hittest_SingleSurface_WithInsetsDelegate) {
   SurfaceManager manager;
-  EmptySurfaceFactoryClient client;
-  SurfaceFactory factory(&manager, &client);
+
+  // Set up root FrameSink.
+  EmptySurfaceFactoryClient root_client;
+  FrameSinkId root_frame_sink_id(1, 1);
+  SurfaceFactory root_factory(root_frame_sink_id, &manager, &root_client);
+
+  // Set up child FrameSink.
+  EmptySurfaceFactoryClient child_client;
+  FrameSinkId child_frame_sink_id(2, 2);
+  SurfaceFactory child_factory(child_frame_sink_id, &manager, &child_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(FrameSinkId(3, 3));
+  SurfaceIdAllocator child_allocator(child_frame_sink_id);
   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(FrameSinkId(2, 2));
+  SurfaceIdAllocator root_allocator(root_frame_sink_id);
   SurfaceId root_surface_id = root_allocator.GenerateId();
-  factory.Create(root_surface_id);
-  factory.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
-                                SurfaceFactory::DrawCallback());
+  root_factory.Create(root_surface_id);
+  root_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.
   gfx::Rect child_solid_quad_rect(190, 190);
   CreateSolidColorDrawQuad(
       child_pass,
       gfx::Transform(1.0f, 0.0f, 0.0f, 5.0f, 0.0f, 1.0f, 0.0f, 5.0f, 0.0f, 0.0f,
                      1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f),
       root_rect, child_solid_quad_rect);
 
   // Submit the frame.
-  factory.Create(child_surface_id);
-  factory.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
-                                SurfaceFactory::DrawCallback());
+  child_factory.Create(child_surface_id);
+  child_factory.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
+                                      SurfaceFactory::DrawCallback());
 
   TestCase test_expectations_without_insets[] = {
       {root_surface_id, gfx::Point(55, 55), child_surface_id, gfx::Point(5, 5)},
       {root_surface_id, gfx::Point(60, 60), child_surface_id,
        gfx::Point(10, 10)},
       {root_surface_id, gfx::Point(239, 239), child_surface_id,
        gfx::Point(189, 189)},
       {root_surface_id, gfx::Point(244, 244), child_surface_id,
        gfx::Point(194, 194)},
       {root_surface_id, gfx::Point(50, 50), root_surface_id,
@@ skipping 58 matching lines @@
   TestSurfaceHittestDelegate accept_delegate;
   accept_delegate.AddInsetsForAcceptSurface(child_surface_id,
                                             gfx::Insets(5, 5, 5, 5));
   RunTests(&accept_delegate, &manager, test_expectations_with_accept_insets,
            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);
+  root_factory.Destroy(root_surface_id);
+  child_factory.Destroy(child_surface_id);
 }
 
 }  // namespace cc