Delete OnscreenDisplayClient and TopLevelDisplayClient.

cc/test/pixel_test_delegating_output_surface.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 "cc/test/pixel_test_delegating_output_surface.h"
 
 #include <stdint.h>
 #include <memory>
 #include <utility>
 
@@ skipping 14 matching lines @@
 PixelTestDelegatingOutputSurface::PixelTestDelegatingOutputSurface(
     scoped_refptr<ContextProvider> compositor_context_provider,
     scoped_refptr<ContextProvider> worker_context_provider,
     SharedBitmapManager* shared_bitmap_manager,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     bool allow_force_reclaim_resources,
     bool synchronous_composite)
     : OutputSurface(std::move(compositor_context_provider),
                     std::move(worker_context_provider),
                     nullptr),
+      shared_bitmap_manager_(shared_bitmap_manager),
+      gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
       allow_force_reclaim_resources_(allow_force_reclaim_resources),
       synchronous_composite_(synchronous_composite),
       surface_manager_(new SurfaceManager),
       surface_id_allocator_(
           new SurfaceIdAllocator(kCompositorSurfaceNamespace)),
       surface_factory_(new SurfaceFactory(surface_manager_.get(), this)),
-      display_(new Display(&display_client_,
-                           surface_manager_.get(),
-                           shared_bitmap_manager,
-                           gpu_memory_buffer_manager,
-                           RendererSettings(),
-                           surface_id_allocator_->id_namespace())),
       weak_ptrs_(this) {
   capabilities_.delegated_rendering = true;
   capabilities_.can_force_reclaim_resources = allow_force_reclaim_resources_;
 
   surface_id_allocator_->RegisterSurfaceIdNamespace(surface_manager_.get());
 }
 
 PixelTestDelegatingOutputSurface::~PixelTestDelegatingOutputSurface() {}
 
 bool PixelTestDelegatingOutputSurface::BindToClient(
@@ skipping 21 matching lines @@
         new TestInProcessContextProvider(nullptr));
     bool flipped_output_surface = false;
     output_surface = base::MakeUnique<PixelTestOutputSurface>(
         std::move(context), nullptr, flipped_output_surface, nullptr);
   }
   output_surface->set_surface_expansion_size(surface_expansion_size);
 
   auto* task_runner = base::ThreadTaskRunnerHandle::Get().get();
   CHECK(task_runner);
 
+  display_.reset(new Display(surface_manager_.get(), shared_bitmap_manager_,
+                             gpu_memory_buffer_manager_, RendererSettings(),
+                             surface_id_allocator_->id_namespace(), task_runner,
+                             std::move(output_surface)));
+  display_->SetEnlargePassTextureAmountForTesting(enlarge_pass_texture_amount_);
+
   if (synchronous_composite_) {
-    bool init =
-        display_->InitializeSynchronous(std::move(output_surface), task_runner);
+    bool init = display_->InitializeSynchronous(&display_client_);
     CHECK(init);
   } else {
     begin_frame_source_.reset(new BackToBackBeginFrameSource(task_runner));
     display_->SetBeginFrameSource(begin_frame_source_.get());
 
-    bool init = display_->Initialize(std::move(output_surface), task_runner);
+    bool init = display_->Initialize(&display_client_);
     CHECK(init);
   }
 
   return true;
 }
 
 void PixelTestDelegatingOutputSurface::DetachFromClient() {
   if (!delegated_surface_id_.is_null())
     surface_factory_->Destroy(delegated_surface_id_);
   surface_manager_->UnregisterSurfaceFactoryClient(
@@ skipping 25 matching lines @@
   frame->AssignTo(my_frame.get());
   surface_factory_->SubmitCompositorFrame(
       delegated_surface_id_, std::move(my_frame),
       base::Bind(&PixelTestDelegatingOutputSurface::DrawCallback,
                  weak_ptrs_.GetWeakPtr()));
 
   if (synchronous_composite_)
     display_->DrawAndSwap();
 }
 
+void PixelTestDelegatingOutputSurface::SetEnlargePassTextureAmount(
+    const gfx::Size& amount) {
+  DCHECK(!HasClient());
+  enlarge_pass_texture_amount_ = amount;
+}
+
 void PixelTestDelegatingOutputSurface::DrawCallback(SurfaceDrawStatus) {
   client_->DidSwapBuffersComplete();
 }
 
 void PixelTestDelegatingOutputSurface::ForceReclaimResources() {
   if (allow_force_reclaim_resources_ && !delegated_surface_id_.is_null()) {
     surface_factory_->SubmitCompositorFrame(delegated_surface_id_, nullptr,
                                             SurfaceFactory::DrawCallback());
   }
 }
 
 void PixelTestDelegatingOutputSurface::ReturnResources(
     const ReturnedResourceArray& resources) {
   CompositorFrameAck ack;
   ack.resources = resources;
   client_->ReclaimResources(&ack);
 }
 
 void PixelTestDelegatingOutputSurface::SetBeginFrameSource(
     BeginFrameSource* begin_frame_source) {
   client_->SetBeginFrameSource(begin_frame_source);
 }
 
-void PixelTestDelegatingOutputSurface::SetEnlargePassTextureAmount(
-    const gfx::Size& amount) {
-  display_->SetEnlargePassTextureAmountForTesting(amount);
-}
-
 }  // namespace cc