Bug 1745213 - Re-enable some passing canvas mochitests and clean up the manifest a bit. r=jgilbert

Differential Revision: https://phabricator.services.mozilla.com/D133380

dom/canvas/test/android.json

@@ -1,6 +0,0 @@
-{
-  "runtests": {},
-  "excludetests": {
-      "dom/canvas/test/webgl/test_webgl_conformance_test_suite.html": ""
-  }
-}

dom/canvas/test/crossorigin/mochitest.ini

@@ -12,5 +12,3 @@ support-files =
 subsuite = gpu
 [test_webgl_crossorigin_textures.html]
 subsuite = gpu
-skip-if = android_version == '24'
-

dom/canvas/test/mochitest.ini

@@ -1,6 +1,5 @@
 [DEFAULT]
 support-files =
-  android.json
   file_drawImage_document_domain.html
   image_anim-gr.gif
   image_anim-gr.png
@@ -56,8 +55,6 @@ support-files =
 [test_2d.composite.canvas.saturation.html]
 [test_2d.composite.canvas.screen.html]
 [test_2d.composite.canvas.soft-light.html]
-# xor and lighter aren't well handled by cairo; they mostly work, but we don't want
-# to test that
 [test_2d.composite.solid.color-burn.html]
 [test_2d.composite.solid.color-dodge.html]
 [test_2d.composite.solid.color.html]
@@ -91,69 +88,27 @@ support-files =
 [test_2d.drawImage.zerocanvas.html]
 [test_2d.fill.winding.html]
 [test_2d.fill.pattern.imageSmoothingEnabled.html]
-# These tests do not pass on any platform; Quartz backend won't pass them
-# because we fall back to pixman when one circle doesn't contain the other.
-# See bug 512647.
 [test_2d.gradient.radial.cone.shape2.html]
-disabled = bug 512647
 [test_2d.gradient.radial.cone.behind.html]
-disabled = bug 512647
 [test_2d.gradient.radial.cone.beside.html]
-disabled = bug 512647
-# This is an issue with Quartz's handling of radial gradients and some numeric
-# imprecision that results in errors here. SkiaGL (on Android) also has
-# a similar problem.
 [test_2d.gradient.radial.inside2.html]
-skip-if = toolkit == 'cocoa'
-  toolkit == 'android'
 [test_2d.gradient.radial.inside3.html]
-skip-if = toolkit == 'cocoa'
-  toolkit == 'android'
 [test_2d.gradient.radial.outside1.html]
-skip-if = toolkit == 'cocoa'
-  toolkit == 'android'
 [test_2d.gradient.radial.cone.front.html]
-skip-if = toolkit == 'cocoa'
-  toolkit == 'android'
 [test_2d.gradient.radial.cone.top.html]
-skip-if = toolkit == 'cocoa'
-  toolkit == 'android'
-# Tests that fail on non-Mac (bug 407107)
 [test_2d.gradient.radial.outside2.html]
-skip-if = toolkit != 'cocoa'
 [test_2d.gradient.radial.outside3.html]
-disabled = bug 1038277
-# These tests only pass on Mac OS X >= 10.5; see bug 450114
 [test_2d.gradient.radial.touch1.html]
-disabled = bug 450114
 [test_2d.gradient.radial.touch2.html]
-disabled = bug 450114
 [test_2d.gradient.radial.touch3.html]
-disabled = bug 450114
 [test_2d.gradient.radial.equal.html]
-disabled = bug 450114
 [test_2d.isPointInPath.winding.html]
 [test_2d.line.cap.closed.html]
-# This is another Quartz bug -- closed paths that don't lie fully within the
-# destination bounds seem to have problems with the BEVEL/SQUARE join/cap combo.
-# The joins are rendered as if with MITER; the correct behaviour is also seen
-# if BUTT is used instead of SQUARE.
-skip-if = toolkit == 'cocoa'
 [test_2d.line.join.parallel.html]
-# Tests that fail on Mac (possibly because spec is underdefined?).  Bug 407105
-# XXX vlad don't test these anywhere, cairo behaviour changed
-skip-if = toolkit == 'cocoa'
-# Tests that fail on non-Mac (bug 407107)
 [test_2d.path.arc.shape.3.html]
-skip-if = toolkit != 'cocoa'
 [test_2d.path.rect.selfintersect.html]
-skip-if = toolkit != 'cocoa'
-# This test is bogus according to the spec; see bug 407107
-[test_2d.path.rect.zero.6.html]
-disabled = bug 407107
 [test_2d.strokeRect.zero.5.html]
 [test_bitmaprenderer.html]
-skip-if = android_version == '25' # bug 1336581
 [test_bug232227.html]
 [test_bug613794.html]
 [test_bug764125.html]
@@ -164,14 +119,12 @@ skip-if = android_version == '25' # bug 1336581
 [test_bug1567544.html]
 subsuite = gpu
 [test_canvas.html]
-skip-if =
-  toolkit == 'windows'
+skip-if = (toolkit == 'windows') # bug 1464173
 [test_canvas_focusring.html]
 [test_canvas_font_setter.html]
 [test_canvas_path.html]
 [test_hitregion_canvas.html]
 [test_hitregion_event.html]
-skip-if = os == "android"
 [test_canvas_strokeStyle_getter.html]
 [test_capture.html]
 support-files = captureStream_common.js
@@ -211,7 +164,6 @@ tags = imagebitmap
 [test_2d.fillText.gradient.html]
 [test_2d_composite_canvaspattern_setTransform.html]
 [test_filter.html]
-skip-if = (e10s && debug && os == 'win')
 [test_filter_tainted.html]
 [test_offscreencanvas_toblob.html]
 subsuite = gpu
@@ -254,4 +206,3 @@ subsuite = gpu
 tags = offscreencanvas
 skip-if = 1
 [test_invalid_mime_type_blob.html]
-skip-if = toolkit == 'android'

dom/canvas/test/test_2d.path.rect.zero.6.html

@@ -1,52 +0,0 @@
-<!DOCTYPE HTML>
-<title>Canvas test: 2d.path.rect.zero.6</title>
-<script src="/tests/SimpleTest/SimpleTest.js"></script>
-<link rel="stylesheet" href="/tests/SimpleTest/test.css">
-<body>
-<canvas id="c" width="100" height="50" style="background: #0f0"><p class="fallback">FAIL (fallback content)</p></canvas>
-<script>
-function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    ok(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
-    var pixel = ctx.getImageData(x, y, 1, 1);
-    var pr = pixel.data[0],
-        pg = pixel.data[1],
-        pb = pixel.data[2],
-        pa = pixel.data[3];
-    todo(r-d <= pr && pr <= r+d &&
-       g-d <= pg && pg <= g+d &&
-       b-d <= pb && pb <= b+d &&
-       a-d <= pa && pa <= a+d,
-       "pixel "+pos+" is "+pr+","+pg+","+pb+","+pa+"; expected "+colour+" +/- "+d);
-}
-
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(function () {
-
-var canvas = document.getElementById('c');
-var ctx = canvas.getContext('2d');
-
-ctx.strokeStyle = '#f00';
-ctx.lineJoin = 'miter';
-ctx.miterLimit = 1.5;
-ctx.lineWidth = 200;
-ctx.beginPath();
-ctx.rect(100, 25, 1000, 0);
-ctx.stroke();
-todo_isPixel(ctx, 50,25, 0,0,0,0, "50,25", "0,0,0,0", 0);
-
-SimpleTest.finish();
-
-});
-</script>
-