Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager

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"
@@ skipping 35 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(1));
+  surface_id_allocator_->RegisterSurfaceIdNamespace(surface_manager_.get());
+  surface_manager_->RegisterSurfaceFactoryClient(
+      surface_id_allocator_->id_namespace(), this);
   display_.reset(new cc::Display(this, surface_manager_.get(), nullptr, nullptr,
                                  settings));
 }
 
 HardwareRenderer::~HardwareRenderer() {
   // Must reset everything before |surface_factory_| to ensure all
   // resources are returned before resetting.
   if (!root_id_.is_null())
     surface_factory_->Destroy(root_id_);
   if (!child_id_.is_null())
     surface_factory_->Destroy(child_id_);
   display_.reset();
   surface_factory_.reset();
+  surface_manager_->UnregisterSurfaceFactoryClient(
+      surface_id_allocator_->id_namespace());
 
   // Reset draw constraints.
   shared_renderer_state_->PostExternalDrawConstraintsToChildCompositorOnRT(
       ParentCompositorDrawConstraints());
   ReturnResourcesInChildFrame();
 }
 
 void HardwareRenderer::CommitFrame() {
   TRACE_EVENT0("android_webview", "CommitFrame");
   scroll_offset_ = shared_renderer_state_->GetScrollOffsetOnRT();
@@ skipping 136 matching lines @@
   display_->SetExternalClip(clip);
   display_->DrawAndSwap();
 }
 
 void HardwareRenderer::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   ReturnResourcesToCompositor(resources, compositor_id_);
 }
 
 void HardwareRenderer::SetBeginFrameSource(
-    cc::SurfaceId surface_id,
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(tansell): Hook this up.
 }
 
 void HardwareRenderer::SetBackingFrameBufferObject(
     int framebuffer_binding_ext) {
   gl_surface_->SetBackingFrameBufferObject(framebuffer_binding_ext);
 }
 
 void HardwareRenderer::ReturnResourcesInChildFrame() {
@@ skipping 11 matching lines @@
   child_frame_.reset();
 }
 
 void HardwareRenderer::ReturnResourcesToCompositor(
     const cc::ReturnedResourceArray& resources,
     unsigned int compositor_id) {
   shared_renderer_state_->InsertReturnedResourcesOnRT(resources, compositor_id);
 }
 
 }  // namespace android_webview