Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

services/ui/surfaces/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 "services/ui/surfaces/compositor_frame_sink.h"
 
 #include "cc/output/copy_output_request.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
@@ skipping 12 matching lines @@
 #endif
 
 namespace ui {
 namespace surfaces {
 
 CompositorFrameSink::CompositorFrameSink(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     gfx::AcceleratedWidget widget,
     scoped_refptr<gpu::GpuChannelHost> gpu_channel,
     const scoped_refptr<DisplayCompositor>& display_compositor)
-    : task_runner_(task_runner),
+    : frame_sink_id_(display_compositor->GenerateNextClientId(), 0),
+      task_runner_(task_runner),
       display_compositor_(display_compositor),
-      factory_(display_compositor->manager(), this),
-      allocator_(
-          cc::FrameSinkId(display_compositor->GenerateNextClientId(), 0)) {
-  display_compositor_->manager()->RegisterFrameSinkId(
-      allocator_.frame_sink_id());
-  display_compositor_->manager()->RegisterSurfaceFactoryClient(
-      allocator_.frame_sink_id(), this);
+      factory_(frame_sink_id_, display_compositor->manager(), this),
+      allocator_(frame_sink_id_) {
+  display_compositor_->manager()->RegisterFrameSinkId(frame_sink_id_);
+  display_compositor_->manager()->RegisterSurfaceFactoryClient(frame_sink_id_,
+                                                               this);
 
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
       gpu_channel->gpu_memory_buffer_manager();
   scoped_refptr<SurfacesContextProvider> surfaces_context_provider(
       new SurfacesContextProvider(widget, std::move(gpu_channel)));
   // TODO(rjkroege): If there is something better to do than CHECK, add it.
   CHECK(surfaces_context_provider->BindToCurrentThread());
 
   std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source(
       new cc::DelayBasedBeginFrameSource(
@@ skipping 19 matching lines @@
 
   std::unique_ptr<cc::DisplayScheduler> scheduler(
       new cc::DisplayScheduler(synthetic_begin_frame_source.get(),
                                task_runner_.get(), max_frames_pending));
 
   display_.reset(new cc::Display(
       nullptr /* bitmap_manager */, gpu_memory_buffer_manager,
       cc::RendererSettings(), std::move(synthetic_begin_frame_source),
       std::move(display_output_surface), std::move(scheduler),
       base::MakeUnique<cc::TextureMailboxDeleter>(task_runner_.get())));
-  display_->Initialize(this, display_compositor_->manager(),
-                       allocator_.frame_sink_id());
+  display_->Initialize(this, display_compositor_->manager(), frame_sink_id_);
   display_->SetVisible(true);
 }
 
 CompositorFrameSink::~CompositorFrameSink() {
   display_compositor_->manager()->UnregisterSurfaceFactoryClient(
-      allocator_.frame_sink_id());
-  display_compositor_->manager()->InvalidateFrameSinkId(
-      allocator_.frame_sink_id());
+      frame_sink_id_);
+  display_compositor_->manager()->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void CompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame,
     const base::Callback<void()>& callback) {
   gfx::Size frame_size =
       frame.delegated_frame_data->render_pass_list.back()->output_rect.size();
   if (frame_size.IsEmpty() || frame_size != display_size_) {
     if (!surface_id_.is_null())
       factory_.Destroy(surface_id_);
@@ skipping 34 matching lines @@
 }
 
 void CompositorFrameSink::DisplayDidDrawAndSwap() {
   // This notification is not relevant to our client outside of tests. We
   // unblock the client from the DrawCallback when the surface is going to
   // be drawn.
 }
 
 }  // namespace surfaces
 }  // namespace ui