Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

cc/test/test_compositor_frame_sink.cc

 // 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 "cc/test/test_compositor_frame_sink.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/compositor_frame_sink_client.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/texture_mailbox_deleter.h"
 
-static constexpr uint32_t kCompositorClientId = 1;
-static constexpr uint32_t kCompositorSinkId = 1;
+static constexpr cc::FrameSinkId kCompositorFrameSinkId(1, 1);
 
 namespace cc {
 
 TestCompositorFrameSink::TestCompositorFrameSink(
     scoped_refptr<ContextProvider> compositor_context_provider,
     scoped_refptr<ContextProvider> worker_context_provider,
     std::unique_ptr<OutputSurface> display_output_surface,
     SharedBitmapManager* shared_bitmap_manager,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     const RendererSettings& renderer_settings,
     base::SingleThreadTaskRunner* task_runner,
     bool synchronous_composite,
     bool force_disable_reclaim_resources)
     : CompositorFrameSink(std::move(compositor_context_provider),
                           std::move(worker_context_provider)),
+      frame_sink_id_(kCompositorFrameSinkId),
       surface_manager_(new SurfaceManager),
-      surface_id_allocator_(new SurfaceIdAllocator(
-          FrameSinkId(kCompositorClientId, kCompositorSinkId))),
-      surface_factory_(new SurfaceFactory(surface_manager_.get(), this)),
+      surface_id_allocator_(new SurfaceIdAllocator(frame_sink_id_)),
+      surface_factory_(
+          new SurfaceFactory(frame_sink_id_, surface_manager_.get(), this)),
       weak_ptrs_(this) {
   std::unique_ptr<SyntheticBeginFrameSource> begin_frame_source;
   std::unique_ptr<DisplayScheduler> scheduler;
   if (!synchronous_composite) {
     if (renderer_settings.disable_display_vsync) {
       begin_frame_source.reset(new BackToBackBeginFrameSource(
           base::MakeUnique<DelayBasedTimeSource>(task_runner)));
     } else {
       begin_frame_source.reset(new DelayBasedBeginFrameSource(
           base::MakeUnique<DelayBasedTimeSource>(task_runner)));
@@ skipping 35 matching lines @@
   if (!CompositorFrameSink::BindToClient(client))
     return false;
 
   // We want the Display's OutputSurface to hear about lost context, and since
   // this shares a context with it (when delegated_sync_points_required is
   // false), we should not be listening for lost context callbacks on the
   // context here.
   if (!capabilities_.delegated_sync_points_required && context_provider())
     context_provider()->SetLostContextCallback(base::Closure());
 
-  surface_manager_->RegisterFrameSinkId(surface_id_allocator_->frame_sink_id());
-  surface_manager_->RegisterSurfaceFactoryClient(
-      surface_id_allocator_->frame_sink_id(), this);
-  display_->Initialize(this, surface_manager_.get(),
-                       surface_id_allocator_->frame_sink_id());
+  surface_manager_->RegisterFrameSinkId(frame_sink_id_);
+  surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
+  display_->Initialize(this, surface_manager_.get(), frame_sink_id_);
   display_->renderer_for_testing()->SetEnlargePassTextureAmountForTesting(
       enlarge_pass_texture_amount_);
   display_->SetVisible(true);
   bound_ = true;
   return true;
 }
 
 void TestCompositorFrameSink::DetachFromClient() {
   // Some tests make BindToClient fail on purpose. ^__^
   if (bound_) {
     if (!delegated_surface_id_.is_null())
       surface_factory_->Destroy(delegated_surface_id_);
-    surface_manager_->UnregisterSurfaceFactoryClient(
-        surface_id_allocator_->frame_sink_id());
-    surface_manager_->InvalidateFrameSinkId(
-        surface_id_allocator_->frame_sink_id());
+    surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
+    surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
     bound_ = false;
   }
   display_ = nullptr;
   surface_factory_ = nullptr;
   surface_id_allocator_ = nullptr;
   surface_manager_ = nullptr;
   weak_ptrs_.InvalidateWeakPtrs();
   CompositorFrameSink::DetachFromClient();
 }
 
@@ skipping 70 matching lines @@
   if (test_client_)
     test_client_->DisplayWillDrawAndSwap(will_draw_and_swap, render_passes);
 }
 
 void TestCompositorFrameSink::DisplayDidDrawAndSwap() {
   if (test_client_)
     test_client_->DisplayDidDrawAndSwap();
 }
 
 }  // namespace cc