Bug 1044119 - Fix lost WebGL extensions generating invalid operation …

…errors. r=kamidphish
dothq · Jul 28, 2014 · a93895c · a93895c
1 parent af98d35
commit a93895c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/dom/canvas/WebGLExtensionInstancedArrays.cpp b/dom/canvas/WebGLExtensionInstancedArrays.cpp
@@ -26,7 +26,7 @@ WebGLExtensionInstancedArrays::DrawArraysInstancedANGLE(GLenum mode, GLint first
                                                         GLsizei count, GLsizei primcount)
 {
     if (mIsLost)
-        return mContext->ErrorInvalidOperation("drawArraysInstancedANGLE: Extension is lost.");
+        return mContext->GenerateWarning("drawArraysInstancedANGLE: Extension is lost.");
 
     mContext->DrawArraysInstanced(mode, first, count, primcount);
 }
@@ -37,7 +37,7 @@ WebGLExtensionInstancedArrays::DrawElementsInstancedANGLE(GLenum mode, GLsizei c
                                                           GLsizei primcount)
 {
     if (mIsLost)
-        return mContext->ErrorInvalidOperation("drawElementsInstancedANGLE: Extension is lost.");
+        return mContext->GenerateWarning("drawElementsInstancedANGLE: Extension is lost.");
 
     mContext->DrawElementsInstanced(mode, count, type, offset, primcount);
 }
@@ -46,7 +46,7 @@ void
 WebGLExtensionInstancedArrays::VertexAttribDivisorANGLE(GLuint index, GLuint divisor)
 {
     if (mIsLost)
-        return mContext->ErrorInvalidOperation("vertexAttribDivisorANGLE: Extension is lost.");
+        return mContext->GenerateWarning("vertexAttribDivisorANGLE: Extension is lost.");
 
     mContext->VertexAttribDivisor(index, divisor);
 }

diff --git a/dom/canvas/WebGLExtensionVertexArray.cpp b/dom/canvas/WebGLExtensionVertexArray.cpp
@@ -26,7 +26,7 @@ WebGLExtensionVertexArray::~WebGLExtensionVertexArray()
 already_AddRefed<WebGLVertexArray> WebGLExtensionVertexArray::CreateVertexArrayOES()
 {
     if (mIsLost) {
-        mContext->ErrorInvalidOperation("createVertexArrayOES: Extension is lost. Returning NULL.");
+        mContext->GenerateWarning("createVertexArrayOES: Extension is lost. Returning null.");
         return nullptr;
     }
 
@@ -36,15 +36,15 @@ already_AddRefed<WebGLVertexArray> WebGLExtensionVertexArray::CreateVertexArrayO
 void WebGLExtensionVertexArray::DeleteVertexArrayOES(WebGLVertexArray* array)
 {
     if (mIsLost)
-        return mContext->ErrorInvalidOperation("deleteVertexArrayOES: Extension is lost.");
+        return mContext->GenerateWarning("deleteVertexArrayOES: Extension is lost.");
 
     mContext->DeleteVertexArray(array);
 }
 
 bool WebGLExtensionVertexArray::IsVertexArrayOES(WebGLVertexArray* array)
 {
     if (mIsLost) {
-        mContext->ErrorInvalidOperation("isVertexArrayOES: Extension is lost. Returning false.");
+        mContext->GenerateWarning("isVertexArrayOES: Extension is lost. Returning false.");
         return false;
     }
 
@@ -54,7 +54,7 @@ bool WebGLExtensionVertexArray::IsVertexArrayOES(WebGLVertexArray* array)
 void WebGLExtensionVertexArray::BindVertexArrayOES(WebGLVertexArray* array)
 {
     if (mIsLost)
-        return mContext->ErrorInvalidOperation("bindVertexArrayOES: Extension is lost.");
+        return mContext->GenerateWarning("bindVertexArrayOES: Extension is lost.");
 
     mContext->BindVertexArray(array);
 }