Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

blimp/client/support/compositor/blimp_embedder_compositor.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 "blimp/client/support/compositor/blimp_embedder_compositor.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "blimp/client/public/compositor/compositor_dependencies.h"
@@ skipping 67 matching lines @@
 };
 
 base::LazyInstance<SimpleTaskGraphRunner> g_task_graph_runner =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 BlimpEmbedderCompositor::BlimpEmbedderCompositor(
     CompositorDependencies* compositor_dependencies)
     : compositor_dependencies_(compositor_dependencies),
-      surface_id_allocator_(base::MakeUnique<cc::SurfaceIdAllocator>(
-          compositor_dependencies->AllocateFrameSinkId())),
+      frame_sink_id_(compositor_dependencies->AllocateFrameSinkId()),
       compositor_frame_sink_request_pending_(false),
       root_layer_(cc::Layer::Create()) {
   compositor_dependencies_->GetSurfaceManager()->RegisterFrameSinkId(
-      surface_id_allocator_->frame_sink_id());
+      frame_sink_id_);
 
   cc::LayerTreeHostInProcess::InitParams params;
   params.client = this;
   params.gpu_memory_buffer_manager =
       compositor_dependencies_->GetGpuMemoryBufferManager();
   params.task_graph_runner = g_task_graph_runner.Pointer();
   cc::LayerTreeSettings settings;
   params.settings = &settings;
   params.main_task_runner = base::ThreadTaskRunnerHandle::Get();
   params.animation_host = cc::AnimationHost::CreateMainInstance();
   host_ = cc::LayerTreeHostInProcess::CreateSingleThreaded(this, &params);
 
   root_layer_->SetBackgroundColor(SK_ColorWHITE);
   host_->GetLayerTree()->SetRootLayer(root_layer_);
-  host_->SetFrameSinkId(surface_id_allocator_->frame_sink_id());
+  host_->SetFrameSinkId(frame_sink_id_);
   host_->SetVisible(true);
 }
 
 BlimpEmbedderCompositor::~BlimpEmbedderCompositor() {
   SetContextProvider(nullptr);
   compositor_dependencies_->GetSurfaceManager()->InvalidateFrameSinkId(
-      surface_id_allocator_->frame_sink_id());
+      frame_sink_id_);
 }
 
 void BlimpEmbedderCompositor::SetContentLayer(
     scoped_refptr<cc::Layer> content_layer) {
   root_layer_->RemoveAllChildren();
   root_layer_->AddChild(content_layer);
 }
 
 void BlimpEmbedderCompositor::SetSize(const gfx::Size& size_in_px) {
   viewport_size_in_px_ = size_in_px;
@@ skipping 68 matching lines @@
   display_ = base::MakeUnique<cc::Display>(
       nullptr /*shared_bitmap_manager*/, gpu_memory_buffer_manager,
       host_->GetSettings().renderer_settings, std::move(begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner));
   display_->SetVisible(true);
   display_->Resize(viewport_size_in_px_);
 
   // The Browser compositor and display share the same context provider.
   auto compositor_frame_sink = base::MakeUnique<cc::DirectCompositorFrameSink>(
-      compositor_dependencies_->GetSurfaceManager(),
-      surface_id_allocator_.get(), display_.get(), context_provider_, nullptr);
+      frame_sink_id_, compositor_dependencies_->GetSurfaceManager(),
+      display_.get(), context_provider_, nullptr);
 
   host_->SetCompositorFrameSink(std::move(compositor_frame_sink));
 }
 
 }  // namespace client
 }  // namespace blimp