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

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

2 files changed, 5 insertions, 71 deletions

diff --git a/layout/reftests/forms/button/reftest-stylo.list b/layout/reftests/forms/button/reftest-stylo.list
deleted file mode 100644
index c76d15c913..0000000000
--- 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 cefec2e85d..db314516df 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