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

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

39 files changed, 58 insertions, 643 deletions

diff --git a/layout/reftests/forms/button/reftest-stylo.list b/layout/reftests/forms/button/reftest-stylo.list
deleted file mode 100644
index c76d15c91..000000000
--- a/layout/reftests/forms/button/reftest-stylo.list
+++ /dev/null
@@ -1,61 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== first-letter-1.html first-letter-1.html
-== first-letter-1.html first-letter-1.html
-
-== focus-area-percent-units-1.html focus-area-percent-units-1.html
-== focus-area-percent-units-2.html focus-area-percent-units-2.html
-
-== max-height.html max-height.html
-== min-height.html min-height.html
-== overflow-areas-1.html overflow-areas-1.html
-
-# The buttons in these tests have some fancy shading applied to their corners
-# on B2G, despite their "-moz-appearance: none; background: gray", so they
-# don't quite match the reference case's normal <div>. That's why they're fuzzy.
-fuzzy-if(B2G||Mulet||Android,125,20) == percent-height-child-1.html percent-height-child-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-pref(browser.display.focus_ring_width,1) fuzzy-if(B2G||Mulet||Android,125,80) == percent-height-child-2.html percent-height-child-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(B2G||Mulet||Android,125,20) == percent-width-child-1.html percent-width-child-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-pref(browser.display.focus_ring_width,1) fuzzy-if(B2G||Mulet||Android,125,80) == percent-width-child-2.html percent-width-child-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-== vertical-centering.html vertical-centering.html
-
-== line-height-button-0.5.html line-height-button-0.5.html
-== line-height-button-1.5.html line-height-button-1.5.html
-== line-height-input-0.5.html line-height-input-0.5.html
-== line-height-input-1.5.html line-height-input-1.5.html
-
-# Looks like Android and B2G change the text color, but to something slightly
-# different from ColorGray
-fails-if(Android||B2G||Mulet) == disabled-1.html disabled-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== disabled-2.html disabled-2.html
-
-== disabled-3.html disabled-3.html
-== disabled-4.html disabled-4.html
-== disabled-5.html disabled-5.html
-== disabled-6.html disabled-6.html
-
-fails-if(B2G||Mulet) == width-auto-size-em-ltr.html width-auto-size-em-ltr.html
-# Bug 1145672
-# Bug 1150486
-fails-if(B2G||Mulet) == width-auto-size-ltr.html width-auto-size-ltr.html
-# Bug 1145672
-# Bug 1150486
-== width-exact-fit-ltr.html width-exact-fit-ltr.html
-== width-erode-part-focuspadding-ltr.html width-erode-part-focuspadding-ltr.html
-== width-erode-all-focuspadding-ltr.html width-erode-all-focuspadding-ltr.html
-== width-erode-overflow-focuspadding-ltr.html width-erode-overflow-focuspadding-ltr.html
-fails-if(B2G||Mulet) == width-auto-size-em-rtl.html width-auto-size-em-rtl.html
-# Bug 1145672
-# Bug 1150486
-fails-if(B2G||Mulet) == width-auto-size-rtl.html width-auto-size-rtl.html
-# Bug 1145672
-# Bug 1150486
-== width-exact-fit-rtl.html width-exact-fit-rtl.html
-== width-erode-part-focuspadding-rtl.html width-erode-part-focuspadding-rtl.html
-== width-erode-all-focuspadding-rtl.html width-erode-all-focuspadding-rtl.html
-== width-erode-overflow-focuspadding-rtl.html width-erode-overflow-focuspadding-rtl.html
diff --git a/layout/reftests/forms/button/reftest.list b/layout/reftests/forms/button/reftest.list
index cefec2e85..db314516d 100644
--- a/layout/reftests/forms/button/reftest.list
+++ b/layout/reftests/forms/button/reftest.list
@@ -8,13 +8,10 @@
 == min-height.html min-height-ref.html
 == overflow-areas-1.html overflow-areas-1-ref.html
 
-# The buttons in these tests have some fancy shading applied to their corners
-# on Android, despite their "-moz-appearance: none; background: gray", so they
-# don't quite match the reference case's normal <div>. That's why they're fuzzy.
-fuzzy-if(Android,125,20) == percent-height-child-1.html percent-height-child-1-ref.html
-pref(browser.display.focus_ring_width,1) fuzzy-if(Android,125,80) == percent-height-child-2.html percent-height-child-2-ref.html
-fuzzy-if(Android,125,20) == percent-width-child-1.html  percent-width-child-1-ref.html
-pref(browser.display.focus_ring_width,1) fuzzy-if(Android,125,80) == percent-width-child-2.html  percent-width-child-2-ref.html
+== percent-height-child-1.html percent-height-child-1-ref.html
+pref(browser.display.focus_ring_width,1) == percent-height-child-2.html percent-height-child-2-ref.html
+== percent-width-child-1.html  percent-width-child-1-ref.html
+pref(browser.display.focus_ring_width,1) == percent-width-child-2.html  percent-width-child-2-ref.html
 
 == vertical-centering.html vertical-centering-ref.html
 
@@ -23,9 +20,7 @@ pref(browser.display.focus_ring_width,1) fuzzy-if(Android,125,80) == percent-wid
 != line-height-input-0.5.html line-height-input-1.0.html
 != line-height-input-1.5.html line-height-input-1.0.html
 
-# Looks like Android changes the text color, but to something slightly
-# different from ColorGray
-fails-if(Android) == disabled-1.html disabled-1-ref.html
+== disabled-1.html disabled-1-ref.html
 == disabled-2.html disabled-2-ref.html
 
 != disabled-3.html disabled-3-notref.html
diff --git a/layout/reftests/forms/fieldset/reftest-stylo.list b/layout/reftests/forms/fieldset/reftest-stylo.list
deleted file mode 100644
index d1dd22756..000000000
--- a/layout/reftests/forms/fieldset/reftest-stylo.list
+++ /dev/null
@@ -1,19 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(skiaContent,2,13) == dynamic-legend-scroll-1.html dynamic-legend-scroll-1.html
-== fieldset-hidden-1.html fieldset-hidden-1.html
-== fieldset-intrinsic-width-1.html fieldset-intrinsic-width-1.html
-== fieldset-percentage-padding-1.html fieldset-percentage-padding-1.html
-== fieldset-scroll-1.html fieldset-scroll-1.html
-== fieldset-scrolled-1.html fieldset-scrolled-1.html
-random-if(B2G||Mulet) == fieldset-overflow-auto-1.html fieldset-overflow-auto-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(winWidget&&!layersGPUAccelerated,121,221) == positioned-container-1.html positioned-container-1.html
-== relpos-legend-1.html relpos-legend-1.html
-== relpos-legend-2.html relpos-legend-2.html
-skip-if((B2G&&browserIsRemote)||Mulet) == sticky-legend-1.html sticky-legend-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails fuzzy-if(skiaContent,1,40768) == abs-pos-child-sizing.html abs-pos-child-sizing.html
-== overflow-hidden.html overflow-hidden.html
-== legend-rtl.html legend-rtl.html
-== fieldset-grid-001.html fieldset-grid-001.html
-== fieldset-flexbox-001.html fieldset-flexbox-001.html
diff --git a/layout/reftests/forms/input/checkbox/reftest-stylo.list b/layout/reftests/forms/input/checkbox/reftest-stylo.list
deleted file mode 100644
index 11fe7d778..000000000
--- a/layout/reftests/forms/input/checkbox/reftest-stylo.list
+++ /dev/null
@@ -1,18 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== label-dynamic.html label-dynamic.html
-skip-if(B2G||Mulet) fails-if(Android) == radio-stretched.html radio-stretched.html
-# test for bug 464589
-# Initial mulet triage: parity with B2G/B2G Desktop
-== checked.html checked.html
-== checked-native.html checked-native.html
-== checked.html checked.html
-== checked-notref.html checked-notref.html
-== checked-native.html checked-native.html
-== checked-native-notref.html checked-native-notref.html
-== indeterminate-checked.html indeterminate-checked.html
-== indeterminate-unchecked.html indeterminate-unchecked.html
-== indeterminate-native-checked.html indeterminate-native-checked.html
-== indeterminate-native-unchecked.html indeterminate-native-unchecked.html
-== indeterminate-selector.html indeterminate-selector.html
-skip-if(!gtkWidget||Mulet) == gtk-theme-width-height.html gtk-theme-width-height.html
-# bug 1141511: Disable some gtkWidget-dependant reftests on Mulet
diff --git a/layout/reftests/forms/input/checkbox/reftest.list b/layout/reftests/forms/input/checkbox/reftest.list
index cc485e969..442d3d1cd 100644
--- a/layout/reftests/forms/input/checkbox/reftest.list
+++ b/layout/reftests/forms/input/checkbox/reftest.list
@@ -1,5 +1,5 @@
 == label-dynamic.html label-dynamic-ref.html
-fails-if(Android) == radio-stretched.html radio-stretched-ref.html # test for bug 464589
+== radio-stretched.html radio-stretched-ref.html # test for bug 464589
 != checked.html checked-notref.html
 != checked-native.html checked-native-notref.html
 != checked.html about:blank
diff --git a/layout/reftests/forms/input/color/reftest-stylo.list b/layout/reftests/forms/input/color/reftest-stylo.list
deleted file mode 100644
index a1e01b480..000000000
--- a/layout/reftests/forms/input/color/reftest-stylo.list
+++ /dev/null
@@ -1,20 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Simple test. Should fail on platforms where input type color isn't activated
-# yet. Missing platforms are B2G (bug 875751), Android (bug 875750).
-fails-if(B2G||Mulet||Android) == input-color-1.html input-color-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-default-preferences pref(dom.forms.color,true)
-
-# Despite the "default-preferences" line above, B2G and Android are still
-# excluded from some style in forms.css, which makes the following tests fail.
-fails-if(B2G||Mulet||Android) == margin-padding-1.html margin-padding-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== block-invalidate-1.html block-invalidate-1.html
-== block-invalidate-2.html block-invalidate-2.html
-fuzzy-if(gtkWidget,8,33) fuzzy-if(skiaContent,8,35) fails-if(B2G||Mulet||Android) == transformations-1.html transformations-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) == custom-style-1.html custom-style-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) == custom-style-2.html custom-style-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/forms/input/color/reftest.list b/layout/reftests/forms/input/color/reftest.list
index 148cb4bad..314eebd04 100644
--- a/layout/reftests/forms/input/color/reftest.list
+++ b/layout/reftests/forms/input/color/reftest.list
@@ -1,14 +1,12 @@
 # Simple test. Should fail on platforms where input type color isn't activated
-# yet. The missing platform is Android (bug 875750).
-fails-if(Android) == input-color-1.html input-color-1-ref.html
+# yet.
+== input-color-1.html input-color-1-ref.html
 
 default-preferences pref(dom.forms.color,true)
 
-# Despite the "default-preferences" line above, Android is still
-# excluded from some style in forms.css, which makes the following tests fail.
-fails-if(Android) == margin-padding-1.html margin-padding-1-ref.html
+== margin-padding-1.html margin-padding-1-ref.html
 == block-invalidate-1.html block-invalidate-1-ref.html
 == block-invalidate-2.html block-invalidate-2-ref.html
-fuzzy-if(gtkWidget,8,33) fuzzy-if(skiaContent,8,35) fails-if(Android) == transformations-1.html transformations-1-ref.html
-fails-if(Android) == custom-style-1.html custom-style-1-ref.html
-fails-if(Android) == custom-style-2.html custom-style-2-ref.html
+fuzzy-if(gtkWidget,8,33) fuzzy-if(skiaContent,8,35) == transformations-1.html transformations-1-ref.html
+== custom-style-1.html custom-style-1-ref.html
+== custom-style-2.html custom-style-2-ref.html
diff --git a/layout/reftests/forms/input/datetime/reftest.list b/layout/reftests/forms/input/datetime/reftest.list
index a62d56c7c..25f676898 100644
--- a/layout/reftests/forms/input/datetime/reftest.list
+++ b/layout/reftests/forms/input/datetime/reftest.list
@@ -1,24 +1,21 @@
 default-preferences pref(dom.forms.datetime,true)
 
-# not valid on Android/B2G where type=time looks like type=text
-skip-if(Android||B2G||Mulet) != time-simple-unthemed.html time-simple-unthemed-ref.html
-skip-if(Android||B2G||Mulet) != time-large-font.html time-basic.html
-skip-if(Android||B2G||Mulet) != time-width-height.html time-basic.html
-skip-if(Android||B2G||Mulet) != time-border.html time-basic.html
-# only valid on Android/B2G where type=number looks the same as type=text
-skip-if(!Android&&!B2G&&!Mulet) == time-simple-unthemed.html time-simple-unthemed-ref.html
+!= time-simple-unthemed.html time-simple-unthemed-ref.html
+!= time-large-font.html time-basic.html
+!= time-width-height.html time-basic.html
+!= time-border.html time-basic.html
 
 # type change
-skip-if(Android||B2G||Mulet) == to-time-from-other-type-unthemed.html time-simple-unthemed.html
-skip-if(Android||B2G||Mulet) == from-time-to-other-type-unthemed.html from-time-to-other-type-unthemed-ref.html
+== to-time-from-other-type-unthemed.html time-simple-unthemed.html
+== from-time-to-other-type-unthemed.html from-time-to-other-type-unthemed-ref.html
 
 # content should not overflow on small width/height
-skip-if(Android) == time-small-width.html time-small-width-ref.html
-skip-if(Android) == time-small-height.html time-small-height-ref.html
-skip-if(Android) == time-small-width-height.html time-small-width-height-ref.html
+== time-small-width.html time-small-width-ref.html
+== time-small-height.html time-small-height-ref.html
+== time-small-width-height.html time-small-width-height-ref.html
 
 # content (text) should be left aligned
-skip-if(Android) == time-content-left-aligned.html time-content-left-aligned-ref.html
+== time-content-left-aligned.html time-content-left-aligned-ref.html
 
 # reset button should be right aligned
-skip-if(Android) fails-if(styloVsGecko) == time-reset-button-right-aligned.html time-reset-button-right-aligned-ref.html # bug 1372062
+fails-if(styloVsGecko) == time-reset-button-right-aligned.html time-reset-button-right-aligned-ref.html # bug 1372062
diff --git a/layout/reftests/forms/input/email/reftest-stylo.list b/layout/reftests/forms/input/email/reftest-stylo.list
deleted file mode 100644
index 021c5f861..000000000
--- a/layout/reftests/forms/input/email/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 1.html 1.html
-== 2.html 2.html
-== 3.html 3.html
diff --git a/layout/reftests/forms/input/file/reftest-stylo.list b/layout/reftests/forms/input/file/reftest-stylo.list
deleted file mode 100644
index 44d8ce504..000000000
--- a/layout/reftests/forms/input/file/reftest-stylo.list
+++ /dev/null
@@ -1,20 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# B2G failures: bug 855352.
-fails-if(B2G||Mulet||Android) fuzzy-if(OSX==1006,8,152) skip-if((B2G&&browserIsRemote)||Mulet) == simple.html simple.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) fuzzy-if(OSX==1006,8,76) skip-if((B2G&&browserIsRemote)||Mulet) == rtl.html rtl.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) fuzzy-if(OSX==1006,8,152) skip-if((B2G&&browserIsRemote)||Mulet) == size.html size.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) fuzzy-if(OSX==1006,8,76) skip-if((B2G&&browserIsRemote)||Mulet) == background.html background.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fails-if(B2G||Mulet||Android) skip-if((B2G&&browserIsRemote)||Mulet) == style.html style.html
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-== width-clip.html width-clip.html
-fails-if(B2G||Mulet||Android) == color-inherit.html color-inherit.html
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/forms/input/file/reftest.list b/layout/reftests/forms/input/file/reftest.list
index ecb509226..7596f1c82 100644
--- a/layout/reftests/forms/input/file/reftest.list
+++ b/layout/reftests/forms/input/file/reftest.list
@@ -1,7 +1,7 @@
-fails-if(Android) fuzzy-if(OSX==1006,8,152) == simple.html simple-ref.xul
-fails-if(Android) fuzzy-if(OSX==1006,8,76) == rtl.html rtl-ref.xul
-fails-if(Android) fuzzy-if(OSX==1006,8,152) == size.html simple-ref.xul
-fails-if(Android) fuzzy-if(OSX==1006,8,76) == background.html background-ref.xul
-fails-if(Android) == style.html style-ref.xul
+fuzzy-if(OSX==1006,8,152) == simple.html simple-ref.xul
+fuzzy-if(OSX==1006,8,76) == rtl.html rtl-ref.xul
+fuzzy-if(OSX==1006,8,152) == size.html simple-ref.xul
+fuzzy-if(OSX==1006,8,76) == background.html background-ref.xul
+== style.html style-ref.xul
 != width-clip.html width-clip-ref.html
-fails-if(Android) == color-inherit.html color-inherit-ref.html
+== color-inherit.html color-inherit-ref.html
diff --git a/layout/reftests/forms/input/hidden/reftest-stylo.list b/layout/reftests/forms/input/hidden/reftest-stylo.list
deleted file mode 100644
index db274e45f..000000000
--- a/layout/reftests/forms/input/hidden/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== border.html border.html
diff --git a/layout/reftests/forms/input/number/reftest-stylo.list b/layout/reftests/forms/input/number/reftest-stylo.list
deleted file mode 100644
index 8a10476d7..000000000
--- a/layout/reftests/forms/input/number/reftest-stylo.list
+++ /dev/null
@@ -1,65 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-default-preferences pref(dom.forms.number,true)
-
-# sanity checks:
-# not valid on Android/B2G where type=number looks like type=text
-skip skip-if(Android||B2G||Mulet) == not-other-type-unthemed-1.html not-other-type-unthemed-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(Android||B2G||Mulet) == not-other-type-unthemed-1.html not-other-type-unthemed-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# only valid on Android/B2G where type=number looks the same as type=text
-skip-if(!Android&&!B2G&&!Mulet) == number-same-as-text-unthemed.html number-same-as-text-unthemed.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# should look the same as type=text, except for the spin box
-skip == number-similar-to-text-unthemed.html number-similar-to-text-unthemed.html
-skip == number-similar-to-text-unthemed-rtl.html number-similar-to-text-unthemed-rtl.html
-skip == number-similar-to-text-unthemed-vertical-lr.html number-similar-to-text-unthemed-vertical-lr.html
-skip == number-similar-to-text-unthemed-vertical-rl.html number-similar-to-text-unthemed-vertical-rl.html
-
-# dynamic type changes:
-fuzzy-if(/^Windows\x20NT\x205\.1/.test(http.oscpu),64,4) fuzzy-if(cocoaWidget,63,4) fuzzy-if(skiaContent,2,5) == to-number-from-other-type-unthemed-1.html to-number-from-other-type-unthemed-1.html
-# skip fuzzy-if(skiaContent,2,5) == from-number-to-other-type-unthemed-1.html from-number-to-other-type-unthemed-1.html
-
-# dynamic value changes:
-# skip fuzzy-if(skiaContent,2,13) == show-value.html show-value.html
-
-# disabled
-skip == number-disabled.html number-disabled.html
-
-# auto width:
-skip == number-auto-width-1.html number-auto-width-1.html
-
-# min-height/max-height tests:
-skip skip-if(B2G||Mulet||Android) == number-min-height-1.html number-min-height-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(B2G||Mulet||Android) == number-min-height-2.html number-min-height-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(B2G||Mulet||Android) == number-max-height-1.html number-max-height-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip skip-if(B2G||Mulet||Android) == number-max-height-2.html number-max-height-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# number of significant fractional digits:
-skip == number-significant-fractional-digits.html number-significant-fractional-digits.html
-
-# focus
-# autofocus is disabled on B2G
-# https://bugzilla.mozilla.org/show_bug.cgi?id=965763
-# skip skip-if(B2G||Mulet) fuzzy-if(skiaContent,2,5) needs-focus == focus-handling.html focus-handling.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# select
-skip == number-selected.html number-selected.html
-
-# pseudo-elements not usable from content:
-skip == number-pseudo-elements.html number-pseudo-elements.html
-
-skip == number-placeholder.html number-placeholder.html
-
-# check that if the anonymous text control is reframed, we reframe the whole
-# number control (the fuzzy is for the top-right and bottom-left of the border
-# bevel which gets slightly different antialiasing after invalidation):
-skip == number-reframe-anon-text-field.html number-reframe-anon-text-field.html
-
-skip == pseudo-classes.html pseudo-classes.html
diff --git a/layout/reftests/forms/input/number/reftest.list b/layout/reftests/forms/input/number/reftest.list
index bd07e274c..610c847e7 100644
--- a/layout/reftests/forms/input/number/reftest.list
+++ b/layout/reftests/forms/input/number/reftest.list
@@ -1,11 +1,9 @@
 default-preferences pref(dom.forms.number,true)
 
 # sanity checks:
-# not valid on Android where type=number looks like type=text
-skip-if(Android) != not-other-type-unthemed-1.html not-other-type-unthemed-1a-notref.html
-skip-if(Android) != not-other-type-unthemed-1.html not-other-type-unthemed-1b-notref.html
-# only valid on Android where type=number looks the same as type=text
-skip-if(!Android) == number-same-as-text-unthemed.html number-same-as-text-unthemed-ref.html
+!= not-other-type-unthemed-1.html not-other-type-unthemed-1a-notref.html
+!= not-other-type-unthemed-1.html not-other-type-unthemed-1b-notref.html
+!= number-same-as-text-unthemed.html number-same-as-text-unthemed-ref.html
 
 # should look the same as type=text, except for the spin box
 == number-similar-to-text-unthemed.html number-similar-to-text-unthemed-ref.html
@@ -27,10 +25,10 @@ fuzzy-if(skiaContent,2,13) == show-value.html show-value-ref.html
 == number-auto-width-1.html number-auto-width-1-ref.html
 
 # min-height/max-height tests:
-skip-if(Android) == number-min-height-1.html number-min-height-1-ref.html
-skip-if(Android) == number-min-height-2.html number-min-height-2-ref.html
-skip-if(Android) == number-max-height-1.html number-max-height-1-ref.html
-skip-if(Android) == number-max-height-2.html number-max-height-2-ref.html
+== number-min-height-1.html number-min-height-1-ref.html
+== number-min-height-2.html number-min-height-2-ref.html
+== number-max-height-1.html number-max-height-1-ref.html
+== number-max-height-2.html number-max-height-2-ref.html
 
 # number of significant fractional digits:
 == number-significant-fractional-digits.html number-significant-fractional-digits-ref.html
diff --git a/layout/reftests/forms/input/percentage/reftest-stylo.list b/layout/reftests/forms/input/percentage/reftest-stylo.list
deleted file mode 100644
index 6f9069ce2..000000000
--- a/layout/reftests/forms/input/percentage/reftest-stylo.list
+++ /dev/null
@@ -1,2 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== padding.html padding.html
diff --git a/layout/reftests/forms/input/radio/reftest-stylo.list b/layout/reftests/forms/input/radio/reftest-stylo.list
deleted file mode 100644
index 7f7adc33b..000000000
--- a/layout/reftests/forms/input/radio/reftest-stylo.list
+++ /dev/null
@@ -1,10 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== label-dynamic.html label-dynamic.html
-== checked.html checked.html
-== checked-native.html checked-native.html
-== checked.html checked.html
-== checked-notref.html checked-notref.html
-== checked-native.html checked-native.html
-== checked-native-notref.html checked-native-notref.html
-skip-if(!gtkWidget||Mulet) == gtk-theme-width-height.html gtk-theme-width-height.html
-# bug 1141511: Disable some gtkWidget-dependant reftests on Mulet
diff --git a/layout/reftests/forms/input/range/reftest-stylo.list b/layout/reftests/forms/input/range/reftest-stylo.list
deleted file mode 100644
index 776a29fb2..000000000
--- a/layout/reftests/forms/input/range/reftest-stylo.list
+++ /dev/null
@@ -1,54 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-
-# sanity checks:
-skip == not-other-type-unthemed-1.html not-other-type-unthemed-1.html
-skip == not-other-type-unthemed-1.html not-other-type-unthemed-1.html
-skip == not-other-type-unthemed-1.html not-other-type-unthemed-1.html
-
-# dynamic type changes:
-fuzzy-if(skiaContent,1,40) == to-range-from-other-type-unthemed-1.html to-range-from-other-type-unthemed-1.html
-== from-range-to-other-type-unthemed-1.html from-range-to-other-type-unthemed-1.html
-
-# for different values:
-== different-fraction-of-range-unthemed-1.html different-fraction-of-range-unthemed-1.html
-== same-fraction-of-range-unthemed-1.html same-fraction-of-range-unthemed-1.html
-
-# dynamic value changes:
-fails fuzzy-if(skiaContent,1,40) == value-prop-unthemed.html value-prop-unthemed.html
-== value-prop.html value-prop.html
-fails fuzzy-if(skiaContent,1,40) == valueAsNumber-prop-unthemed.html valueAsNumber-prop-unthemed.html
-== valueAsNumber-prop.html valueAsNumber-prop.html
-fails fuzzy-if(B2G,2,1) fuzzy-if(skiaContent,1,40) == stepDown-unthemed.html stepDown-unthemed.html
-fuzzy-if(B2G,2,1) == stepDown.html stepDown.html
-fails fuzzy-if(skiaContent,1,40) == stepUp-unthemed.html stepUp-unthemed.html
-== stepUp.html stepUp.html
-fuzzy-if(B2G,2,1) == max-prop.html max-prop.html
-skip == reset-value.html reset-value.html
-
-# 'direction' property:
-== direction-unthemed-1.html direction-unthemed-1.html
-
-# ::-moz-range-progress pseudo-element:
-fails-if(B2G||Mulet||Android) == moz-range-progress-1.html moz-range-progress-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== moz-range-progress-2.html moz-range-progress-2.html
-== moz-range-progress-3.html moz-range-progress-3.html
-
-# Tests for block and inline orientation in combination with writing-mode
-# XXX Remove default-preferences setting here after bug 1138384 makes
-#     it the default for all channels
-
-== range-orient-horizontal.html range-orient-horizontal.html
-== range-orient-horizontal.html range-orient-horizontal.html
-== range-orient-block.html range-orient-block.html
-== range-orient-inline.html range-orient-inline.html
-== range-vlr.html range-vlr.html
-== range-vlr-orient-block.html range-vlr-orient-block.html
-== range-vlr-orient-inline.html range-vlr-orient-inline.html
-== range-vlr-orient-horizontal.html range-vlr-orient-horizontal.html
-== range-vlr-orient-vertical.html range-vlr-orient-vertical.html
-== range-vrl.html range-vrl.html
-== range-vrl-orient-block.html range-vrl-orient-block.html
-== range-vrl-orient-inline.html range-vrl-orient-inline.html
-== range-vrl-orient-horizontal.html range-vrl-orient-horizontal.html
-== range-vrl-orient-vertical.html range-vrl-orient-vertical.html
diff --git a/layout/reftests/forms/input/range/reftest.list b/layout/reftests/forms/input/range/reftest.list
index 8c2c231a3..6838099c6 100644
--- a/layout/reftests/forms/input/range/reftest.list
+++ b/layout/reftests/forms/input/range/reftest.list
@@ -28,7 +28,7 @@ fuzzy-if(skiaContent,1,40) == stepUp-unthemed.html 75pct-unthemed-common-ref.htm
 == direction-unthemed-1.html direction-unthemed-1-ref.html
 
 # ::-moz-range-progress pseudo-element:
-fails-if(Android) == moz-range-progress-1.html moz-range-progress-1-ref.html
+== moz-range-progress-1.html moz-range-progress-1-ref.html
 == moz-range-progress-2.html moz-range-progress-2-ref.html
 == moz-range-progress-3.html moz-range-progress-3-ref.html
 
diff --git a/layout/reftests/forms/input/reftest-stylo.list b/layout/reftests/forms/input/reftest-stylo.list
deleted file mode 100644
index c3ab90d2c..000000000
--- a/layout/reftests/forms/input/reftest-stylo.list
+++ /dev/null
@@ -1,14 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-include checkbox/reftest-stylo.list
-include email/reftest-stylo.list
-include tel/reftest-stylo.list
-include search/reftest-stylo.list
-include url/reftest-stylo.list
-include number/reftest-stylo.list
-include file/reftest-stylo.list
-include radio/reftest-stylo.list
-include range/reftest-stylo.list
-include text/reftest-stylo.list
-include percentage/reftest-stylo.list
-include hidden/reftest-stylo.list
-include color/reftest-stylo.list
diff --git a/layout/reftests/forms/input/search/reftest-stylo.list b/layout/reftests/forms/input/search/reftest-stylo.list
deleted file mode 100644
index 021c5f861..000000000
--- a/layout/reftests/forms/input/search/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 1.html 1.html
-== 2.html 2.html
-== 3.html 3.html
diff --git a/layout/reftests/forms/input/tel/reftest-stylo.list b/layout/reftests/forms/input/tel/reftest-stylo.list
deleted file mode 100644
index 021c5f861..000000000
--- a/layout/reftests/forms/input/tel/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 1.html 1.html
-== 2.html 2.html
-== 3.html 3.html
diff --git a/layout/reftests/forms/input/text/reftest-stylo.list b/layout/reftests/forms/input/text/reftest-stylo.list
deleted file mode 100644
index 86f890acd..000000000
--- a/layout/reftests/forms/input/text/reftest-stylo.list
+++ /dev/null
@@ -1,16 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== bounds-1.html bounds-1.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,121,84) == size-1.html size-1.html
-skip-if(B2G||Mulet) == size-2.html size-2.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-HTTP(..) == baseline-1.html baseline-1.html
-skip-if((B2G&&browserIsRemote)||Mulet) HTTP(..) == centering-1.xul centering-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet) == dynamic-height-1.xul dynamic-height-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-fuzzy-if(skiaContent,1,500) needs-focus == select.html select.html
-== intrinsic-size.html intrinsic-size.html
-== line-height-0.5.html line-height-0.5.html
-== line-height-1.5.html line-height-1.5.html
diff --git a/layout/reftests/forms/input/url/reftest-stylo.list b/layout/reftests/forms/input/url/reftest-stylo.list
deleted file mode 100644
index 021c5f861..000000000
--- a/layout/reftests/forms/input/url/reftest-stylo.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== 1.html 1.html
-== 2.html 2.html
-== 3.html 3.html
diff --git a/layout/reftests/forms/legend/reftest-stylo.list b/layout/reftests/forms/legend/reftest-stylo.list
deleted file mode 100644
index e622ffda4..000000000
--- a/layout/reftests/forms/legend/reftest-stylo.list
+++ /dev/null
@@ -1,5 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet) == legend.html legend.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == shadow-dom.html shadow-dom.html
-== 1273433.html 1273433.html
diff --git a/layout/reftests/forms/meter/default-style/reftest-stylo.list b/layout/reftests/forms/meter/default-style/reftest-stylo.list
deleted file mode 100644
index 55cd0b3e3..000000000
--- a/layout/reftests/forms/meter/default-style/reftest-stylo.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== default-style.html default-style.html
-== default-style-dyn.html default-style-dyn.html
diff --git a/layout/reftests/forms/meter/reftest-stylo.list b/layout/reftests/forms/meter/reftest-stylo.list
deleted file mode 100644
index ef10df30d..000000000
--- a/layout/reftests/forms/meter/reftest-stylo.list
+++ /dev/null
@@ -1,49 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(Android,128,16) == values.html values.html
-== values-rtl.html values-rtl.html
-== margin-padding.html margin-padding.html
-== margin-padding-rtl.html margin-padding-rtl.html
-skip-if(B2G||Mulet) == bar-pseudo-element.html bar-pseudo-element.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== bar-pseudo-element-rtl.html bar-pseudo-element-rtl.html
-
-# vertical tests
-== values-vertical.html values-vertical.html
-== values-vertical-rtl.html values-vertical-rtl.html
-== margin-padding-vertical.html margin-padding-vertical.html
-== margin-padding-vertical-rtl.html margin-padding-vertical-rtl.html
-skip-if(B2G||Mulet) == bar-pseudo-element-vertical.html bar-pseudo-element-vertical.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== bar-pseudo-element-vertical-rtl.html bar-pseudo-element-vertical-rtl.html
-
-# The following test is disabled but kept in the repository because the
-# transformations will not behave exactly the same for <meter> and two divs.
-# However, it would be possible to manually check those.
-# == transformations.html transformations.html
-
-# default style
-include default-style/reftest-stylo.list
-
-# Tests for bugs:
-== block-invalidate.html block-invalidate.html
-== in-cells.html in-cells.html
-== max-height.html max-height.html
-
-# Tests for block and inline orientation in combination with writing-mode
-# XXX Remove default-preferences setting here after bug 1138384 makes
-#     it the default for all channels
-
-== meter-orient-vertical.html meter-orient-vertical.html
-== meter-orient-horizontal.html meter-orient-horizontal.html
-== meter-orient-block.html meter-orient-block.html
-== meter-orient-inline.html meter-orient-inline.html
-== meter-vlr.html meter-vlr.html
-== meter-vlr-orient-block.html meter-vlr-orient-block.html
-== meter-vlr-orient-inline.html meter-vlr-orient-inline.html
-== meter-vlr-orient-horizontal.html meter-vlr-orient-horizontal.html
-skip == meter-vlr-orient-vertical.html meter-vlr-orient-vertical.html
-== meter-vrl.html meter-vrl.html
-== meter-vrl-orient-block.html meter-vrl-orient-block.html
-== meter-vrl-orient-inline.html meter-vrl-orient-inline.html
-== meter-vrl-orient-horizontal.html meter-vrl-orient-horizontal.html
-== meter-vrl-orient-vertical.html meter-vrl-orient-vertical.html
diff --git a/layout/reftests/forms/meter/reftest.list b/layout/reftests/forms/meter/reftest.list
index 0a92a6004..ec0b5fcb0 100644
--- a/layout/reftests/forms/meter/reftest.list
+++ b/layout/reftests/forms/meter/reftest.list
@@ -1,4 +1,4 @@
-fuzzy-if(Android,128,16) == values.html values-ref.html
+== values.html values-ref.html
 == values-rtl.html values-rtl-ref.html
 == margin-padding.html margin-padding-ref.html
 == margin-padding-rtl.html margin-padding-rtl-ref.html
diff --git a/layout/reftests/forms/output/reftest-stylo.list b/layout/reftests/forms/output/reftest-stylo.list
deleted file mode 100644
index b55dac96f..000000000
--- a/layout/reftests/forms/output/reftest-stylo.list
+++ /dev/null
@@ -1,8 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== output-1.html output-1.html
-== output-2.html output-2.html
-== output-3.html output-3.html
-== output-4.html output-4.html
-== output-5.html output-5.html
-== output-6.html output-6.html
-== output-7.html output-7.html
diff --git a/layout/reftests/forms/placeholder/reftest-stylo.list b/layout/reftests/forms/placeholder/reftest-stylo.list
deleted file mode 100644
index e6766e944..000000000
--- a/layout/reftests/forms/placeholder/reftest-stylo.list
+++ /dev/null
@@ -1,39 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# Tests using placeholder-focus-ref.html as a reference are disabled because
-# we can't change the caret colour nor disable it and we can't change the
-# text colour without changing the caret which means that the tested page has
-# a black caret with a grey text and the reference has a grey caret with grey
-# text. The only thing that is doable is to make the caret grey in the tested
-# page but that would make the test moot because a failure wouldn't be seen.
-# A real way to fix this would be to be able to style the caret or to implement
-# ::value (bug 648643), depending of the ::value behaviour (it could change the
-# caret colour and the text colour or just the text colour).
-
-== placeholder-1-text.html placeholder-1-text.html
-== placeholder-1-password.html placeholder-1-password.html
-== placeholder-1-textarea.html placeholder-1-textarea.html
-== placeholder-2.html placeholder-2.html
-== placeholder-2-textarea.html placeholder-2-textarea.html
-== placeholder-3.html placeholder-3.html
-== placeholder-4.html placeholder-4.html
-== placeholder-5.html placeholder-5.html
-fuzzy-if(winWidget,160,10) fuzzy-if(Android,1,1) fuzzy-if(asyncPan&&!layersGPUAccelerated,146,317) fuzzy-if(OSX==1010&&browserIsRemote,1,8) == placeholder-6.html placeholder-6.html
-skip-if(B2G||Mulet||(Android&&asyncPan)) == placeholder-6-textarea.html placeholder-6-textarea.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# needs-focus == placeholder-7.html placeholder-7.html
-# needs-focus == placeholder-8.html placeholder-8.html
-# needs-focus == placeholder-9.html placeholder-9.html
-needs-focus == placeholder-10.html placeholder-10.html
-== placeholder-11.html placeholder-11.html
-== placeholder-12.html placeholder-12.html
-== placeholder-13.html placeholder-13.html
-== placeholder-14.html placeholder-14.html
-== placeholder-18.html placeholder-18.html
-random-if(winWidget) skip-if((B2G&&browserIsRemote)||Mulet) == placeholder-19.xul placeholder-19.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-# needs-focus == placeholder-20.html placeholder-20.html
-needs-focus == placeholder-21.html placeholder-21.html
-needs-focus == placeholder-22.html placeholder-22.html
-== placeholder-rtl.html placeholder-rtl.html
-pref(dom.placeholder.show_on_focus,false) needs-focus == placeholder-focus-pref.html placeholder-focus-pref.html
diff --git a/layout/reftests/forms/placeholder/reftest.list b/layout/reftests/forms/placeholder/reftest.list
index 525b4ab74..3ba996083 100644
--- a/layout/reftests/forms/placeholder/reftest.list
+++ b/layout/reftests/forms/placeholder/reftest.list
@@ -16,8 +16,8 @@
 == placeholder-3.html placeholder-overridden-ref.html
 == placeholder-4.html placeholder-overridden-ref.html
 == placeholder-5.html placeholder-visible-ref.html
-fuzzy-if(winWidget,160,10) fuzzy-if(Android,1,1) fuzzy-if(asyncPan&&!layersGPUAccelerated,146,317) fuzzy-if(OSX==1010&&browserIsRemote,1,8) == placeholder-6.html placeholder-overflow-ref.html
-skip-if(Android&&asyncPan) == placeholder-6-textarea.html placeholder-overflow-textarea-ref.html
+fuzzy-if(winWidget,160,10) fuzzy-if(asyncPan&&!layersGPUAccelerated,146,317) fuzzy-if(OSX==1010&&browserIsRemote,1,8) == placeholder-6.html placeholder-overflow-ref.html
+== placeholder-6-textarea.html placeholder-overflow-textarea-ref.html
 # needs-focus == placeholder-7.html placeholder-focus-ref.html
 # needs-focus == placeholder-8.html placeholder-focus-ref.html
 # needs-focus == placeholder-9.html placeholder-focus-ref.html
diff --git a/layout/reftests/forms/progress/reftest-stylo.list b/layout/reftests/forms/progress/reftest-stylo.list
deleted file mode 100644
index 5019c4486..000000000
--- a/layout/reftests/forms/progress/reftest-stylo.list
+++ /dev/null
@@ -1,49 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-== values.html values.html
-== values-rtl.html values-rtl.html
-== margin-padding.html margin-padding.html
-== margin-padding-rtl.html margin-padding-rtl.html
-skip-if(B2G||Mulet) == bar-pseudo-element.html bar-pseudo-element.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== bar-pseudo-element-rtl.html bar-pseudo-element-rtl.html
-== indeterminate-style-width.html indeterminate-style-width.html
-
-# vertical tests
-== values-vertical.html values-vertical.html
-== values-vertical-rtl.html values-vertical-rtl.html
-== margin-padding-vertical.html margin-padding-vertical.html
-== margin-padding-vertical-rtl.html margin-padding-vertical-rtl.html
-skip-if(B2G||Mulet) == bar-pseudo-element-vertical.html bar-pseudo-element-vertical.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== bar-pseudo-element-vertical-rtl.html bar-pseudo-element-vertical-rtl.html
-== indeterminate-style-height.html indeterminate-style-height.html
-
-# The following test is disabled but kept in the repository because the
-# transformations will not behave exactly the same for <progress> and two divs.
-# However, it would be possible to manually check those.
-# == transformations.html transformations.html
-
-# Tests for bugs:
-== block-invalidate.html block-invalidate.html
-== in-cells.html in-cells.html
-== max-height.html max-height.html
-
-# Tests for block and inline orientation in combination with writing-mode
-# XXX Remove default-preferences setting here after bug 1138384 makes
-#     it the default for all channels
-
-== progress-orient-horizontal.html progress-orient-horizontal.html
-skip == progress-orient-vertical.html progress-orient-vertical.html
-# only OS X currently has direction-dependent rendering here
-== progress-orient-block.html progress-orient-block.html
-== progress-orient-inline.html progress-orient-inline.html
-== progress-vlr.html progress-vlr.html
-== progress-vlr-orient-block.html progress-vlr-orient-block.html
-== progress-vlr-orient-inline.html progress-vlr-orient-inline.html
-== progress-vlr-orient-horizontal.html progress-vlr-orient-horizontal.html
-== progress-vlr-orient-vertical.html progress-vlr-orient-vertical.html
-== progress-vrl.html progress-vrl.html
-== progress-vrl-orient-block.html progress-vrl-orient-block.html
-== progress-vrl-orient-inline.html progress-vrl-orient-inline.html
-== progress-vrl-orient-horizontal.html progress-vrl-orient-horizontal.html
-== progress-vrl-orient-vertical.html progress-vrl-orient-vertical.html
diff --git a/layout/reftests/forms/reftest-stylo.list b/layout/reftests/forms/reftest-stylo.list
deleted file mode 100644
index cfea24b9a..000000000
--- a/layout/reftests/forms/reftest-stylo.list
+++ /dev/null
@@ -1,36 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,10) HTTP(..) == text-control-baseline-1.html text-control-baseline-1.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-
-# button element
-include button/reftest-stylo.list
-
-# legend element
-include legend/reftest-stylo.list
-
-# fieldset element
-include fieldset/reftest-stylo.list
-
-# placeholder
-include placeholder/reftest-stylo.list
-
-# input
-include input/reftest-stylo.list
-
-# meter element
-include meter/reftest-stylo.list
-
-# output element
-include output/reftest-stylo.list
-
-# progress element
-include progress/reftest-stylo.list
-
-# select element
-include select/reftest-stylo.list
-
-# textarea element
-include textarea/reftest-stylo.list
-
-# textbox element
-include textbox/reftest-stylo.list
diff --git a/layout/reftests/forms/reftest.list b/layout/reftests/forms/reftest.list
index c7532077b..c587abe80 100644
--- a/layout/reftests/forms/reftest.list
+++ b/layout/reftests/forms/reftest.list
@@ -1,9 +1,9 @@
 fuzzy-if(skiaContent,1,10) HTTP(..) == text-control-baseline-1.html text-control-baseline-1-ref.html
-fuzzy-if(cocoaWidget,16,64) fuzzy-if(Android,52,64) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),104,224) fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),57,400) == display-block-baselines-1.html display-block-baselines-1-ref.html # anti-aliasing issues
+fuzzy-if(cocoaWidget,16,64) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),104,224) fuzzy-if(/^Windows\x20NT\x206\.2/.test(http.oscpu),57,400) == display-block-baselines-1.html display-block-baselines-1-ref.html # anti-aliasing issues
 == display-block-baselines-2.html display-block-baselines-2-ref.html
 == display-block-baselines-3.html display-block-baselines-3-ref.html
 == display-block-baselines-4.html display-block-baselines-4-ref.html
-fuzzy-if(Android,4,8) == display-block-baselines-5.html display-block-baselines-5-ref.html
+== display-block-baselines-5.html display-block-baselines-5-ref.html
 
 # button element
 include button/reftest.list
diff --git a/layout/reftests/forms/select/reftest-stylo.list b/layout/reftests/forms/select/reftest-stylo.list
deleted file mode 100644
index 998f27237..000000000
--- a/layout/reftests/forms/select/reftest-stylo.list
+++ /dev/null
@@ -1,15 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fuzzy-if(Android,2,2) skip-if(B2G||Mulet) == out-of-bounds-selectedindex.html out-of-bounds-selectedindex.html
-# test for bug 471741
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet) == multiple.html multiple.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== boguskids.html boguskids.html
-== dynamic-boguskids.html dynamic-boguskids.html
-== option-children.html option-children.html
-fuzzy(1,4) == padding-button-placement.html padding-button-placement.html
-HTTP(../..) == vertical-centering.html vertical-centering.html
-== 997709-2.html 997709-2.html
-needs-focus == focusring-1.html focusring-1.html
-needs-focus == focusring-2.html focusring-2.html
-needs-focus == focusring-3.html focusring-3.html
diff --git a/layout/reftests/forms/select/reftest.list b/layout/reftests/forms/select/reftest.list
index 1261dad9f..f3e0bc866 100644
--- a/layout/reftests/forms/select/reftest.list
+++ b/layout/reftests/forms/select/reftest.list
@@ -1,4 +1,4 @@
-fuzzy-if(Android,4,11) == out-of-bounds-selectedindex.html out-of-bounds-selectedindex-ref.html # test for bug 471741
+== out-of-bounds-selectedindex.html out-of-bounds-selectedindex-ref.html # test for bug 471741
 == multiple.html multiple-ref.html
 == boguskids.html boguskids-ref.html
 == dynamic-boguskids.html boguskids-ref.html
diff --git a/layout/reftests/forms/textarea/reftest-stylo.list b/layout/reftests/forms/textarea/reftest-stylo.list
deleted file mode 100644
index 0a050f16b..000000000
--- a/layout/reftests/forms/textarea/reftest-stylo.list
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip-if(B2G||Mulet||Android) == resize.html resize.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-# an offset seems to apply to the native resizer on windows so skip this test for now
-fails skip-if(B2G||Mulet||Android) skip-if(winWidget) fuzzy-if(cocoaWidget,1,33) fuzzy-if(skiaContent&&!winWidget,5,10) == resize-background.html resize-background.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet||Android) == ltr.html ltr.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet||Android) == ltr-scrollbar.html ltr-scrollbar.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip == in-ltr-doc-scrollbar.html in-ltr-doc-scrollbar.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet||Android) == ltr.html ltr.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet||Android) fails-if(xulRuntime.widgetToolkit=="gtk2") == rtl.html rtl.html
-# bug 834724
-# Initial mulet triage: parity with B2G/B2G Desktop
-== rtl.html rtl.html
-== rtl.html rtl.html
-== rtl.html rtl.html
-fuzzy-if(skiaContent,1,3) == setvalue-framereconstruction-1.html setvalue-framereconstruction-1.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,102,4168) == padding-scrollbar-placement.html padding-scrollbar-placement.html
-== various-cols.html various-cols.html
diff --git a/layout/reftests/forms/textarea/reftest.list b/layout/reftests/forms/textarea/reftest.list
index aee3654cb..15e285c0c 100644
--- a/layout/reftests/forms/textarea/reftest.list
+++ b/layout/reftests/forms/textarea/reftest.list
@@ -1,11 +1,11 @@
-skip-if(Android) == resize.html resize-ref.html
+== resize.html resize-ref.html
 # an offset seems to apply to the native resizer on windows so skip this test for now
-skip-if(Android) skip-if(winWidget) fuzzy-if(cocoaWidget,1,33) fuzzy-if(skiaContent&&!winWidget&&!Android,5,10) == resize-background.html resize-background-ref.html
-skip-if(Android) != ltr.html rtl.html
-skip-if(Android) != ltr-scrollbar.html rtl-scrollbar.html
-skip-if(Android) != in-ltr-doc-scrollbar.html in-rtl-doc-scrollbar.html
-skip-if(Android) != ltr.html no-resize.html
-skip-if(Android) fails-if(xulRuntime.widgetToolkit=="gtk2") != rtl.html no-resize.html # bug 834724
+skip-if(winWidget) fuzzy-if(cocoaWidget,1,33) fuzzy-if(skiaContent&&!winWidget,5,10) == resize-background.html resize-background-ref.html
+!= ltr.html rtl.html
+!= ltr-scrollbar.html rtl-scrollbar.html
+!= in-ltr-doc-scrollbar.html in-rtl-doc-scrollbar.html
+!= ltr.html no-resize.html
+fails-if(xulRuntime.widgetToolkit=="gtk2") != rtl.html no-resize.html # bug 834724
 == rtl.html rtl-dynamic-attr.html
 == rtl.html rtl-dynamic-style.html
 == rtl.html in-dynamic-rtl-doc.html
diff --git a/layout/reftests/forms/textbox/reftest-stylo.list b/layout/reftests/forms/textbox/reftest-stylo.list
deleted file mode 100644
index f14a2c20a..000000000
--- a/layout/reftests/forms/textbox/reftest-stylo.list
+++ /dev/null
@@ -1,28 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-# access-key tests are no use on OS X because access keys are not indicated visually
-# no real XUL theme on Android so we just skip
-skip-if(cocoaWidget||((B2G&&browserIsRemote)||Mulet)||Android) == accesskey-1.xul accesskey-1.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(cocoaWidget||((B2G&&browserIsRemote)||Mulet)||Android) == accesskey-2.xul accesskey-2.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-# accesskey-3 fails because of defects in XUL bidi support
-skip == accesskey-3.xul accesskey-3.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(cocoaWidget||((B2G&&browserIsRemote)||Mulet)||Android) == accesskey-3.xul accesskey-3.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(cocoaWidget||((B2G&&browserIsRemote)||Mulet)||Android) == accesskey-4.xul accesskey-4.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(cocoaWidget||((B2G&&browserIsRemote)||Mulet)||Android) == accesskey-4.xul accesskey-4.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if((B2G&&browserIsRemote)||Mulet||Android) == align-baseline-1.xul align-baseline-1.xul
-# test for bug 494901
-# Initial mulet triage: parity with B2G/B2G Desktop
-skip-if(B2G||Mulet||Android) == setsize.xul setsize.xul
-# bug 974780
-# Initial mulet triage: parity with B2G/B2G Desktop
diff --git a/layout/reftests/forms/textbox/reftest.list b/layout/reftests/forms/textbox/reftest.list
index eb0b8fc9d..8e955e597 100644
--- a/layout/reftests/forms/textbox/reftest.list
+++ b/layout/reftests/forms/textbox/reftest.list
@@ -1,11 +1,10 @@
 # access-key tests are no use on OS X because access keys are not indicated visually
-# no real XUL theme on Android so we just skip
-skip-if(cocoaWidget||Android) != accesskey-1.xul accesskey-1-notref.xul
-skip-if(cocoaWidget||Android) == accesskey-2.xul accesskey-2-ref.xul
+skip-if(cocoaWidget) != accesskey-1.xul accesskey-1-notref.xul
+skip-if(cocoaWidget) == accesskey-2.xul accesskey-2-ref.xul
 # accesskey-3 fails because of defects in XUL bidi support
-fails-if(!cocoaWidget) skip-if(cocoaWidget||Android) == accesskey-3.xul accesskey-3-ref.xul
-skip-if(cocoaWidget||Android) != accesskey-3.xul accesskey-3-notref.xul
-skip-if(cocoaWidget||Android) == accesskey-4.xul accesskey-4-ref.xul
-skip-if(cocoaWidget||Android) != accesskey-4.xul accesskey-4-notref.xul
-skip-if(Android) == align-baseline-1.xul align-baseline-1-ref.xul # test for bug 494901
-skip-if(Android) == setsize.xul setsize-ref.xul
+fails-if(!cocoaWidget) skip-if(cocoaWidget) == accesskey-3.xul accesskey-3-ref.xul
+skip-if(cocoaWidget) != accesskey-3.xul accesskey-3-notref.xul
+skip-if(cocoaWidget) == accesskey-4.xul accesskey-4-ref.xul
+skip-if(cocoaWidget) != accesskey-4.xul accesskey-4-notref.xul
+== align-baseline-1.xul align-baseline-1-ref.xul # test for bug 494901
+== setsize.xul setsize-ref.xul