b=523286; [webgl] fix webgl framebuffer attachment test and misc error type; r=bjacob, a=b

content/canvas/src/WebGLContext.h

@@ -1377,8 +1377,9 @@ NS_DEFINE_STATIC_IID_ACCESSOR(WebGLRenderbuffer, WEBGLRENDERBUFFER_PRIVATE_IID)
 
 class WebGLFramebufferAttachment
 {
-    nsRefPtr<WebGLTexture> mTexturePtr;
-    nsRefPtr<WebGLRenderbuffer> mRenderbufferPtr;
+    // deleting a texture or renderbuffer immediately detaches it
+    WebGLObjectRefPtr<WebGLTexture> mTexturePtr;
+    WebGLObjectRefPtr<WebGLRenderbuffer> mRenderbufferPtr;
     WebGLenum mAttachmentPoint;
     WebGLint mTextureLevel;
     WebGLenum mTextureCubeMapFace;

content/canvas/src/WebGLContextGL.cpp

@@ -2189,7 +2189,7 @@ WebGLContext::GetUniform(nsIWebGLProgram *pobj, nsIWebGLUniformLocation *ploc, n
         return ErrorInvalidValue("GetUniform: this uniform location corresponds to another program");
 
     if (location->ProgramGeneration() != prog->Generation())
-        return ErrorInvalidValue("GetUniform: this uniform location is obsolete since the program has been relinked");
+        return ErrorInvalidOperation("GetUniform: this uniform location is obsolete since the program has been relinked");
 
     nsCOMPtr<nsIWritableVariant> wrval = do_CreateInstance("@mozilla.org/variant;1");
     NS_ENSURE_TRUE(wrval, NS_ERROR_FAILURE);