Bug 1484624 - Don't create texture sources if the compositor doesn't have a GL context. r=sotaro

Author: nical

gfx/layers/opengl/CompositorOGL.cpp

@@ -1904,12 +1904,20 @@ CompositorOGL::Resume()
 already_AddRefed<DataTextureSource>
 CompositorOGL::CreateDataTextureSource(TextureFlags aFlags)
 {
+  if (!gl()) {
+    return nullptr;
+  }
+
   return MakeAndAddRef<TextureImageTextureSourceOGL>(this, aFlags);
 }
 
 already_AddRefed<DataTextureSource>
 CompositorOGL::CreateDataTextureSourceAroundYCbCr(TextureHost* aTexture)
 {
+  if (!gl()) {
+    return nullptr;
+  }
+
   BufferTextureHost* bufferTexture = aTexture->AsBufferTextureHost();
   MOZ_ASSERT(bufferTexture);
 
@@ -1991,6 +1999,10 @@ CompositorOGL::TryUnlockTextures()
 already_AddRefed<DataTextureSource>
 CompositorOGL::CreateDataTextureSourceAround(gfx::DataSourceSurface* aSurface)
 {
+  if (!gl()) {
+    return nullptr;
+  }
+
   return MakeAndAddRef<DirectMapTextureSource>(this, aSurface);
 }
 

gfx/layers/opengl/TextureHostOGL.cpp

@@ -340,7 +340,14 @@ DirectMapTextureSource::Update(gfx::DataSourceSurface* aSurface,
 bool
 DirectMapTextureSource::Sync(bool aBlocking)
 {
-  gl()->MakeCurrent();
+  if (!gl() || !gl()->MakeCurrent()) {
+    // We use this function to decide whether we can unlock the texture
+    // and clean it up. If we return false here and for whatever reason
+    // the context is absent or invalid, the compositor will keep a
+    // reference to this texture forever.
+    return true;
+  }
+
   if (!gl()->IsDestroyed()) {
     if (aBlocking) {
       gl()->fFinishObjectAPPLE(LOCAL_GL_TEXTURE, mTextureHandle);
@@ -357,7 +364,9 @@ DirectMapTextureSource::UpdateInternal(gfx::DataSourceSurface* aSurface,
                                        gfx::IntPoint* aSrcOffset,
                                        bool aInit)
 {
-  gl()->MakeCurrent();
+  if (!gl() || !gl()->MakeCurrent()) {
+    return false;
+  }
 
   if (aInit) {
     gl()->fGenTextures(1, &mTextureHandle);