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

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

2 files changed, 3 insertions, 47 deletions

diff --git a/layout/reftests/selection/reftest-stylo.list b/layout/reftests/selection/reftest-stylo.list
deleted file mode 100644
index c85f4468f..000000000
--- a/layout/reftests/selection/reftest-stylo.list
+++ /dev/null
@@ -1,43 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-fails fuzzy-if(skiaContent,1,30) == dynamic-text-1a.html dynamic-text-1a.html
-fails fuzzy-if(skiaContent,1,40) == dynamic-text-1b.html dynamic-text-1b.html
-== extend-1-sanity.html extend-1-sanity.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1a.html extend-1a.html
-fails fuzzy-if(skiaContent,1,10) == extend-1b.html extend-1b.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1c.html extend-1c.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1d.html extend-1d.html
-skip fuzzy-if(skiaContent,1,1000) == extend-1e.html extend-1e.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1f.html extend-1f.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1g.html extend-1g.html
-fails fuzzy-if(skiaContent,1,1000) == extend-1h.html extend-1h.html
-fails fuzzy-if(skiaContent,1,10) == extend-1i.html extend-1i.html
-== extend-2a.html extend-2a.html
-== extend-2b.html extend-2b.html
-== extend-3-sanity.html extend-3-sanity.html
-fuzzy-if(skiaContent,1,700) == extend-3a.html extend-3a.html
-fuzzy-if(skiaContent,1,700) == extend-3b.html extend-3b.html
-fuzzy-if(skiaContent,1,700) == extend-3c.html extend-3c.html
-fuzzy-if(skiaContent,1,700) == extend-3d.html extend-3d.html
-fuzzy-if(skiaContent,1,700) == extend-3e.html extend-3e.html
-fuzzy-if(skiaContent,1,700) == extend-3f.html extend-3f.html
-fuzzy-if(skiaContent,1,700) == extend-3g.html extend-3g.html
-fuzzy-if(skiaContent,1,700) == extend-3h.html extend-3h.html
-fuzzy-if(skiaContent,1,700) == extend-3i.html extend-3i.html
-== extend-4a.html extend-4a.html
-== extend-4b.html extend-4b.html
-# these 3 random-if(Android) are a difference of Native & Xul, see bug 739714
-skip random-if(Android||B2G||Mulet) needs-focus == pseudo-element-of-native-anonymous.html pseudo-element-of-native-anonymous.html
-# bug 676641
-# Initial mulet triage: parity with B2G/B2G Desktop
-# These tests uses Highlight and HighlightText color keywords, they are not same as text selection color on Mac.
-random-if(Android||B2G||Mulet) fails-if(cocoaWidget) needs-focus == non-themed-widget.html non-themed-widget.html
-# bug 773482
-# Initial mulet triage: parity with B2G/B2G Desktop
-random-if(Android||B2G||Mulet) fails-if(cocoaWidget) needs-focus == themed-widget.html themed-widget.html
-# Initial mulet triage: parity with B2G/B2G Desktop
-== addrange-1.html addrange-1.html
-fuzzy-if(skiaContent,1,1200) == addrange-2.html addrange-2.html
-skip == splitText-normalize.html splitText-normalize.html
-skip == modify-range.html modify-range.html
-skip == dom-mutations.html dom-mutations.html
-fuzzy-if(OSX==1010,9,1) fuzzy-if(OSX&&skiaContent,6,1) fuzzy-if(skiaContent&&!OSX,1,2138) == trailing-space-1.html trailing-space-1.html
diff --git a/layout/reftests/selection/reftest.list b/layout/reftests/selection/reftest.list
index 4b20b4790..024a9ea86 100644
--- a/layout/reftests/selection/reftest.list
+++ b/layout/reftests/selection/reftest.list
@@ -24,11 +24,10 @@ fuzzy-if(skiaContent,1,700) == extend-3h.html extend-3-ref.html
 fuzzy-if(skiaContent,1,700) == extend-3i.html extend-3-ref.html
 == extend-4a.html extend-4-ref.html
 == extend-4b.html extend-4-ref.html
-# these 3 random-if(Android) are a difference of Native & Xul, see bug 739714
-random-if(Android) needs-focus != pseudo-element-of-native-anonymous.html pseudo-element-of-native-anonymous-ref.html # bug 676641
+needs-focus != pseudo-element-of-native-anonymous.html pseudo-element-of-native-anonymous-ref.html # bug 676641
 # These tests uses Highlight and HighlightText color keywords, they are not same as text selection color on Mac.
-random-if(Android) fails-if(cocoaWidget) needs-focus == non-themed-widget.html non-themed-widget-ref.html
-random-if(Android) fails-if(cocoaWidget) needs-focus == themed-widget.html themed-widget-ref.html
+fails-if(cocoaWidget) needs-focus == non-themed-widget.html non-themed-widget-ref.html
+fails-if(cocoaWidget) needs-focus == themed-widget.html themed-widget-ref.html
 == addrange-1.html addrange-ref.html
 fuzzy-if(skiaContent,1,1200) == addrange-2.html addrange-ref.html
 == splitText-normalize.html splitText-normalize-ref.html