Bug 1279317 - Don't override the failureId with a more general one. r=jrmuizel draft
authorBenoit Girard <b56girard@gmail.com>
Thu, 09 Jun 2016 15:20:49 -0400
changeset 377162 cc6739ce9a2f818b32b9eecff0bbc3b0c9c29011
parent 377074 f8e3b81a79f45ef8647c98281a9a00d1ddb28b73
child 523323 7a7967d027b7909014b930429b377fef8a86ee10
push id20763
push userb56girard@gmail.com
push dateThu, 09 Jun 2016 19:21:15 +0000
reviewersjrmuizel
bugs1279317
milestone50.0a1
Bug 1279317 - Don't override the failureId with a more general one. r=jrmuizel MozReview-Commit-ID: 8ErCqFlm89p
dom/canvas/WebGLContext.cpp
--- a/dom/canvas/WebGLContext.cpp
+++ b/dom/canvas/WebGLContext.cpp
@@ -592,17 +592,19 @@ CreateGLWithEGL(const gl::SurfaceCaps& c
         gl = nullptr;
     }
 
     if (!gl) {
         if (out_failReason->Length()) {
             out_failReason->AppendLiteral("\n");
         }
         out_failReason->AppendLiteral("Error during EGL OpenGL init.");
-        *out_failureId = "FEATURE_FAILURE_WEBGL_EGL_INIT";
+        if (out_failureId->IsEmpty()) {
+            *out_failureId = "FEATURE_FAILURE_WEBGL_EGL_INIT";
+        }
         return nullptr;
     }
 
     return gl.forget();
 }
 
 static already_AddRefed<GLContext>
 CreateGLWithANGLE(const gl::SurfaceCaps& caps, gl::CreateContextFlags flags,
@@ -616,17 +618,19 @@ CreateGLWithANGLE(const gl::SurfaceCaps&
         gl = nullptr;
     }
 
     if (!gl) {
         if (out_failReason->Length()) {
             out_failReason->AppendLiteral("\n");
         }
         out_failReason->AppendLiteral("Error during ANGLE OpenGL init.");
-        *out_failureId = "FEATURE_FAILURE_WEBGL_ANGLE_INIT";
+        if (out_failureId->IsEmpty()) {
+            *out_failureId = "FEATURE_FAILURE_WEBGL_ANGLE_INIT";
+        }
         return nullptr;
     }
 
     return gl.forget();
 }
 
 static already_AddRefed<gl::GLContext>
 CreateGLWithDefault(const gl::SurfaceCaps& caps, gl::CreateContextFlags flags,
@@ -654,17 +658,19 @@ CreateGLWithDefault(const gl::SurfaceCap
         gl = nullptr;
     }
 
     if (!gl) {
         if (out_failReason->Length()) {
             out_failReason->AppendASCII("\n");
         }
         out_failReason->AppendASCII("Error during native OpenGL init.");
-        *out_failureId = "FEATURE_FAILURE_WEBGL_DEFAULT_INIT";
+        if (out_failureId->IsEmpty()) {
+            *out_failureId = "FEATURE_FAILURE_WEBGL_DEFAULT_INIT";
+        }
         return nullptr;
     }
 
     return gl.forget();
 }
 
 ////////////////////////////////////////