Delete OnscreenDisplayClient and TopLevelDisplayClient.

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 40 matching lines @@
   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,
-                                 surface_id_allocator_->id_namespace()));
+
+  std::unique_ptr<ParentOutputSurface> output_surface_holder(
+      new ParentOutputSurface(AwRenderThreadContextProvider::Create(
+          gl_surface_, DeferredGpuCommandService::GetInstance())));
+  output_surface_ = output_surface_holder.get();
+  display_.reset(new cc::Display(
+      surface_manager_.get(), nullptr /* shared_bitmap_manager */,
+      nullptr /* gpu_memory_buffer_manager */, settings,
+      surface_id_allocator_->id_namespace(), nullptr /* task_runner */,
+      std::move(output_surface_holder)));
+  display_->Initialize(this);
 }
 
 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();
@@ skipping 132 matching lines @@
   if (root_id_.is_null()) {
     root_id_ = surface_id_allocator_->GenerateId();
     surface_factory_->Create(root_id_);
     display_->SetSurfaceId(root_id_, 1.f);
   }
   surface_factory_->SubmitCompositorFrame(root_id_, std::move(frame),
                                           cc::SurfaceFactory::DrawCallback());
 
   display_->Resize(viewport);
 
-  if (!output_surface_) {
-    scoped_refptr<cc::ContextProvider> context_provider =
-        AwRenderThreadContextProvider::Create(
-            gl_surface_, DeferredGpuCommandService::GetInstance());
-    std::unique_ptr<ParentOutputSurface> output_surface_holder(
-        new ParentOutputSurface(context_provider));
-    output_surface_ = output_surface_holder.get();
-    display_->Initialize(std::move(output_surface_holder), nullptr);
-  }
   output_surface_->SetGLState(gl_state);
   display_->SetExternalClip(clip);
   display_->DrawAndSwap();
 }
 
 void HardwareRenderer::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   ReturnResourcesToCompositor(resources, compositor_id_,
                               last_submitted_output_surface_id_);
 }
@@ skipping 28 matching lines @@
     const cc::ReturnedResourceArray& resources,
     uint32_t 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