Bug 606276 - More WebGL message fixes - r=vladimir

content/canvas/src/WebGLContext.cpp

@@ -343,10 +343,10 @@ WebGLContext::SetDimensions(PRInt32 width, PRInt32 height)
     if (forceOSMesa) {
         gl = gl::GLContextProviderOSMesa::CreateOffscreen(gfxIntSize(width, height), format);
         if (!gl || !InitAndValidateGL()) {
-            LogMessage("WebGL: OSMesa forced, but creating context failed -- aborting!");
+            LogMessage("OSMesa forced, but creating context failed -- aborting!");
             return NS_ERROR_FAILURE;
         }
-        LogMessage("WebGL: Using software rendering via OSMesa (THIS WILL BE SLOW)");
+        LogMessage("Using software rendering via OSMesa (THIS WILL BE SLOW)");
     }
 
 #ifdef XP_WIN
@@ -400,7 +400,7 @@ WebGLContext::SetDimensions(PRInt32 width, PRInt32 height)
 #endif
 
     if (!gl) {
-        LogMessage("WebGL: Can't get a usable WebGL context");
+        LogMessage("Can't get a usable WebGL context");
         return NS_ERROR_FAILURE;
     }
 

content/canvas/src/WebGLContext.h

@@ -1003,12 +1003,14 @@ public:
 
             if (!areAllLevel0ImagesDefined) {
                 if (mTarget == LOCAL_GL_TEXTURE_2D) {
-                    mContext->LogMessage("We are currently drawing stuff, but some 2D texture has not yet been "
-                                         "uploaded any image at level 0. Until it's uploaded, this texture will look black.");
+                    mContext->LogMessageIfVerbose(
+                        "We are currently drawing stuff, but some 2D texture has not yet been "
+                        "uploaded any image at level 0. Until it's uploaded, this texture will look black.");
                 } else {
-                    mContext->LogMessage("We are currently drawing stuff, but some cube map texture has not yet been "
-                                         "uploaded any image at level 0, for at least one of its six faces. "
-                                         "Until it's uploaded, this texture will look black.");
+                    mContext->LogMessageIfVerbose(
+                        "We are currently drawing stuff, but some cube map texture has not yet been "
+                        "uploaded any image at level 0, for at least one of its six faces. "
+                        "Until it's uploaded, this texture will look black.");
                 }
                 mFakeBlackStatus = DoNeedFakeBlack;
                 return PR_TRUE;

content/canvas/src/WebGLContextGL.cpp

@@ -349,7 +349,7 @@ NS_IMETHODIMP
 WebGLContext::BufferData(PRInt32 dummy)
 {
     // this should never be called
-    LogMessage("BufferData");
+    LogMessageIfVerbose("BufferData");
     return NS_ERROR_FAILURE;
 }