Reduce SurfaceIdAllocator usage and tie SurfaceFactory to a single FrameSinkId

android_webview/browser/surfaces_instance.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 "android_webview/browser/surfaces_instance.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
@@ skipping 20 matching lines @@
 SurfacesInstance* g_surfaces_instance = nullptr;
 }  // namespace
 
 // static
 scoped_refptr<SurfacesInstance> SurfacesInstance::GetOrCreateInstance() {
   if (g_surfaces_instance)
     return make_scoped_refptr(g_surfaces_instance);
   return make_scoped_refptr(new SurfacesInstance);
 }
 
-SurfacesInstance::SurfacesInstance() : next_frame_sink_id_(1u) {
+SurfacesInstance::SurfacesInstance()
+    : next_client_id_(1u), frame_sink_id_(AllocateFrameSinkId()) {
   cc::RendererSettings settings;
 
   // Should be kept in sync with compositor_impl_android.cc.
   settings.allow_antialiasing = false;
   settings.highp_threshold_min = 2048;
 
   // Webview does not own the surface so should not clear it.
   settings.should_clear_root_render_pass = false;
 
   surface_manager_.reset(new cc::SurfaceManager);
-  surface_id_allocator_.reset(new cc::SurfaceIdAllocator(
-      cc::FrameSinkId(next_frame_sink_id_++, 0 /* frame_sink_id */)));
-  surface_manager_->RegisterFrameSinkId(surface_id_allocator_->frame_sink_id());
+  surface_id_allocator_.reset(new cc::SurfaceIdAllocator(frame_sink_id_));
+  surface_manager_->RegisterFrameSinkId(frame_sink_id_);
 
   std::unique_ptr<cc::BeginFrameSource> begin_frame_source(
       new cc::StubBeginFrameSource);
   std::unique_ptr<cc::TextureMailboxDeleter> texture_mailbox_deleter(
       new cc::TextureMailboxDeleter(nullptr));
   std::unique_ptr<ParentOutputSurface> output_surface_holder(
       new ParentOutputSurface(AwRenderThreadContextProvider::Create(
           make_scoped_refptr(new AwGLSurface),
           DeferredGpuCommandService::GetInstance())));
   output_surface_ = output_surface_holder.get();
   std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
       begin_frame_source.get(), nullptr,
       output_surface_holder->capabilities().max_frames_pending));
   display_.reset(new cc::Display(
       nullptr /* shared_bitmap_manager */,
       nullptr /* gpu_memory_buffer_manager */, settings,
       std::move(begin_frame_source), std::move(output_surface_holder),
       std::move(scheduler), std::move(texture_mailbox_deleter)));
-  display_->Initialize(this, surface_manager_.get(),
-                       surface_id_allocator_->frame_sink_id());
+  display_->Initialize(this, surface_manager_.get(), frame_sink_id_);
   display_->SetVisible(true);
 
-  surface_factory_.reset(new cc::SurfaceFactory(surface_manager_.get(), this));
+  surface_factory_.reset(
+      new cc::SurfaceFactory(frame_sink_id_, surface_manager_.get(), this));
 
   DCHECK(!g_surfaces_instance);
   g_surfaces_instance = this;
 
 }
 
 SurfacesInstance::~SurfacesInstance() {
   DCHECK_EQ(g_surfaces_instance, this);
   g_surfaces_instance = nullptr;
 
   DCHECK(child_ids_.empty());
   if (!root_id_.is_null())
     surface_factory_->Destroy(root_id_);
 
-  surface_manager_->InvalidateFrameSinkId(
-      surface_id_allocator_->frame_sink_id());
+  surface_manager_->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 cc::FrameSinkId SurfacesInstance::AllocateFrameSinkId() {
-  return cc::FrameSinkId(next_frame_sink_id_++, 0 /* sink_id */);
+  return cc::FrameSinkId(next_client_id_++, 0 /* sink_id */);
 }
 
 cc::SurfaceManager* SurfacesInstance::GetSurfaceManager() {
   return surface_manager_.get();
 }
 
 void SurfacesInstance::DrawAndSwap(const gfx::Size& viewport,
                                    const gfx::Rect& clip,
                                    const gfx::Transform& transform,
                                    const gfx::Size& frame_size,
@@ skipping 70 matching lines @@
   CHECK(resources.empty());
 }
 
 void SurfacesInstance::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // Parent compsitor calls DrawAndSwap directly and doesn't use
   // BeginFrameSource.
 }
 
 }  // namespace android_webview