diff options
Diffstat (limited to 'chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc')
-rw-r--r-- | chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc | 44 |
1 files changed, 3 insertions, 41 deletions
diff --git a/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc b/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc index ce695f67d4a..992af86c6d0 100644 --- a/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc +++ b/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc @@ -204,26 +204,12 @@ class LayerTreeHostCopyRequestTestMultipleRequestsOutOfOrder return nullptr; } - std::unique_ptr<viz::SkiaOutputSurface> - CreateDisplaySkiaOutputSurfaceOnThread( + std::unique_ptr<viz::SkiaOutputSurface> CreateSkiaOutputSurfaceOnThread( viz::DisplayCompositorMemoryAndTaskController*) override { auto skia_output_surface = viz::FakeSkiaOutputSurface::Create3d(); skia_output_surface->SetOutOfOrderCallbacks(true); return skia_output_surface; } - - std::unique_ptr<viz::OutputSurface> CreateDisplayOutputSurfaceOnThread( - scoped_refptr<viz::ContextProvider> compositor_context_provider) - override { - // Since this test does not override CreateLayerTreeFrameSink, the - // |compositor_context_provider| will be a viz::TestContextProvider. - auto* context_support = static_cast<viz::TestContextSupport*>( - compositor_context_provider->ContextSupport()); - context_support->set_out_of_order_callbacks(true); - - return viz::FakeOutputSurface::Create3d( - std::move(compositor_context_provider)); - } }; INSTANTIATE_TEST_SUITE_P( @@ -888,25 +874,13 @@ class LayerTreeHostCopyRequestTestDeleteSharedImage // and there is no overlay support. return nullptr; } - std::unique_ptr<viz::SkiaOutputSurface> - CreateDisplaySkiaOutputSurfaceOnThread( + std::unique_ptr<viz::SkiaOutputSurface> CreateSkiaOutputSurfaceOnThread( viz::DisplayCompositorMemoryAndTaskController*) override { display_context_provider_ = viz::TestContextProvider::Create(); display_context_provider_->BindToCurrentThread(); return viz::FakeSkiaOutputSurface::Create3d(display_context_provider_); } - std::unique_ptr<viz::OutputSurface> CreateDisplayOutputSurfaceOnThread( - scoped_refptr<viz::ContextProvider> compositor_context_provider) - override { - // Since this test does not override CreateLayerTreeFrameSink, the - // |compositor_context_provider| will be a viz::TestContextProvider. - display_context_provider_ = static_cast<viz::TestContextProvider*>( - compositor_context_provider.get()); - return viz::FakeOutputSurface::Create3d( - std::move(compositor_context_provider)); - } - void SetupTree() override { root_ = FakePictureLayer::Create(&client_); root_->SetBounds(gfx::Size(20, 20)); @@ -1045,25 +1019,13 @@ class LayerTreeHostCopyRequestTestCountSharedImages // and there is no overlay support. return nullptr; } - std::unique_ptr<viz::SkiaOutputSurface> - CreateDisplaySkiaOutputSurfaceOnThread( + std::unique_ptr<viz::SkiaOutputSurface> CreateSkiaOutputSurfaceOnThread( viz::DisplayCompositorMemoryAndTaskController*) override { display_context_provider_ = viz::TestContextProvider::Create(); display_context_provider_->BindToCurrentThread(); return viz::FakeSkiaOutputSurface::Create3d(display_context_provider_); } - std::unique_ptr<viz::OutputSurface> CreateDisplayOutputSurfaceOnThread( - scoped_refptr<viz::ContextProvider> compositor_context_provider) - override { - // Since this test does not override CreateLayerTreeFrameSink, the - // |compositor_context_provider| will be a viz::TestContextProvider. - display_context_provider_ = static_cast<viz::TestContextProvider*>( - compositor_context_provider.get()); - return viz::FakeOutputSurface::Create3d( - std::move(compositor_context_provider)); - } - void SetupTree() override { // The layers in this test have solid color content, so they don't // actually allocate any textures, making counting easier. |