Bug 1079250 - SharedDataGonkOGL::DeleteTextureIfPresent to assert mCompositor rather than gl(). r=sotaro, a=lmandel
authorNicolas Silva <nsilva@mozilla.com>
Thu, 09 Oct 2014 16:00:17 +0200
changeset 225643 f188a7933665edb415fa55b768955abcea45233c
parent 225642 22c66a80bcc70085e5560f35ffef71c2b575da4c
child 225644 e72ab51bff1a43d2cffcbf366ef972812259ecbc
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssotaro, lmandel
bugs1079250
milestone34.0a2
Bug 1079250 - SharedDataGonkOGL::DeleteTextureIfPresent to assert mCompositor rather than gl(). r=sotaro, a=lmandel
gfx/layers/opengl/TextureHostOGL.cpp
--- a/gfx/layers/opengl/TextureHostOGL.cpp
+++ b/gfx/layers/opengl/TextureHostOGL.cpp
@@ -146,17 +146,17 @@ GLuint CompositableDataGonkOGL::GetTextu
   }
   return mTexture;
 }
 
 void
 CompositableDataGonkOGL::DeleteTextureIfPresent()
 {
   if (mTexture) {
-    MOZ_ASSERT(gl());
+    MOZ_ASSERT(mCompositor);
     if (gl() && gl()->MakeCurrent()) {
       gl()->fDeleteTextures(1, &mTexture);
     }
     mTexture = 0;
     mBoundEGLImage = EGL_NO_IMAGE;
   }
 }