Bug 665070 - part 4: rename mSynthesizedGLError to mWebGLError - r=jrmuizel

content/canvas/src/WebGLContext.cpp

@@ -226,7 +226,7 @@ WebGLContext::WebGLContext()
     mOptionsFrozen = PR_FALSE;
 
     mActiveTexture = 0;
-    mSynthesizedGLError = LOCAL_GL_NO_ERROR;
+    mWebGLError = LOCAL_GL_NO_ERROR;
     mPixelStoreFlipY = PR_FALSE;
     mPixelStorePremultiplyAlpha = PR_FALSE;
     mPixelStoreColorspaceConversion = BROWSER_DEFAULT_WEBGL;

content/canvas/src/WebGLContext.h

@@ -427,7 +427,7 @@ protected:
     PRPackedBool mOptionsFrozen;
 
     WebGLuint mActiveTexture;
-    WebGLenum mSynthesizedGLError;
+    WebGLenum mWebGLError;
 
     // whether shader validation is supported
     PRBool mShaderValidation;

content/canvas/src/WebGLContextGL.cpp

@@ -2230,11 +2230,11 @@ WebGLContext::GetError(WebGLenum *_retval)
     // real GL error.
     WebGLenum err = gl->GetAndClearError();
 
-    // mSynthesizedGLError has the first error that occurred,
+    // mWebGLError has the first error that occurred,
     // whether synthesized or real; if it's not NO_ERROR, use it.
-    if (mSynthesizedGLError != LOCAL_GL_NO_ERROR) {
-        err = mSynthesizedGLError;
-        mSynthesizedGLError = LOCAL_GL_NO_ERROR;
+    if (mWebGLError != LOCAL_GL_NO_ERROR) {
+        err = mWebGLError;
+        mWebGLError = LOCAL_GL_NO_ERROR;
     }
 
     *_retval = err;

content/canvas/src/WebGLContextUtils.cpp

@@ -125,13 +125,13 @@ WebGLContext::SynthesizeGLError(WebGLenum err)
     // that may have occurred before this one and use that code
     // instead.
 
-    if (mSynthesizedGLError == LOCAL_GL_NO_ERROR) {
+    if (mWebGLError == LOCAL_GL_NO_ERROR) {
         MakeContextCurrent();
 
-        mSynthesizedGLError = gl->fGetError();
+        mWebGLError = gl->fGetError();
 
-        if (mSynthesizedGLError == LOCAL_GL_NO_ERROR)
-            mSynthesizedGLError = err;
+        if (mWebGLError == LOCAL_GL_NO_ERROR)
+            mWebGLError = err;
     }
 
     return NS_OK;

content/canvas/src/WebGLContextValidate.cpp

@@ -476,7 +476,7 @@ WebGLContext::InitAndValidateGL()
     }
 
     mActiveTexture = 0;
-    mSynthesizedGLError = LOCAL_GL_NO_ERROR;
+    mWebGLError = LOCAL_GL_NO_ERROR;
 
     mAttribBuffers.Clear();