Backed out changeset d5cd910dda69 (bug 1033098) for OSX assertions.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 03 Sep 2014 14:18:24 -0400
changeset 203416 a2bdb4249448077674cdc3bb022d43e9ed1f19d1
parent 203415 4b56ee08673cbfc7f6ad88c5b73d19395b74d842
child 203417 acbdce59da2fda8c1dce44802cfae8dd4147aabf
child 203449 bcd68e6935bae0df0b2dc762685f101c716c1a3d
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)
bugs1033098
milestone35.0a1
backs outd5cd910dda69067e1376da708e73d754a3a8f383
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
Backed out changeset d5cd910dda69 (bug 1033098) for OSX assertions.
gfx/gl/GLBlitTextureImageHelper.cpp
--- a/gfx/gl/GLBlitTextureImageHelper.cpp
+++ b/gfx/gl/GLBlitTextureImageHelper.cpp
@@ -32,20 +32,18 @@ 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 (!aSrc || !aDst || aSrcRect.IsEmpty() || aDstRect.IsEmpty())
+    if (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);