Backout 966b04dba626 (bug 822114) for failing to build on any platform
authorEd Morley <emorley@mozilla.com>
Wed, 19 Dec 2012 01:22:45 +0000
changeset 116477 dc08a7e9993a3d85878295753c1ee065494db8b5
parent 116476 1dfb85987ee0b2536b70623dfb1e18be15dc7eb3
child 116478 b0a563745fb6ebc6c688b1c8a10ab48530491a86
push id19946
push useremorley@mozilla.com
push dateWed, 19 Dec 2012 01:23:31 +0000
treeherdermozilla-inbound@b0a563745fb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs822114
milestone20.0a1
backs out966b04dba626e31576000cdfe027bc618ab7ad54
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
Backout 966b04dba626 (bug 822114) for failing to build on any platform
content/canvas/src/WebGLContextGL.cpp
--- a/content/canvas/src/WebGLContextGL.cpp
+++ b/content/canvas/src/WebGLContextGL.cpp
@@ -1059,26 +1059,25 @@ WebGLContext::DeleteTexture(WebGLTexture
         return;
 
     if (!tex || tex->IsDeleted())
         return;
 
     if (mBoundFramebuffer)
         mBoundFramebuffer->DetachTexture(tex);
 
-    WebGLUint activeTexture = mActiveTexture;
     for (int32_t i = 0; i < mGLMaxTextureUnits; i++) {
         if ((tex->Target() == LOCAL_GL_TEXTURE_2D && mBound2DTextures[i] == tex) ||
             (tex->Target() == LOCAL_GL_TEXTURE_CUBE_MAP && mBoundCubeMapTextures[i] == tex))
         {
             ActiveTexture(LOCAL_GL_TEXTURE0 + i);
             BindTexture(tex->Target(), static_cast<WebGLTexture*>(nullptr));
         }
     }
-    ActiveTexture(LOCAL_GL_TEXTURE0 + activeTexture);
+    ActiveTexture(LOCAL_GL_TEXTURE0 + mActiveTexture);
 
     tex->RequestDelete();
 }
 
 void
 WebGLContext::DeleteProgram(WebGLProgram *prog)
 {
     if (!IsContextStable())