From ba71cc45fef6dfaecef8f5edf65ce1f1ff457624 Mon Sep 17 00:00:00 2001 From: Nicolas Silva Date: Mon, 12 Mar 2018 13:36:00 +0100 Subject: Bug 1440717 - Use RefPtr for CompositingRenderTargetOGL::mGL. r=Bas, a=ritu --HG-- extra : source : b6d2d55223d2aa5cb85bbdf33075d1d38f2a9a30 extra : intermediate-source : 0ec90964e0bc479412a4da8a61d48b665211736e --- gfx/layers/opengl/CompositingRenderTargetOGL.cpp | 2 +- gfx/layers/opengl/CompositingRenderTargetOGL.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gfx/layers/opengl') diff --git a/gfx/layers/opengl/CompositingRenderTargetOGL.cpp b/gfx/layers/opengl/CompositingRenderTargetOGL.cpp index c05b8edfd..a1521c56d 100644 --- a/gfx/layers/opengl/CompositingRenderTargetOGL.cpp +++ b/gfx/layers/opengl/CompositingRenderTargetOGL.cpp @@ -60,7 +60,7 @@ CompositingRenderTargetOGL::BindRenderTarget() msg.AppendPrintf("Framebuffer not complete -- CheckFramebufferStatus returned 0x%x, " "GLContext=%p, IsOffscreen()=%d, mFBO=%d, aFBOTextureTarget=0x%x, " "aRect.width=%d, aRect.height=%d", - result, mGL, mGL->IsOffscreen(), mFBO, mInitParams.mFBOTextureTarget, + result, mGL.get(), mGL->IsOffscreen(), mFBO, mInitParams.mFBOTextureTarget, mInitParams.mSize.width, mInitParams.mSize.height); NS_WARNING(msg.get()); } diff --git a/gfx/layers/opengl/CompositingRenderTargetOGL.h b/gfx/layers/opengl/CompositingRenderTargetOGL.h index 501701d6f..071dc5cac 100644 --- a/gfx/layers/opengl/CompositingRenderTargetOGL.h +++ b/gfx/layers/opengl/CompositingRenderTargetOGL.h @@ -184,7 +184,7 @@ private: * the target is always cleared at the end of a frame. */ RefPtr mCompositor; - GLContext* mGL; + RefPtr mGL; GLuint mTextureHandle; GLuint mFBO; }; -- cgit v1.2.3 From e7189e33f533f9b974b22c2110b522a13bc4c7f6 Mon Sep 17 00:00:00 2001 From: Andrew Osmond Date: Tue, 10 Apr 2018 09:40:02 -0400 Subject: Bug 1388020. r=nical, a=RyanVM --- gfx/layers/opengl/TextureHostOGL.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gfx/layers/opengl') diff --git a/gfx/layers/opengl/TextureHostOGL.cpp b/gfx/layers/opengl/TextureHostOGL.cpp index 02c398b51..ec6ba9131 100644 --- a/gfx/layers/opengl/TextureHostOGL.cpp +++ b/gfx/layers/opengl/TextureHostOGL.cpp @@ -161,9 +161,7 @@ TextureImageTextureSourceOGL::Update(gfx::DataSourceSurface* aSurface, } } - mTexImage->UpdateFromDataSource(aSurface, aDestRegion, aSrcOffset); - - return true; + return mTexImage->UpdateFromDataSource(aSurface, aDestRegion, aSrcOffset); } void -- cgit v1.2.3