diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-08 10:28:10 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:40:30 +0000 |
commit | e733310db58160074f574c429d48f8308c0afe17 (patch) | |
tree | f8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc | |
parent | 2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff) |
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc')
-rw-r--r-- | chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc b/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc index ef0c1fbbc5a..25fe1ec2f2b 100644 --- a/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc +++ b/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc @@ -129,7 +129,7 @@ class LayerTreeHostCopyRequestTestMultipleRequests void AfterTest() override { EXPECT_EQ(4u, callbacks_.size()); } - std::unique_ptr<OutputSurface> CreateDisplayOutputSurface( + std::unique_ptr<OutputSurface> CreateDisplayOutputSurfaceOnThread( scoped_refptr<ContextProvider> compositor_context_provider) override { if (!use_gl_renderer_) { return FakeOutputSurface::CreateSoftware( @@ -140,6 +140,7 @@ class LayerTreeHostCopyRequestTestMultipleRequests TestContextProvider::Create(); TestContextSupport* context_support = display_context_provider->support(); context_support->set_out_of_order_callbacks(out_of_order_callbacks_); + display_context_provider->BindToCurrentThread(); return FakeOutputSurface::Create3d(std::move(display_context_provider)); } @@ -466,11 +467,11 @@ class LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest std::unique_ptr<TestCompositorFrameSink> CreateCompositorFrameSink( scoped_refptr<ContextProvider> compositor_context_provider, scoped_refptr<ContextProvider> worker_context_provider) override { - auto surface = LayerTreeHostCopyRequestTest::CreateCompositorFrameSink( + auto frame_sink = LayerTreeHostCopyRequestTest::CreateCompositorFrameSink( std::move(compositor_context_provider), std::move(worker_context_provider)); - display_ = surface->display(); - return surface; + frame_sink_ = frame_sink.get(); + return frame_sink; } void BeginTest() override { @@ -507,7 +508,7 @@ class LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest } void DisplayDidDrawAndSwapOnThread() override { - DirectRenderer* renderer = display_->renderer_for_testing(); + DirectRenderer* renderer = frame_sink_->display()->renderer_for_testing(); // |parent| owns a surface, but it was hidden and not part of the copy // request so it should not allocate any resource. @@ -533,7 +534,7 @@ class LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest RenderPassId parent_render_pass_id; RenderPassId copy_layer_render_pass_id; - Display* display_ = nullptr; + TestCompositorFrameSink* frame_sink_ = nullptr; bool did_swap_ = false; FakeContentLayerClient client_; scoped_refptr<FakePictureLayer> root_; @@ -731,9 +732,10 @@ SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestAsyncTwoReadbacksWithoutDraw); class LayerTreeHostCopyRequestTestDeleteTexture : public LayerTreeHostCopyRequestTest { protected: - std::unique_ptr<OutputSurface> CreateDisplayOutputSurface( + std::unique_ptr<OutputSurface> CreateDisplayOutputSurfaceOnThread( scoped_refptr<ContextProvider> compositor_context_provider) override { display_context_provider_ = TestContextProvider::Create(); + display_context_provider_->BindToCurrentThread(); return FakeOutputSurface::Create3d(display_context_provider_); } @@ -789,6 +791,9 @@ class LayerTreeHostCopyRequestTestDeleteTexture // to be destroyed by the compositor, so we should have 1 less by now. EXPECT_EQ(num_textures_after_readback_ - 1, display_context_provider_->TestContext3d()->NumTextures()); + + // Drop the reference to the context provider on the compositor thread. + display_context_provider_ = nullptr; EndTest(); } @@ -847,7 +852,7 @@ class LayerTreeHostCopyRequestTestCountTextures settings->renderer_settings.texture_id_allocation_chunk_size = 1; } - std::unique_ptr<OutputSurface> CreateDisplayOutputSurface( + std::unique_ptr<OutputSurface> CreateDisplayOutputSurfaceOnThread( scoped_refptr<ContextProvider> compositor_context_provider) override { // These tests expect the LayerTreeHostImpl to share a context with // the Display so that sync points are not needed and the texture counts |