From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/ozone/demo/gl_renderer.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'chromium/ui/ozone/demo/gl_renderer.cc') 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 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, -- cgit v1.2.1