ui::ContextFactory should not create SurfaceIdAllocators

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 34 matching lines @@
   // 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(next_surface_client_id_++));
-  surface_id_allocator_->RegisterSurfaceClientId(surface_manager_.get());
+  surface_manager_->RegisterSurfaceClientId(surface_id_allocator_->client_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(
           gl_surface_, DeferredGpuCommandService::GetInstance())));
   output_surface_ = output_surface_holder.get();
   std::unique_ptr<cc::DisplayScheduler> scheduler(new cc::DisplayScheduler(
@@ skipping 14 matching lines @@
 
 }
 
 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_->InvalidateSurfaceClientId(
+      surface_id_allocator_->client_id());
 }
 
-std::unique_ptr<cc::SurfaceIdAllocator>
-SurfacesInstance::CreateSurfaceIdAllocator() {
-  std::unique_ptr<cc::SurfaceIdAllocator> allocator =
-      base::WrapUnique(new cc::SurfaceIdAllocator(next_surface_client_id_++));
-  allocator->RegisterSurfaceClientId(surface_manager_.get());
-  return allocator;
+uint32_t SurfacesInstance::AllocateSurfaceClientId() {
+  return next_surface_client_id_++;
 }
 
 cc::SurfaceManager* SurfacesInstance::GetSurfaceManager() {
   return surface_manager_.get();
 }
 
 void SurfacesInstance::SetBackingFrameBufferObject(
     int framebuffer_binding_ext) {
   gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext);
 }
@@ skipping 77 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