diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/ozone/demo/gl_renderer.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/ozone/demo/gl_renderer.cc')
| -rw-r--r-- | chromium/ui/ozone/demo/gl_renderer.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chromium/ui/ozone/demo/gl_renderer.cc b/chromium/ui/ozone/demo/gl_renderer.cc index c5812189846..c25b8f9c15d 100644 --- a/chromium/ui/ozone/demo/gl_renderer.cc +++ b/chromium/ui/ozone/demo/gl_renderer.cc @@ -46,7 +46,7 @@ bool GlRenderer::Initialize() { gl_surface_->Resize(size_, 1.f, gfx::ColorSpace(), true); // Schedule the initial render. - PostRenderFrameTask(gfx::SwapResult::SWAP_ACK, nullptr); + PostRenderFrameTask(gfx::SwapCompletionResult(gfx::SwapResult::SWAP_ACK)); return true; } @@ -69,16 +69,14 @@ void GlRenderer::RenderFrame() { weak_ptr_factory_.GetWeakPtr())); } else { PostRenderFrameTask( - gl_surface_->SwapBuffers(base::BindOnce( - &GlRenderer::OnPresentation, weak_ptr_factory_.GetWeakPtr())), - nullptr); + gfx::SwapCompletionResult(gl_surface_->SwapBuffers(base::BindOnce( + &GlRenderer::OnPresentation, weak_ptr_factory_.GetWeakPtr())))); } } -void GlRenderer::PostRenderFrameTask(gfx::SwapResult result, - std::unique_ptr<gfx::GpuFence> gpu_fence) { - if (gpu_fence) - gpu_fence->Wait(); +void GlRenderer::PostRenderFrameTask(gfx::SwapCompletionResult result) { + if (result.gpu_fence) + result.gpu_fence->Wait(); base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, |