ui::ContextFactory should not create SurfaceIdAllocators

content/browser/renderer_host/compositor_impl_android.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <stdint.h>
 #include <unordered_set>
@@ skipping 319 matching lines @@
 bool CompositorImpl::IsInitialized() {
   return g_initialized;
 }
 
 // static
 cc::SurfaceManager* CompositorImpl::GetSurfaceManager() {
   return g_surface_manager.Pointer();
 }
 
 // static
-std::unique_ptr<cc::SurfaceIdAllocator>
-CompositorImpl::CreateSurfaceIdAllocator() {
-  std::unique_ptr<cc::SurfaceIdAllocator> allocator(
-      new cc::SurfaceIdAllocator(++g_surface_client_id));
-  cc::SurfaceManager* manager = GetSurfaceManager();
-  DCHECK(manager);
-  allocator->RegisterSurfaceClientId(manager);
-  return allocator;
+uint32_t CompositorImpl::AllocateSurfaceClientId() {
+  return ++g_surface_client_id;
 }
 
 // static
 scoped_refptr<cc::VulkanInProcessContextProvider>
 CompositorImpl::SharedVulkanContextProviderAndroid() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableVulkan)) {
     scoped_refptr<cc::VulkanInProcessContextProvider>* context_provider =
         g_shared_vulkan_context_provider_android_.Pointer();
     if (!*context_provider)
       *context_provider = cc::VulkanInProcessContextProvider::Create();
     return *context_provider;
   }
   return nullptr;
 }
 
 CompositorImpl::CompositorImpl(CompositorClient* client,
                                gfx::NativeWindow root_window)
-    : surface_id_allocator_(CreateSurfaceIdAllocator()),
+    : surface_id_allocator_(
+          new cc::SurfaceIdAllocator(AllocateSurfaceClientId())),
       resource_manager_(root_window),
       has_transparent_background_(false),
       device_scale_factor_(1),
       window_(NULL),
       surface_handle_(gpu::kNullSurfaceHandle),
       client_(client),
       root_window_(root_window),
       needs_animate_(false),
       pending_swapbuffers_(0U),
       num_successive_context_creation_failures_(0),
       output_surface_request_pending_(false),
       needs_begin_frames_(false),
       weak_factory_(this) {
+  GetSurfaceManager()->RegisterSurfaceClientId(
+      surface_id_allocator_->client_id());
   DCHECK(client);
   DCHECK(root_window);
   DCHECK(root_window->GetLayer() == nullptr);
   root_window->SetLayer(cc::Layer::Create());
   root_window->AttachCompositor(this);
   CreateLayerTreeHost();
   resource_manager_.Init(host_.get());
 }
 
 CompositorImpl::~CompositorImpl() {
   root_window_->DetachCompositor();
   root_window_->SetLayer(nullptr);
   // Clean-up any surface references.
   SetSurface(NULL);
+  GetSurfaceManager()->InvalidateSurfaceClientId(
+      surface_id_allocator_->client_id());
 }
 
 ui::UIResourceProvider& CompositorImpl::GetUIResourceProvider() {
   return *this;
 }
 
 ui::ResourceManager& CompositorImpl::GetResourceManager() {
   return resource_manager_;
 }
 
@@ skipping 398 matching lines @@
 void CompositorImpl::SetNeedsAnimate() {
   needs_animate_ = true;
   if (!host_->visible())
     return;
 
   TRACE_EVENT0("compositor", "Compositor::SetNeedsAnimate");
   host_->SetNeedsAnimate();
 }
 
 }  // namespace content