Fork cc::OutputSurface into cc::CompositorFrameSink.

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositorTest.cpp

 // 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 "platform/graphics/compositing/PaintArtifactCompositor.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/layers/layer.h"
-#include "cc/test/fake_output_surface.h"
+#include "cc/test/fake_compositor_frame_sink.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/trees/clip_node.h"
 #include "cc/trees/effect_node.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/transform_node.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/paint/EffectPaintPropertyNode.h"
 #include "platform/graphics/paint/PaintArtifact.h"
 #include "platform/testing/PictureMatchers.h"
 #include "platform/testing/TestPaintArtifact.h"
@@ skipping 13 matching lines @@
     transform.Translate(x, y);
     return transform;
 }
 
 EffectPaintPropertyNode* dummyRootEffect()
 {
     DEFINE_STATIC_REF(EffectPaintPropertyNode, node, EffectPaintPropertyNode::create(nullptr, 1.0));
     return node;
 }
 
-class WebLayerTreeViewWithOutputSurface : public WebLayerTreeViewImplForTesting {
+class WebLayerTreeViewWithCompositorFrameSink : public WebLayerTreeViewImplForTesting {
 public:
-    WebLayerTreeViewWithOutputSurface(const cc::LayerTreeSettings& settings)
-        : WebLayerTreeViewImplForTesting(settings) {}
+    WebLayerTreeViewWithCompositorFrameSink(const cc::LayerTreeSettings& settings)
+        : WebLayerTreeViewImplForTesting(settings)
+    {
+    }
 
     // cc::LayerTreeHostClient
-    void RequestNewOutputSurface() override
+    void RequestNewCompositorFrameSink() override
     {
-        layerTreeHost()->SetOutputSurface(cc::FakeOutputSurface::CreateDelegating3d());
+        layerTreeHost()->SetCompositorFrameSink(cc::FakeCompositorFrameSink::Create3d());
     }
 };
 
 class PaintArtifactCompositorTestWithPropertyTrees : public ::testing::Test {
 protected:
     PaintArtifactCompositorTestWithPropertyTrees()
         : m_taskRunner(new base::TestSimpleTaskRunner)
         , m_taskRunnerHandle(m_taskRunner)
     {
     }
 
     void SetUp() override
     {
         RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true);
 
         // Delay constructing the compositor until after the feature is set.
         m_paintArtifactCompositor = wrapUnique(new PaintArtifactCompositor);
         m_paintArtifactCompositor->enableExtraDataForTesting();
 
         cc::LayerTreeSettings settings = WebLayerTreeViewImplForTesting::defaultLayerTreeSettings();
         settings.single_thread_proxy_scheduler = false;
         settings.use_layer_lists = true;
-        m_webLayerTreeView = wrapUnique(new WebLayerTreeViewWithOutputSurface(settings));
+        m_webLayerTreeView = wrapUnique(new WebLayerTreeViewWithCompositorFrameSink(settings));
         m_webLayerTreeView->setRootLayer(*m_paintArtifactCompositor->getWebLayer());
     }
 
     void TearDown() override
     {
         m_featuresBackup.restore();
     }
 
     const cc::PropertyTrees& propertyTrees()
     {
@@ skipping 21 matching lines @@
     cc::Layer* contentLayerAt(unsigned index)
     {
         return m_paintArtifactCompositor->getExtraDataForTesting()->contentLayers[index].get();
     }
 
 private:
     RuntimeEnabledFeatures::Backup m_featuresBackup;
     std::unique_ptr<PaintArtifactCompositor> m_paintArtifactCompositor;
     scoped_refptr<base::TestSimpleTaskRunner> m_taskRunner;
     base::ThreadTaskRunnerHandle m_taskRunnerHandle;
-    std::unique_ptr<WebLayerTreeViewWithOutputSurface> m_webLayerTreeView;
+    std::unique_ptr<WebLayerTreeViewWithCompositorFrameSink> m_webLayerTreeView;
 };
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, EmptyPaintArtifact)
 {
     PaintArtifact emptyArtifact;
     update(emptyArtifact);
     EXPECT_TRUE(rootLayer()->children().empty());
 }
 
 TEST_F(PaintArtifactCompositorTestWithPropertyTrees, OneChunkWithAnOffset)
@@ skipping 404 matching lines @@
     EXPECT_EQ(convertedDummyRootEffect.id, convertedEffect3.parent_id);
     EXPECT_FLOAT_EQ(0.2, convertedEffect3.opacity);
 
     EXPECT_EQ(convertedEffect2.id, contentLayerAt(0)->effect_tree_index());
     EXPECT_EQ(convertedEffect1.id, contentLayerAt(1)->effect_tree_index());
     EXPECT_EQ(convertedEffect3.id, contentLayerAt(2)->effect_tree_index());
 }
 
 } // namespace
 } // namespace blink