From d603768670c30f0191a453d618ca5dc9b41bd837 Mon Sep 17 00:00:00 2001 From: Markus Stange Date: Mon, 9 Sep 2019 03:59:15 +0000 Subject: [PATCH] Bug 1578330 - Call GetBufferSize after BeginFrame because RenderCompositorANGLE mutates it in BeginFrame. r=mattwoodrow Differential Revision: https://phabricator.services.mozilla.com/D45143 --HG-- extra : moz-landing-system : lando --- gfx/webrender_bindings/RendererOGL.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/webrender_bindings/RendererOGL.cpp b/gfx/webrender_bindings/RendererOGL.cpp index 36768fb371e9..c6f77bdbe81a 100644 --- a/gfx/webrender_bindings/RendererOGL.cpp +++ b/gfx/webrender_bindings/RendererOGL.cpp @@ -120,10 +120,8 @@ bool RendererOGL::UpdateAndRender(const Maybe& aReadbackSize, } // XXX set clear color if MOZ_WIDGET_ANDROID is defined. - auto size = mCompositor->GetBufferSize(); - if (mNativeLayerForEntireWindow) { - gfx::IntRect bounds(gfx::IntPoint(0, 0), size.ToUnknownSize()); + gfx::IntRect bounds({}, mCompositor->GetBufferSize().ToUnknownSize()); mNativeLayerForEntireWindow->SetRect(bounds); #ifdef XP_MACOSX mNativeLayerForEntireWindow->SetOpaqueRegion( @@ -141,6 +139,8 @@ bool RendererOGL::UpdateAndRender(const Maybe& aReadbackSize, wr_renderer_update(mRenderer); + auto size = mCompositor->GetBufferSize(); + if (!wr_renderer_render(mRenderer, size.width, size.height, aHadSlowFrame, aOutStats)) { RenderThread::Get()->HandleWebRenderError(WebRenderError::RENDER);