diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-12 09:13:00 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-16 09:58:26 +0000 |
commit | 03561cae90f1d99b5c54b1ef3be69f10e882b25e (patch) | |
tree | cc5f0958e823c044e7ae51cc0117fe51432abe5e /chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc | |
parent | fa98118a45f7e169f8846086dc2c22c49a8ba310 (diff) |
BASELINE: Update Chromium to 88.0.4324.208
Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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 | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc b/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc index 108efa6939a..d6fbf463ba1 100644 --- a/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc +++ b/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc @@ -187,8 +187,16 @@ TEST_P(LayerTreeHostCopyRequestTestMultipleRequests, Test) { // which causes callbacks for sync queries to be sent in reverse order. class LayerTreeHostCopyRequestTestMultipleRequestsOutOfOrder : public LayerTreeHostCopyRequestTestMultipleRequests { + std::unique_ptr<viz::DisplayCompositorMemoryAndTaskController> + CreateDisplayControllerOnThread() override { + // In this implementation, none of the output surface has a real gpu thread, + // and there is no overlay support. + return nullptr; + } + std::unique_ptr<viz::SkiaOutputSurface> - CreateDisplaySkiaOutputSurfaceOnThread() override { + CreateDisplaySkiaOutputSurfaceOnThread( + viz::DisplayCompositorMemoryAndTaskController*) override { auto skia_output_surface = viz::FakeSkiaOutputSurface::Create3d(); skia_output_surface->SetOutOfOrderCallbacks(true); return skia_output_surface; @@ -824,8 +832,15 @@ TEST_P(LayerTreeHostTestAsyncTwoReadbacksWithoutDraw, Test) { class LayerTreeHostCopyRequestTestDeleteSharedImage : public LayerTreeHostCopyRequestTest { protected: + std::unique_ptr<viz::DisplayCompositorMemoryAndTaskController> + CreateDisplayControllerOnThread() override { + // In this implementation, none of the output surface has a real gpu thread, + // and there is no overlay support. + return nullptr; + } std::unique_ptr<viz::SkiaOutputSurface> - CreateDisplaySkiaOutputSurfaceOnThread() override { + CreateDisplaySkiaOutputSurfaceOnThread( + viz::DisplayCompositorMemoryAndTaskController*) override { display_context_provider_ = viz::TestContextProvider::Create(); display_context_provider_->BindToCurrentThread(); return viz::FakeSkiaOutputSurface::Create3d(display_context_provider_); @@ -967,8 +982,15 @@ TEST_P(LayerTreeHostCopyRequestTestDeleteSharedImage, Test) { class LayerTreeHostCopyRequestTestCountSharedImages : public LayerTreeHostCopyRequestTest { protected: + std::unique_ptr<viz::DisplayCompositorMemoryAndTaskController> + CreateDisplayControllerOnThread() override { + // In this implementation, none of the output surface has a real gpu thread, + // and there is no overlay support. + return nullptr; + } std::unique_ptr<viz::SkiaOutputSurface> - CreateDisplaySkiaOutputSurfaceOnThread() override { + CreateDisplaySkiaOutputSurfaceOnThread( + viz::DisplayCompositorMemoryAndTaskController*) override { display_context_provider_ = viz::TestContextProvider::Create(); display_context_provider_->BindToCurrentThread(); return viz::FakeSkiaOutputSurface::Create3d(display_context_provider_); |