Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/layers/layer_list_iterator_unittest.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/layers/layer_list_iterator.h"
 
 #include <memory>
 
 #include "base/containers/adapters.h"
+#include "cc/test/fake_compositor_frame_sink.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
-#include "cc/test/fake_output_surface.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 // Layer version unit tests
 
@@ skipping 169 matching lines @@
   EXPECT_EQ(it, end);
 }
 
 // LayerImpl version unit tests
 
 TEST(LayerListIteratorTest, VerifyTraversalOrderImpl) {
   // Unfortunate preamble.
   FakeImplTaskRunnerProvider task_runner_provider;
   TestSharedBitmapManager shared_bitmap_manager;
   TestTaskGraphRunner task_graph_runner;
-  std::unique_ptr<OutputSurface> output_surface =
-      FakeOutputSurface::CreateDelegating3d();
+  std::unique_ptr<CompositorFrameSink> compositor_frame_sink =
+      FakeCompositorFrameSink::Create3d();
   FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
                                   &task_graph_runner);
   host_impl.SetVisible(true);
-  EXPECT_TRUE(host_impl.InitializeRenderer(output_surface.get()));
+  EXPECT_TRUE(host_impl.InitializeRenderer(compositor_frame_sink.get()));
 
   // This test constructs the following tree.
   // 1
   // +-2
   // | +-3
   // | +-4
   // + 5
   //   +-6
   //   +-7
   // We expect to visit all seven layers in that order.
@@ skipping 29 matching lines @@
     EXPECT_EQ(i++, layer->id());
   }
   EXPECT_EQ(8, i);
 }
 
 TEST(LayerListIteratorTest, VerifySingleLayerImpl) {
   // Unfortunate preamble.
   FakeImplTaskRunnerProvider task_runner_provider;
   TestSharedBitmapManager shared_bitmap_manager;
   TestTaskGraphRunner task_graph_runner;
-  std::unique_ptr<OutputSurface> output_surface =
-      FakeOutputSurface::CreateDelegating3d();
+  std::unique_ptr<CompositorFrameSink> compositor_frame_sink =
+      FakeCompositorFrameSink::Create3d();
   FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
                                   &task_graph_runner);
   host_impl.SetVisible(true);
-  EXPECT_TRUE(host_impl.InitializeRenderer(output_surface.get()));
+  EXPECT_TRUE(host_impl.InitializeRenderer(compositor_frame_sink.get()));
 
   // This test constructs a tree consisting of a single layer.
   std::unique_ptr<LayerImpl> layer1 =
       LayerImpl::Create(host_impl.active_tree(), 1);
   host_impl.active_tree()->SetRootLayerForTesting(std::move(layer1));
   host_impl.active_tree()->BuildLayerListForTesting();
 
   int i = 1;
   for (auto* layer : *host_impl.active_tree()) {
     EXPECT_EQ(i++, layer->id());
@@ skipping 11 matching lines @@
   EXPECT_EQ(it, end);
   ++it;
   EXPECT_EQ(it, end);
 }
 
 TEST(LayerListReverseIteratorTest, VerifyTraversalOrderImpl) {
   // Unfortunate preamble.
   FakeImplTaskRunnerProvider task_runner_provider;
   TestSharedBitmapManager shared_bitmap_manager;
   TestTaskGraphRunner task_graph_runner;
-  std::unique_ptr<OutputSurface> output_surface =
-      FakeOutputSurface::CreateDelegating3d();
+  std::unique_ptr<CompositorFrameSink> compositor_frame_sink =
+      FakeCompositorFrameSink::Create3d();
   FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
                                   &task_graph_runner);
   host_impl.SetVisible(true);
-  EXPECT_TRUE(host_impl.InitializeRenderer(output_surface.get()));
+  EXPECT_TRUE(host_impl.InitializeRenderer(compositor_frame_sink.get()));
 
   // This test constructs the following tree.
   // 1
   // +-2
   // | +-3
   // | +-4
   // + 5
   //   +-6
   //   +-7
   // We expect to visit all seven layers in reverse order.
@@ skipping 31 matching lines @@
   }
 
   EXPECT_EQ(0, i);
 }
 
 TEST(LayerListReverseIteratorTest, VerifySingleLayerImpl) {
   // Unfortunate preamble.
   FakeImplTaskRunnerProvider task_runner_provider;
   TestSharedBitmapManager shared_bitmap_manager;
   TestTaskGraphRunner task_graph_runner;
-  std::unique_ptr<OutputSurface> output_surface =
-      FakeOutputSurface::CreateDelegating3d();
+  std::unique_ptr<CompositorFrameSink> compositor_frame_sink =
+      FakeCompositorFrameSink::Create3d();
   FakeLayerTreeHostImpl host_impl(&task_runner_provider, &shared_bitmap_manager,
                                   &task_graph_runner);
   host_impl.SetVisible(true);
-  EXPECT_TRUE(host_impl.InitializeRenderer(output_surface.get()));
+  EXPECT_TRUE(host_impl.InitializeRenderer(compositor_frame_sink.get()));
 
   // This test constructs a tree consisting of a single layer.
   std::unique_ptr<LayerImpl> layer1 =
       LayerImpl::Create(host_impl.active_tree(), 1);
   host_impl.active_tree()->SetRootLayerForTesting(std::move(layer1));
   host_impl.active_tree()->BuildLayerListForTesting();
 
   int i = 1;
   for (auto* layer : base::Reversed(*host_impl.active_tree())) {
     EXPECT_EQ(i--, layer->id());
   }
   EXPECT_EQ(0, i);
 }
 
 TEST(LayerListReverseIteratorTest, VerifyNullFirstLayerImpl) {
   // Ensures that if an iterator is constructed with a nullptr, that it can be
   // iterated without issue and that it remains equal to any other
   // null-initialized iterator.
   LayerListReverseIterator<LayerImpl> it(nullptr);
   LayerListReverseIterator<LayerImpl> end(nullptr);
 
   EXPECT_EQ(it, end);
   ++it;
   EXPECT_EQ(it, end);
 }
 
 }  // namespace
 }  // namespace cc