Bug 1033098 - Wallpaper over the intermittent crash. r=nsilva
☠☠ backed out by a2bdb4249448 ☠ ☠
authorMilan Sreckovic <milan@mozilla.com>
Tue, 02 Sep 2014 10:19:52 -0400
changeset 203402 d5cd910dda69067e1376da708e73d754a3a8f383
parent 203401 ec86e0c16a8ed9d8ae1964df2fb4e0319a723f00
child 203403 2d687e266e656206c2cae6645c2e76d9e163d81d
push id27425
push userryanvm@gmail.com
push dateWed, 03 Sep 2014 20:38:59 +0000
treeherdermozilla-central@acbdce59da2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnsilva
bugs1033098
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1033098 - Wallpaper over the intermittent crash. r=nsilva
gfx/gl/GLBlitTextureImageHelper.cpp
--- a/gfx/gl/GLBlitTextureImageHelper.cpp
+++ b/gfx/gl/GLBlitTextureImageHelper.cpp
@@ -32,18 +32,20 @@ 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!");
+    NS_ASSERTION(!aSrc, "Source image is null");
+    NS_ASSERTION(!aDst, "Destination image is null");
 
-    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);