Issue #1053 - Part 2b: Remove android from /layout reftests

Also cleans up some other obsolete checks and stylo reftest lists.

3 files changed, 1 insertions, 288 deletions

diff --git a/layout/reftests/svg/as-image/reftest-stylo.list b/layout/reftests/svg/as-image/reftest-stylo.list
deleted file mode 100644
index da8acdfff..000000000
--- a/layout/reftests/svg/as-image/reftest-stylo.list
+++ /dev/null
@@ -1,275 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG being used as an image
-
-# zoom/
-include zoom/reftest-stylo.list
-
-# Background-image tests
-skip-if(Mulet) == background-display-none-1.html background-display-none-1.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-skip-if(B2G||Mulet) == background-simple-1.html background-simple-1.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== background-simple-2.html background-simple-2.html
-
-# Sightly trickier background-image test
-== background-viewBox-1.html background-viewBox-1.html
-
-# background tests with the background area getting resized
-== background-resize-1.html background-resize-1.html
-== background-resize-2.html background-resize-2.html
-== background-resize-3.html background-resize-3.html
-== background-resize-4.html background-resize-4.html
-
-# Test for stretching background images by different amounts in each dimension
-== background-stretch-1.html background-stretch-1.html
-
-# Tests for scaling background images
-== background-scale-no-viewbox-1.html background-scale-no-viewbox-1.html
-== background-scale-with-viewbox-1.html background-scale-with-viewbox-1.html
-
-# Tests with -moz-image-rect()
-random == background-image-rect-1svg.html background-image-rect-1svg.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-== background-image-rect-1png.html background-image-rect-1png.html
-== background-image-rect-2.html background-image-rect-2.html
-
-# Test for border-image
-== border-image-simple-1.html border-image-simple-1.html
-== border-image-simple-2.html border-image-simple-2.html
-
-# Test for canvas "drawImage" method
-== canvas-drawImage-simple-1a.html canvas-drawImage-simple-1a.html
-== canvas-drawImage-simple-1b.html canvas-drawImage-simple-1b.html
-
-skip-if(B2G||Mulet) == canvas-drawImage-scale-1a.html canvas-drawImage-scale-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == canvas-drawImage-scale-1b.html canvas-drawImage-scale-1b.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == canvas-drawImage-scale-1c.html canvas-drawImage-scale-1c.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-fuzzy(1,2) fuzzy-if(skiaContent,1,529) == canvas-drawImage-scale-2a.html canvas-drawImage-scale-2a.html
-fuzzy(1,2) fuzzy-if(skiaContent,1,529) == canvas-drawImage-scale-2b.html canvas-drawImage-scale-2b.html
-
-fuzzy-if(winWidget&&!d2d,1,10000) fuzzy-if(azureSkia,1,10000) fuzzy-if(Android||B2G,1,10000) == canvas-drawImage-alpha-1.html canvas-drawImage-alpha-1.html
-#Same as scale-2a but with globalAlpha:
-fuzzy-if(azureSkia,1,40000) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2.html
-
-skip-if(B2G||Mulet) == canvas-drawImage-slice-1a.html canvas-drawImage-slice-1a.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== canvas-drawImage-slice-1b.html canvas-drawImage-slice-1b.html
-
-== canvas-drawImage-origin-clean-1.html canvas-drawImage-origin-clean-1.html
-== canvas-drawImage-transform-restored.html canvas-drawImage-transform-restored.html
-
-# Simple <img> tests
-== img-simple-1.html img-simple-1.html
-== img-simple-2.html img-simple-2.html
-fuzzy-if(skiaContent,255,350) == img-simple-3.html img-simple-3.html
-== img-simple-4.html img-simple-4.html
-fails fuzzy-if(skiaContent,255,90) == img-simple-5.html img-simple-5.html
-skip-if(B2G||Mulet) == img-simple-6.html img-simple-6.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,255,27) == img-simple-7.html img-simple-7.html
-
-# Test with mix of <html:img> and <svg:image> referring to the same images,
-# with a variety of preserveAspectRatio values in play.
-random == img-and-image-1.html img-and-image-1.html
-# bug 645267
-
-# More complex <img> tests
-== img-blobURI-1.html img-blobURI-1.html
-skip random == img-blobURI-2.html img-blobURI-2.html
-fuzzy-if(d2d,16,10) == img-content-outside-viewBox-1.html img-content-outside-viewBox-1.html
-# d2d is bug 1074161
-skip-if(Mulet) == img-display-none-1.html img-display-none-1.html
-# MULET: Bug 1144079: Re-enable Mulet mochitests and reftests taskcluster-specific disables
-== img-dyn-1.html img-dyn-1.html
-== img-foreignObject-1.html img-foreignObject-1.html
-
-# The following tests check that content embedded via <iframe> and <embed>
-# doesn't load (or execute scripts) in SVG-as-an-image.
-# The "!=" lines are to test that the SVG content, when viewed directly (not as
-# an image), does actually render its external content (making it look
-# different from the reference case).  We don't do that check for
-# img-foreignObject-iframe-1a.html, though, because its SVG image tries to
-# alert(), and that'd trigger a reftest timeout if we loaded that file directly.
-== img-foreignObject-embed-1.html img-foreignObject-embed-1.html
-== img-foreignObject-embed-1-helper.svg img-foreignObject-embed-1-helper.svg
-== img-foreignObject-iframe-1a.html img-foreignObject-iframe-1a.html
-== img-foreignObject-iframe-1b.html img-foreignObject-iframe-1b.html
-== img-foreignObject-iframe-1b-helper.svg img-foreignObject-iframe-1b-helper.svg
-
-== img-widthAndHeight-meet-1.html img-widthAndHeight-meet-1.html
-skip == img-widthAndHeight-meet-2.html img-widthAndHeight-meet-2.html
-== img-widthAndHeight-slice-1.html img-widthAndHeight-slice-1.html
-== img-widthAndHeight-slice-2.html img-widthAndHeight-slice-2.html
-
-== img-height-meet-1.html img-height-meet-1.html
-== img-height-meet-2.html img-height-meet-2.html
-== img-height-slice-1.html img-height-slice-1.html
-== img-height-slice-2.html img-height-slice-2.html
-
-== img-width-meet-1.html img-width-meet-1.html
-== img-width-meet-2.html img-width-meet-2.html
-== img-width-slice-1.html img-width-slice-1.html
-== img-width-slice-2.html img-width-slice-2.html
-
-# Alternate version of "width & height both non-%-valued" tests, but now
-# with no explicit viewBox, to trigger "synthesize-viewBox" behavior
-== img-novb-widthAndHeight-meet-1-em.html img-novb-widthAndHeight-meet-1-em.html
-== img-novb-widthAndHeight-meet-1-px.html img-novb-widthAndHeight-meet-1-px.html
-== img-novb-widthAndHeight-slice-1-em.html img-novb-widthAndHeight-slice-1-em.html
-== img-novb-widthAndHeight-slice-1-px.html img-novb-widthAndHeight-slice-1-px.html
-
-# Alternate versions of "only one dimension is non-%-valued" tests, but now
-# with no explicit viewBox, to trigger "synthesize-viewBox" behavior
-== img-novb-height-meet-1.html img-novb-height-meet-1.html
-== img-novb-height-slice-1.html img-novb-height-slice-1.html
-fuzzy-if(skiaContent,255,10) == img-novb-width-meet-1.html img-novb-width-meet-1.html
-fuzzy-if(skiaContent,255,10) == img-novb-width-slice-1.html img-novb-width-slice-1.html
-
-# with with a fragmentIdentifier viewBox
-skip-if(B2G||Mulet) == img-fragment-1a.html img-fragment-1a.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == img-fragment-1b.html img-fragment-1b.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == img-fragment-1c.html img-fragment-1c.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == img-fragment-2a.html img-fragment-2a.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == img-fragment-2b.html img-fragment-2b.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == img-fragment-2c.html img-fragment-2c.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-fuzzy-if(B2G,68,4) == list-simple-1.html list-simple-1.html
-
-== svg-image-simple-1.svg svg-image-simple-1.svg
-== svg-image-simple-2.svg svg-image-simple-2.svg
-== svg-image-simple-3.svg svg-image-simple-3.svg
-
-# tests for <svg> files that include themselves as an <image>
-== svg-image-recursive-1a.svg svg-image-recursive-1a.svg
-== svg-image-recursive-1b.svg svg-image-recursive-1b.svg
-== svg-image-recursive-2a.svg svg-image-recursive-2a.svg
-== svg-image-recursive-2b.html svg-image-recursive-2b.html
-
-# test that scripting feature is not supported in images or referenced documents
-skip skip-if(B2G||Mulet) == svg-image-script-1.svg svg-image-script-1.svg
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == svg-image-script-2.svg svg-image-script-2.svg
-
-# tests for external resources vs. data URIs in SVG as an image
-== svg-image-datauri-1.html svg-image-datauri-1.html
-HTTP == svg-image-datauri-1.html svg-image-datauri-1.html
-== svg-image-external-1.html svg-image-external-1.html
-HTTP == svg-image-external-1.html svg-image-external-1.html
-== svg-stylesheet-datauri-1.html svg-stylesheet-datauri-1.html
-HTTP == svg-stylesheet-datauri-1.html svg-stylesheet-datauri-1.html
-== svg-stylesheet-external-1.html svg-stylesheet-external-1.html
-HTTP == svg-stylesheet-external-1.html svg-stylesheet-external-1.html
-
-# test that :visited status is ignored in image documents
-# We load the images directly first, to be sure history is populated.
-# It's also good to verify that the helper images don't match lime100x100.svg
-# in non-image contexts, but for that to work, we have to reliably count on
-# :visited styles loading (asynchronously), so we test that in
-# layout/style/test/test_visited_reftests.html instead of the reftest harness.
-== svg-image-visited-1-helper.svg svg-image-visited-1-helper.svg
-== svg-image-visited-1.html svg-image-visited-1.html
-== svg-image-visited-2-helper.svg svg-image-visited-2-helper.svg
-skip == svg-image-visited-2.html svg-image-visited-2.html
-
-# Test for painting problems with SVGs used in border images.
-# XXXseth: The underlying problems also apply to media fragments,
-# but the test case would be much simpler. This should be switched
-# over to use media fragments once bug 790640 lands.
-skip-if(B2G||Mulet) fuzzy(2,1) == svg-border-image-repaint-1.html svg-border-image-repaint-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# Tests for image-orientation with a viewbox and an intrinsic size:
-== image-orientation-viewbox-and-size.html?0 image-orientation-viewbox-and-size.html?0
-== image-orientation-viewbox-and-size.html?90 image-orientation-viewbox-and-size.html?90
-== image-orientation-viewbox-and-size.html?180 image-orientation-viewbox-and-size.html?180
-== image-orientation-viewbox-and-size.html?270 image-orientation-viewbox-and-size.html?270
-== image-orientation-viewbox-and-size.html?0&flip image-orientation-viewbox-and-size.html?0&flip
-== image-orientation-viewbox-and-size.html?90&flip image-orientation-viewbox-and-size.html?90&flip
-== image-orientation-viewbox-and-size.html?180&flip image-orientation-viewbox-and-size.html?180&flip
-== image-orientation-viewbox-and-size.html?270&flip image-orientation-viewbox-and-size.html?270&flip
-
-# Tests for image-orientation with a viewbox and no intrinsic size:
-== image-orientation-viewbox-no-size.html?0 image-orientation-viewbox-no-size.html?0
-== image-orientation-viewbox-no-size.html?90 image-orientation-viewbox-no-size.html?90
-== image-orientation-viewbox-no-size.html?180 image-orientation-viewbox-no-size.html?180
-== image-orientation-viewbox-no-size.html?270 image-orientation-viewbox-no-size.html?270
-== image-orientation-viewbox-no-size.html?0&flip image-orientation-viewbox-no-size.html?0&flip
-== image-orientation-viewbox-no-size.html?90&flip image-orientation-viewbox-no-size.html?90&flip
-== image-orientation-viewbox-no-size.html?180&flip image-orientation-viewbox-no-size.html?180&flip
-== image-orientation-viewbox-no-size.html?270&flip image-orientation-viewbox-no-size.html?270&flip
-
-# Tests for image-orientation with no viewbox and an intrinsic size:
-== image-orientation-no-viewbox-and-size.html?0 image-orientation-no-viewbox-and-size.html?0
-== image-orientation-no-viewbox-and-size.html?90 image-orientation-no-viewbox-and-size.html?90
-== image-orientation-no-viewbox-and-size.html?180 image-orientation-no-viewbox-and-size.html?180
-== image-orientation-no-viewbox-and-size.html?270 image-orientation-no-viewbox-and-size.html?270
-skip == image-orientation-no-viewbox-and-size.html?0&flip image-orientation-no-viewbox-and-size.html?0&flip
-== image-orientation-no-viewbox-and-size.html?90&flip image-orientation-no-viewbox-and-size.html?90&flip
-== image-orientation-no-viewbox-and-size.html?180&flip image-orientation-no-viewbox-and-size.html?180&flip
-skip == image-orientation-no-viewbox-and-size.html?270&flip image-orientation-no-viewbox-and-size.html?270&flip
-
-# Tests for image-orientation with no viewbox and no intrinsic size:
-== image-orientation-no-viewbox-no-size.html?0 image-orientation-no-viewbox-no-size.html?0
-== image-orientation-no-viewbox-no-size.html?90 image-orientation-no-viewbox-no-size.html?90
-== image-orientation-no-viewbox-no-size.html?180 image-orientation-no-viewbox-no-size.html?180
-== image-orientation-no-viewbox-no-size.html?270 image-orientation-no-viewbox-no-size.html?270
-== image-orientation-no-viewbox-no-size.html?0&flip image-orientation-no-viewbox-no-size.html?0&flip
-== image-orientation-no-viewbox-no-size.html?90&flip image-orientation-no-viewbox-no-size.html?90&flip
-== image-orientation-no-viewbox-no-size.html?180&flip image-orientation-no-viewbox-no-size.html?180&flip
-== image-orientation-no-viewbox-no-size.html?270&flip image-orientation-no-viewbox-no-size.html?270&flip
-
-# Test that 'image-orientation: from-image' has no effect, since SVGs don't have EXIF data.
-== image-orientation-viewbox-and-size.html?from-image image-orientation-viewbox-and-size.html?from-image
-== image-orientation-viewbox-no-size.html?from-image image-orientation-viewbox-no-size.html?from-image
-
-# Sanity checks for the image-orientation tests. Ensures that the various
-# combinations of rotations and flips actually look different from each other.
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?180 image-orientation-ref.html?180
-== image-orientation-ref.html?0 image-orientation-ref.html?0
-== image-orientation-ref.html?90 image-orientation-ref.html?90
-== image-orientation-ref.html?180 image-orientation-ref.html?180
-== image-orientation-ref.html?270 image-orientation-ref.html?270
-
-# Tests that nonuniform scales work with SVG-as-image.
-== nonuniform-scale-2d.html?0.5&1.0 nonuniform-scale-2d.html?0.5&1.0
-== nonuniform-scale-2d.html?1.0&0.5 nonuniform-scale-2d.html?1.0&0.5
-== nonuniform-scale-3d.html?0.5&1.0&0.5 nonuniform-scale-3d.html?0.5&1.0&0.5
-== nonuniform-scale-3d.html?1.0&0.5&0.5 nonuniform-scale-3d.html?1.0&0.5&0.5
-
-# Sanity checks that nonuniform scales don't devolve to uniform scales.
-== nonuniform-scale-2d.html?0.3&1.0 nonuniform-scale-2d.html?0.3&1.0
-== nonuniform-scale-2d.html?0.3&1.0 nonuniform-scale-2d.html?0.3&1.0
-== nonuniform-scale-2d.html?1.0&0.3 nonuniform-scale-2d.html?1.0&0.3
-== nonuniform-scale-2d.html?1.0&0.3 nonuniform-scale-2d.html?1.0&0.3
-== nonuniform-scale-3d.html?0.3&1.0&0.3 nonuniform-scale-3d.html?0.3&1.0&0.3
-== nonuniform-scale-3d.html?0.3&1.0&0.3 nonuniform-scale-3d.html?0.3&1.0&0.3
-== nonuniform-scale-3d.html?1.0&0.3&0.3 nonuniform-scale-3d.html?1.0&0.3&0.3
-== nonuniform-scale-3d.html?1.0&0.3&0.3 nonuniform-scale-3d.html?1.0&0.3&0.3
-
-# Test for preserveAspectRatio with no-longer-supported "defer" keyword
-== defer-unsupported-1.svg defer-unsupported-1.svg
diff --git a/layout/reftests/svg/as-image/reftest.list b/layout/reftests/svg/as-image/reftest.list
index 75c149646..ff8eef230 100644
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@@ -44,7 +44,7 @@ include zoom/reftest.list
 fuzzy(1,2) fuzzy-if(skiaContent,1,529) == canvas-drawImage-scale-2a.html canvas-drawImage-scale-2-ref.html
 fuzzy(1,2) fuzzy-if(skiaContent,1,529) == canvas-drawImage-scale-2b.html canvas-drawImage-scale-2-ref.html
 
-fuzzy-if(winWidget&&!d2d,1,10000) fuzzy-if(azureSkia,1,10000) fuzzy-if(Android,1,10000) == canvas-drawImage-alpha-1.html canvas-drawImage-alpha-1-ref.html
+fuzzy-if(winWidget&&!d2d,1,10000) fuzzy-if(azureSkia,1,10000) == canvas-drawImage-alpha-1.html canvas-drawImage-alpha-1-ref.html
 #Same as scale-2a but with globalAlpha:
 fuzzy(1,2) fuzzy-if(azureSkia,1,40000) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2-ref.html
 
diff --git a/layout/reftests/svg/as-image/zoom/reftest-stylo.list b/layout/reftests/svg/as-image/zoom/reftest-stylo.list
deleted file mode 100644
index fe8a9bd67..000000000
--- a/layout/reftests/svg/as-image/zoom/reftest-stylo.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests related to SVG being used as an image, with zooming
-
-# Simple <img> tests
-fuzzy-if(skiaContent,1,408) == img-zoomIn-1.html img-zoomIn-1.html
-fuzzy-if(skiaContent,1,74) == img-zoomOut-1.html img-zoomOut-1.html
-
-# Ensure that scaled SVG images aren't fuzzy when tiled.
-== img-fuzzy-zoomOut-1.html img-fuzzy-zoomOut-1.html
-== img-fuzzy-zoomIn-1.html img-fuzzy-zoomIn-1.html
-== img-fuzzy-transform-zoomOut-1.html img-fuzzy-transform-zoomOut-1.html
-== img-fuzzy-transform-zoomIn-1.html img-fuzzy-transform-zoomIn-1.html