Bug 1372193 - Format/types invalid for DOM uploads are INVALID_VALUE. r=lsalzman
authorjgilbert@mozilla.com <jdashg@gmail.com>
Sat, 02 Feb 2019 10:02:23 +0000
changeset 456543 976d6e2bd4c2126f8c5f3c76c696536a5231e0a1
parent 456542 4f4861ae0dd125d84a79c573e93ea1adff2799ce
child 456544 7b2533c0e59c01201b9661007f5d8910a6caa070
push id35489
push userrmaries@mozilla.com
push dateSat, 02 Feb 2019 21:36:03 +0000
treeherdermozilla-central@63348118ef1d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslsalzman
bugs1372193
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1372193 - Format/types invalid for DOM uploads are INVALID_VALUE. r=lsalzman MozReview-Commit-ID: IdSHKBdyqxA Differential Revision: https://phabricator.services.mozilla.com/D18484
dom/canvas/TexUnpackBlob.cpp
dom/canvas/test/webgl-conf/generated-mochitest.ini
dom/canvas/test/webgl-conf/mochitest-errata.ini
--- a/dom/canvas/TexUnpackBlob.cpp
+++ b/dom/canvas/TexUnpackBlob.cpp
@@ -63,17 +63,17 @@ static bool IsPIValidForDOM(const webgl:
   }
 
   return true;
 }
 
 static bool ValidatePIForDOM(WebGLContext* webgl,
                              const webgl::PackingInfo& pi) {
   if (!IsPIValidForDOM(pi)) {
-    webgl->ErrorInvalidOperation("Format or type is invalid for DOM sources.");
+    webgl->ErrorInvalidValue("Format or type is invalid for DOM sources.");
     return false;
   }
   return true;
 }
 
 static WebGLTexelFormat FormatForPackingInfo(const PackingInfo& pi) {
   switch (pi.type) {
     case LOCAL_GL_UNSIGNED_BYTE:
--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -6874,18 +6874,16 @@ subsuite = webgl2-core
 subsuite = webgl2-core
 [generated/test_2_conformance2__textures__misc__tex-image-with-bad-args-from-dom-elements.html]
 subsuite = webgl2-core
 skip-if = (os == 'win') || (os == 'mac')
 [generated/test_2_conformance2__textures__misc__tex-image-with-bad-args.html]
 subsuite = webgl2-core
 [generated/test_2_conformance2__textures__misc__tex-image-with-different-data-source.html]
 subsuite = webgl2-core
-skip-if = (os == 'mac' && debug) || (os == 'win' && debug)
-fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__textures__misc__tex-input-validation.html]
 subsuite = webgl2-core
 skip-if = (os == 'win')
 [generated/test_2_conformance2__textures__misc__tex-mipmap-levels.html]
 subsuite = webgl2-core
 fail-if = (os == 'mac')
 [generated/test_2_conformance2__textures__misc__tex-new-formats.html]
 subsuite = webgl2-core
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -248,20 +248,16 @@ skip-if = (os == 'mac') || (os == 'win')
 skip-if = (os == 'linux') || (os == 'android')
 [generated/test_conformance__glsl__constructors__glsl-construct-bvec2.html]
 # mozalloc_abort in libglsl.so
 skip-if = (os == 'linux') || (os == 'android')
 [generated/test_conformance__glsl__bugs__pow-of-small-constant-in-user-defined-function.html]
 skip-if = (os == 'android')
 [generated/test_2_conformance2__textures__misc__tex-image-with-bad-args-from-dom-elements.html]
 skip-if = (os == 'win') || (os == 'mac')
-[generated/test_2_conformance2__textures__misc__tex-image-with-different-data-source.html]
-# Bug 1324349
-skip-if = (os == 'mac' && debug) || (os == 'win' && debug)
-fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__glsl3__tricky-loop-conditions.html]
 fail-if = (os == 'win')
 [generated/test_2_conformance2__misc__views-with-offsets.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__rendering__blitframebuffer-outside-readbuffer.html]
 fail-if = (os == 'mac')
 [generated/test_2_conformance2__rendering__fs-color-type-mismatch-color-buffer-type.html]
 fail-if = (os == 'mac') || (os == 'win')