Bug 1033098 - Wallpaper over the intermittent crash. r=nsilva, a=bajaj
authorMilan Sreckovic <milan@mozilla.com>
Wed, 03 Sep 2014 15:11:55 -0400
changeset 224677 f097e5b681ac8667ea1878d092d6fa04e9163e1f
parent 224676 d448400b0a68d460ad6e92272c37a0c6ca466825
child 224678 9d4b52f662422ac789ba28e3c750b28aee5fc27c
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)
reviewersnsilva, bajaj
bugs1033098
milestone34.0a2
Bug 1033098 - Wallpaper over the intermittent crash. r=nsilva, a=bajaj
gfx/gl/GLBlitTextureImageHelper.cpp
--- a/gfx/gl/GLBlitTextureImageHelper.cpp
+++ b/gfx/gl/GLBlitTextureImageHelper.cpp
@@ -33,17 +33,17 @@ GLBlitTextureImageHelper::~GLBlitTexture
 
 void
 GLBlitTextureImageHelper::BlitTextureImage(TextureImage *aSrc, const nsIntRect& aSrcRect,
                                            TextureImage *aDst, const nsIntRect& aDstRect)
 {
     NS_ASSERTION(!aSrc->InUpdate(), "Source texture is in update!");
     NS_ASSERTION(!aDst->InUpdate(), "Destination texture is in update!");
 
-    if (aSrcRect.IsEmpty() || aDstRect.IsEmpty())
+    if (!aSrc || !aDst || aSrcRect.IsEmpty() || aDstRect.IsEmpty())
         return;
 
     int savedFb = 0;
     mGL->fGetIntegerv(LOCAL_GL_FRAMEBUFFER_BINDING, &savedFb);
 
     ScopedGLState scopedScissorTestState(mGL, LOCAL_GL_SCISSOR_TEST, false);
     ScopedGLState scopedBlendState(mGL, LOCAL_GL_BLEND, false);