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

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

2 files changed, 4 insertions, 126 deletions

diff --git a/layout/reftests/canvas/reftest-stylo.list b/layout/reftests/canvas/reftest-stylo.list
deleted file mode 100644
index 221205a9bd..0000000000
--- a/layout/reftests/canvas/reftest-stylo.list
+++ /dev/null
@@ -1,122 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== default-size.html default-size.html
-skip-if(B2G||Mulet) fuzzy-if(Android,8,1000) == size-1.html size-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== empty-transaction-1.html empty-transaction-1.html
-
-== image-rendering-test.html image-rendering-test.html
-== image-shadow.html image-shadow.html
-
-skip-if(B2G||Mulet) asserts-if(cocoaWidget,0-2) == size-change-1.html size-change-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-random-if(cocoaWidget) == subpixel-1.html subpixel-1.html
-# see bug 1192616, re-enable once we're off the pandaboards
-
-== text-ltr-left.html text-ltr-left.html
-== text-ltr-right.html text-ltr-right.html
-== text-rtl-left.html text-rtl-left.html
-== text-rtl-right.html text-rtl-right.html
-
-== text-ltr-start.html text-ltr-start.html
-== text-ltr-end.html text-ltr-end.html
-== text-ltr-left.html text-ltr-left.html
-== text-rtl-start.html text-rtl-start.html
-== text-rtl-end.html text-rtl-end.html
-== text-rtl-left.html text-rtl-left.html
-
-== text-ltr-left.html text-ltr-left.html
-
-== text-ltr-alignment-test.html text-ltr-alignment-test.html
-== text-rtl-alignment-test.html text-rtl-alignment-test.html
-
-fuzzy-if((B2G||Mulet)&&azureSkiaGL,1,256) == text-horzline-with-bottom.html text-horzline-with-bottom.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if((B2G||Mulet)&&azureSkiaGL,1,256) fails-if(azureSkia&&OSX>=1008) == text-horzline-with-top.html text-horzline-with-top.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== text-big-stroke.html text-big-stroke.html
-== text-big-stroke.html text-big-stroke.html
-
-== text-context-state-test.html text-context-state-test.html
-== text-font-inherit.html text-font-inherit.html
-== text-space-replace-test.html text-space-replace-test.html
-
-== text-no-frame-test.html text-no-frame-test.html
-== text-no-frame-2-test.html text-no-frame-2-test.html
-fuzzy-if(azureSkiaGL,10,400) == text-not-in-doc-test.html text-not-in-doc-test.html
-
-== text-bidi-ltr-test.html text-bidi-ltr-test.html
-== text-bidi-ltr-test.html text-bidi-ltr-test.html
-# for bug 698185
-== text-bidi-rtl-test.html text-bidi-rtl-test.html
-
-skip-if(B2G||Mulet) == text-font-lang.html text-font-lang.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== text-measure.html text-measure.html
-== text-small-caps-1.html text-small-caps-1.html
-
-random-if(!d2d) == text-subpixel-1.html text-subpixel-1.html
-
-== strokeText-path.html strokeText-path.html
-
-# check that emoji character renders as something non-blank (for Apple Color Emoji font, bug 715798)
-# apparently fails on some 10.7 systems for unknown reasons, bug 804522.
-## Currently fails most places due to partial backout of bug 808288, see bug 837461.
-## (Marking "random" rather than "fails" because it would pass for people
-## if they have an Emoji font installed when running the tests.)
-## WAS: random-if(OSX==1007) == text-emoji.html text-emoji.html
-# With Skia canvas on OS X (bug 932958) it fails even on 10.8 and 10.10.
-random-if(cocoaWidget&&azureSkia) random-if(!cocoaWidget||OSX==1006||OSX==1007) == text-emoji.html text-emoji.html
-
-# azure quartz uses CGDrawLinearGradient instead of DrawShading
-# so we have less control over degenerate behaviour as tested by this
-# test
-skip == linear-gradient-1a.html linear-gradient-1a.html
-
-# this passes with cairo on 10.7 and 10.8 but not with azure for reasons unknown
-skip == linear-gradient-1b.html linear-gradient-1b.html
-
-== zero-dimensions.html zero-dimensions.html
-
-== evenodd-fill-sanity.html evenodd-fill-sanity.html
-== evenodd-fill-1.html evenodd-fill-1.html
-== evenodd-fill-1.html evenodd-fill-1.html
-random-if(azureSkiaGL) == evenodd-fill-2.html evenodd-fill-2.html
-== evenodd-fill-3.html evenodd-fill-3.html
-
-== dash-sanity.html dash-sanity.html
-fuzzy-if(azureSkia||skiaContent,9,470) random-if(Android) == dash-1.html dash-1.html
-# Bug 668412 (really is android-specific, not IPC-specific)
-
-== ctm-sanity.html ctm-sanity.html
-== ctm-singular-sanity.html ctm-singular-sanity.html
-== ctm-1.html ctm-1.html
-
-fails-if(azureQuartz&&OSX==1006) == 672646-alpha-radial-gradient.html 672646-alpha-radial-gradient.html
-# Bug 673333
-== 674003-alpha-radial-gradient-superlum.html 674003-alpha-radial-gradient-superlum.html
-
-== 693610-1.html 693610-1.html
-# bug 693610: multiple glyph runs should not be overprinted
-
-== 726951-shadow-clips.html 726951-shadow-clips.html
-
-== transformed-clip.html transformed-clip.html
-fuzzy-if(azureSkia,1,15) fuzzy-if(skiaContent,1,20) == transformed-gradient.html transformed-gradient.html
-== transformed-path.html transformed-path.html
-
-== 749467-1.html 749467-1.html
-
-# You get a little bit of rounding fuzz on OSX from transforming the paths between user space and device space
-fuzzy-if(azureQuartz,2,128) fuzzy-if(d2d,12,21) fuzzy-if(skiaContent,12,7) fuzzy-if(d2d&&/^Windows\x20NT\x2010\.0/.test(http.oscpu),2,141) == 784573-1.html 784573-1.html
-
-== 802658-1.html 802658-1.html
-== 1074733-1.html 1074733-1.html
-fuzzy-if(Mulet,45,2) == 1107096-invisibles.html 1107096-invisibles.html
-== 1151821-1.html 1151821-1.html
-== 1201272-1.html 1201272-1.html
-== 1224976-1.html 1224976-1.html
-== 1238795-1.html 1238795-1.html
diff --git a/layout/reftests/canvas/reftest.list b/layout/reftests/canvas/reftest.list
index f32ca360b7..797d338a57 100644
--- a/layout/reftests/canvas/reftest.list
+++ b/layout/reftests/canvas/reftest.list
@@ -1,5 +1,5 @@
 == default-size.html default-size-ref.html
-fuzzy-if(Android,8,1000) == size-1.html size-1-ref.html
+== size-1.html size-1-ref.html
 
 == empty-transaction-1.html empty-transaction-1-ref.html
 
@@ -66,10 +66,10 @@ random-if(cocoaWidget&&azureSkia) random-if(!cocoaWidget||OSX==1006||OSX==1007)
 # azure quartz uses CGDrawLinearGradient instead of DrawShading
 # so we have less control over degenerate behaviour as tested by this
 # test
-fails-if((azureSkia&&!azureSkiaGL)||azureQuartz||(azureSkiaGL&&Android)) == linear-gradient-1a.html linear-gradient-1-ref.html
+fails-if((azureSkia&&!azureSkiaGL)||azureQuartz) == linear-gradient-1a.html linear-gradient-1-ref.html
 
 # this passes with cairo on 10.7 and 10.8 but not with azure for reasons unknown
-fails-if((azureSkia&&!azureSkiaGL)||azureQuartz||(azureSkiaGL&&Android)) == linear-gradient-1b.html linear-gradient-1-ref.html
+fails-if((azureSkia&&!azureSkiaGL)||azureQuartz) == linear-gradient-1b.html linear-gradient-1-ref.html
 
 == zero-dimensions.html zero-dimensions-ref.html
 
@@ -77,7 +77,7 @@ fails-if((azureSkia&&!azureSkiaGL)||azureQuartz||(azureSkiaGL&&Android)) == line
 == evenodd-fill-1.html evenodd-fill-ref.html
 
 == dash-sanity.html data:text/html,<body>Pass
-fuzzy-if(azureSkia||skiaContent,9,470) random-if(Android) == dash-1.html dash-1-ref.svg  # Bug 668412 (really is android-specific, not IPC-specific)
+fuzzy-if(azureSkia||skiaContent,9,470) == dash-1.html dash-1-ref.svg
 
 == ctm-sanity.html data:text/html,<body>Pass
 == ctm-singular-sanity.html data:text/html,<body>Pass