Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/test/test_layer_tree_host_base.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/test_layer_tree_host_base.h"
 
-#include "cc/test/fake_output_surface.h"
+#include "cc/test/fake_compositor_frame_sink.h"
 #include "cc/test/fake_raster_source.h"
 #include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
 
 TestLayerTreeHostBase::TestLayerTreeHostBase()
     : task_runner_provider_(base::ThreadTaskRunnerHandle::Get()),
       pending_layer_(nullptr),
       active_layer_(nullptr),
       old_pending_layer_(nullptr),
       root_id_(6),
       id_(7) {}
 
 TestLayerTreeHostBase::~TestLayerTreeHostBase() = default;
 
 void TestLayerTreeHostBase::SetUp() {
-  output_surface_ = CreateOutputSurface();
+  compositor_frame_sink_ = CreateCompositorFrameSink();
   task_graph_runner_ = CreateTaskGraphRunner();
   host_impl_ = CreateHostImpl(CreateSettings(), &task_runner_provider_,
                               &shared_bitmap_manager_, task_graph_runner_.get(),
                               &gpu_memory_buffer_manager_);
   InitializeRenderer();
   SetInitialTreePriority();
 }
 
 LayerTreeSettings TestLayerTreeHostBase::CreateSettings() {
   LayerTreeSettings settings;
   settings.verify_transform_tree_calculations = true;
   settings.verify_clip_tree_calculations = true;
   return settings;
 }
 
-std::unique_ptr<OutputSurface> TestLayerTreeHostBase::CreateOutputSurface() {
-  return FakeOutputSurface::CreateDelegating3d();
+std::unique_ptr<CompositorFrameSink>
+TestLayerTreeHostBase::CreateCompositorFrameSink() {
+  return FakeCompositorFrameSink::Create3d();
 }
 
 std::unique_ptr<FakeLayerTreeHostImpl> TestLayerTreeHostBase::CreateHostImpl(
     const LayerTreeSettings& settings,
     TaskRunnerProvider* task_runner_provider,
     SharedBitmapManager* shared_bitmap_manager,
     TaskGraphRunner* task_graph_runner,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
   return base::MakeUnique<FakeLayerTreeHostImpl>(
       settings, task_runner_provider, shared_bitmap_manager, task_graph_runner,
       gpu_memory_buffer_manager);
 }
 
 std::unique_ptr<TaskGraphRunner>
 TestLayerTreeHostBase::CreateTaskGraphRunner() {
   return base::WrapUnique(new TestTaskGraphRunner);
 }
 
 void TestLayerTreeHostBase::InitializeRenderer() {
   host_impl_->SetVisible(true);
-  host_impl_->InitializeRenderer(output_surface_.get());
+  host_impl_->InitializeRenderer(compositor_frame_sink_.get());
 }
 
-void TestLayerTreeHostBase::ResetOutputSurface(
-    std::unique_ptr<OutputSurface> output_surface) {
-  host_impl()->DidLoseOutputSurface();
+void TestLayerTreeHostBase::ResetCompositorFrameSink(
+    std::unique_ptr<CompositorFrameSink> compositor_frame_sink) {
+  host_impl()->DidLoseCompositorFrameSink();
   host_impl()->SetVisible(true);
-  host_impl()->InitializeRenderer(output_surface.get());
-  output_surface_ = std::move(output_surface);
+  host_impl()->InitializeRenderer(compositor_frame_sink.get());
+  compositor_frame_sink_ = std::move(compositor_frame_sink);
 }
 
 std::unique_ptr<FakeLayerTreeHostImpl> TestLayerTreeHostBase::TakeHostImpl() {
   return std::move(host_impl_);
 }
 
 void TestLayerTreeHostBase::SetupDefaultTrees(const gfx::Size& layer_bounds) {
   scoped_refptr<FakeRasterSource> pending_raster_source =
       FakeRasterSource::CreateFilled(layer_bounds);
   scoped_refptr<FakeRasterSource> active_raster_source =
@@ skipping 94 matching lines @@
   state.hard_memory_limit_in_bytes = state.soft_memory_limit_in_bytes * 2;
   state.memory_limit_policy = ALLOW_ANYTHING;
   state.tree_priority = SAME_PRIORITY_FOR_BOTH_TREES;
 
   host_impl_->resource_pool()->SetResourceUsageLimits(
       state.soft_memory_limit_in_bytes, state.num_resources_limit);
   host_impl_->tile_manager()->SetGlobalStateForTesting(state);
 }
 
 }  // namespace cc