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, 93 deletions

diff --git a/layout/reftests/native-theme/reftest-stylo.list b/layout/reftests/native-theme/reftest-stylo.list
deleted file mode 100644
index f5cf1b75a..000000000
--- a/layout/reftests/native-theme/reftest-stylo.list
+++ /dev/null
@@ -1,88 +0,0 @@
-# DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
-skip == button-html-not-blank.html button-html-not-blank.html
-skip == button-not-blank.html button-not-blank.html
-skip == checkbox-not-blank.html checkbox-not-blank.html
-skip == combobox-not-blank.html combobox-not-blank.html
-skip == fieldset-not-blank.html fieldset-not-blank.html
-skip == file-not-blank.html file-not-blank.html
-skip == listbox-not-blank.html listbox-not-blank.html
-skip == radio-not-blank.html radio-not-blank.html
-skip == text-control-not-blank.html text-control-not-blank.html
-skip == textarea-not-blank.html textarea-not-blank.html
-
-# The following tests will fail if the platform does not have native
-# theme support (which all platforms should have).
-fails-if(!nativeThemePref) == text-input-native.html text-input-native.html
-fails fuzzy-if(skiaContent,2,88) == text-input-nonnative-when-styled.html text-input-nonnative-when-styled.html
-fails-if(!nativeThemePref) == textarea-native.html textarea-native.html
-fails fuzzy-if(skiaContent,2,53) == textarea-nonnative-when-styled.html textarea-nonnative-when-styled.html
-fails-if(!nativeThemePref) == button-native.html button-native.html
-== button-nonnative-when-styled.html button-nonnative-when-styled.html
-skip fails-if(!nativeThemePref&&!Android) == combobox-native.html combobox-native.html
-== combobox-nonnative-when-styled.html combobox-nonnative-when-styled.html
-fails-if(!nativeThemePref) needs-focus == listbox-native.html listbox-native.html
-needs-focus == listbox-nonnative-when-styled.html listbox-nonnative-when-styled.html
-fails-if(!nativeThemePref) == radio-native.html radio-native.html
-== radio-still-native-when-styled.html radio-still-native-when-styled.html
-fails-if(!nativeThemePref) == checkbox-native.html checkbox-native.html
-== checkbox-still-native-when-styled.html checkbox-still-native-when-styled.html
-== native-theme-disabled-cascade-levels.html native-theme-disabled-cascade-levels.html
-
-== 427122-1.html 427122-1.html
-
-# 403458 is a Windows-only bug
-skip-if(!winWidget) == 403458-winmenu-ltr.xul 403458-winmenu-ltr.xul
-
-== 470711-1.xul 470711-1.xul
-
-== 482955-1.xul 482955-1.xul
-
-== 492155-1.html 492155-1.html
-== 492155-2.html 492155-2.html
-== 492155-3.html 492155-3.html
-fails-if(Android&&!asyncPan) == 492155-4.html 492155-4.html
-
-== box-shadow-input.html box-shadow-input.html
-== box-shadow-button.html box-shadow-button.html
-== box-shadow-listbox.html box-shadow-listbox.html
-== box-shadow-combobox.html box-shadow-combobox.html
-
-# RTL mirroring tests
-== checkbox-not-mirrored-when-rtl.html checkbox-not-mirrored-when-rtl.html
-skip-if(!cocoaWidget) == menulist-mirrored-when-rtl.xul menulist-mirrored-when-rtl.xul
-skip-if(!cocoaWidget) == searchfield-mirrored-when-rtl.xul searchfield-mirrored-when-rtl.xul
-skip-if(!cocoaWidget) == select-mirrored-when-rtl.html select-mirrored-when-rtl.html
-
-== resizer-bottomend.xul resizer-bottomend.xul
-random-if(d2d) == resizer-bottomend.xul resizer-bottomend.xul
-# bug 581086 
-== resizer-bottomend.xul resizer-bottomend.xul
-skip-if(gtkWidget) == resizer-bottomend-rtl.xul resizer-bottomend-rtl.xul
-skip-if(gtkWidget) random-if(d2d) == resizer-bottomend-rtl.xul resizer-bottomend-rtl.xul
-# bug 581086
-
-== resizer-bottomstart.xul resizer-bottomstart.xul
-random-if(d2d) == resizer-bottomstart.xul resizer-bottomstart.xul
-random-if(d2d) == resizer-bottomstart.xul resizer-bottomstart.xul
-== resizer-bottomstart.xul resizer-bottomstart.xul
-skip-if(gtkWidget) == resizer-bottomstart-rtl.xul resizer-bottomstart-rtl.xul
-skip-if(gtkWidget) random-if(d2d) == resizer-bottomstart-rtl.xul resizer-bottomstart-rtl.xul
-
-# Windows-only, depends on native scrollbar metrics
-skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minimum-size-notheme.html
-# skip-if(!winWidget) == scroll-thumb-minimum-size-theme.html scroll-thumb-minimum-size-theme.html
-# Bug 512206
-
-== border-radius.html border-radius.html
-
-== checkbox-dynamic-1.html checkbox-dynamic-1.html
-
-# These tests have been written to test the overflow of the window widget
-# (bug 568825) but we can't test it on Windows and Cocoa because they have
-# animated progress bars.
-# Nothing shows up on Android, presumably because that appearance type is
-# not implemented.
-skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow.html progress-overflow.html
-fails-if(Android) skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow-small.html progress-overflow-small.html
-
-== 676387-1.xul 676387-1.xul
diff --git a/layout/reftests/native-theme/reftest.list b/layout/reftests/native-theme/reftest.list
index c2df3caaa..c2a000ffa 100644
--- a/layout/reftests/native-theme/reftest.list
+++ b/layout/reftests/native-theme/reftest.list
@@ -17,7 +17,7 @@ fails-if(!nativeThemePref) != textarea-native.html textarea-nonnative.html
 fuzzy-if(skiaContent,2,53) == textarea-nonnative-when-styled.html textarea-nonnative-when-styled-ref.html
 fails-if(!nativeThemePref) != button-native.html button-nonnative.html
 == button-nonnative-when-styled.html button-nonnative-when-styled-ref.html
-fails-if(!nativeThemePref&&!Android) != combobox-native.html combobox-nonnative.html
+fails-if(!nativeThemePref) != combobox-native.html combobox-nonnative.html
 == combobox-nonnative-when-styled.html combobox-nonnative-when-styled-ref.html
 fails-if(!nativeThemePref) needs-focus != listbox-native.html listbox-nonnative.html
 needs-focus == listbox-nonnative-when-styled.html listbox-nonnative-when-styled-ref.html
@@ -39,7 +39,7 @@ skip-if(!winWidget) != 403458-winmenu-ltr.xul 403458-winmenu-rtl.xul
 == 492155-1.html about:blank
 == 492155-2.html about:blank
 == 492155-3.html about:blank
-fails-if(Android&&!asyncPan) != 492155-4.html about:blank
+!= 492155-4.html about:blank
 
 != box-shadow-input.html box-shadow-input-ref.html
 != box-shadow-button.html box-shadow-button-ref.html
@@ -76,9 +76,7 @@ skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minim
 # These tests have been written to test the overflow of the window widget
 # (bug 568825) but we can't test it on Windows and Cocoa because they have
 # animated progress bars.
-# Nothing shows up on Android, presumably because that appearance type is
-# not implemented.
 skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow.html progress-overflow-ref.html
-fails-if(Android) skip-if(cocoaWidget) skip-if(winWidget) != progress-overflow-small.html progress-nobar.html
+skip-if(cocoaWidget) skip-if(winWidget) != progress-overflow-small.html progress-nobar.html
 
 == 676387-1.xul 676387-1-ref.xul