ui::ContextFactory should not create SurfaceIdAllocators

android_webview/browser/hardware_renderer.cc

 // Copyright 2014 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/hardware_renderer.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/aw_render_thread_context_provider.h"
 #include "android_webview/browser/child_frame.h"
 #include "android_webview/browser/parent_compositor_draw_constraints.h"
 #include "android_webview/browser/render_thread_manager.h"
 #include "android_webview/browser/surfaces_instance.h"
 #include "android_webview/public/browser/draw_gl.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "ui/gfx/transform.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace android_webview {
 
 HardwareRenderer::HardwareRenderer(RenderThreadManager* state)
     : render_thread_manager_(state),
       last_egl_context_(eglGetCurrentContext()),
       surfaces_(SurfacesInstance::GetOrCreateInstance()),
-      surface_id_allocator_(surfaces_->CreateSurfaceIdAllocator()),
+      surface_id_allocator_(
+          new cc::SurfaceIdAllocator(surfaces_->AllocateSurfaceClientId())),
       last_committed_output_surface_id_(0u),
       last_submitted_output_surface_id_(0u) {
   DCHECK(last_egl_context_);
+  surfaces_->GetSurfaceManager()->RegisterSurfaceClientId(
+      surface_id_allocator_->client_id());
   surfaces_->GetSurfaceManager()->RegisterSurfaceFactoryClient(
       surface_id_allocator_->client_id(), this);
 }
 
 HardwareRenderer::~HardwareRenderer() {
   // Must reset everything before |surface_factory_| to ensure all
   // resources are returned before resetting.
   if (!child_id_.is_null())
     DestroySurface();
   surface_factory_.reset();
   surfaces_->GetSurfaceManager()->UnregisterSurfaceFactoryClient(
       surface_id_allocator_->client_id());
+  surfaces_->GetSurfaceManager()->InvalidateSurfaceClientId(
+      surface_id_allocator_->client_id());
 
   // Reset draw constraints.
   render_thread_manager_->PostExternalDrawConstraintsToChildCompositorOnRT(
       ParentCompositorDrawConstraints());
   ReturnResourcesInChildFrame();
 }
 
 void HardwareRenderer::CommitFrame() {
   TRACE_EVENT0("android_webview", "CommitFrame");
   scroll_offset_ = render_thread_manager_->GetScrollOffsetOnRT();
@@ skipping 136 matching lines @@
     const cc::ReturnedResourceArray& resources,
     const CompositorID& compositor_id,
     uint32_t output_surface_id) {
   if (output_surface_id != last_committed_output_surface_id_)
     return;
   render_thread_manager_->InsertReturnedResourcesOnRT(resources, compositor_id,
                                                       output_surface_id);
 }
 
 }  // namespace android_webview