Bug 676831 - Mark Android OpenGL Reftest failures for regression testing. r=joe
authorBenoit Girard <b56girard@gmail.com>
Mon, 19 Sep 2011 13:05:15 -0700
changeset 77654 5edba813e1e600de8592d2b81ff76967e1882175
parent 77653 f5ce0b70c2e1bf3c7ffa99c76d5dc0e0cf2f943c
child 77655 de97f86d572ea9dc714189c873fa0864c20314f8
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewersjoe
bugs676831
milestone9.0a1
Bug 676831 - Mark Android OpenGL Reftest failures for regression testing. r=joe
content/html/content/reftests/reftest.list
dom/plugins/test/reftest/reftest.list
layout/reftests/border-radius/reftest.list
layout/reftests/canvas/reftest.list
layout/reftests/margin-collapsing/reftest.list
layout/reftests/marquee/reftest.list
layout/reftests/mathml/reftest.list
layout/reftests/ogg-video/reftest.list
layout/reftests/reftest-sanity/reftest.list
layout/reftests/reftest.list
layout/reftests/scrolling/reftest.list
layout/reftests/selection/reftest.list
layout/reftests/svg/as-image/reftest.list
layout/reftests/svg/moz-only/reftest.list
layout/reftests/svg/reftest.list
layout/reftests/svg/smil/event/reftest.list
layout/reftests/svg/smil/reftest.list
layout/reftests/svg/smil/transform/reftest.list
layout/reftests/text-overflow/reftest.list
layout/reftests/text/reftest.list
layout/reftests/webm-video/reftest.list
layout/xul/base/src/grid/reftests/reftest.list
--- a/content/html/content/reftests/reftest.list
+++ b/content/html/content/reftests/reftest.list
@@ -19,17 +19,17 @@ include autofocus/reftest.list
 == 596455-1a.html 596455-ref-1.html
 == 596455-1b.html 596455-ref-1.html
 == 596455-2a.html 596455-ref-2.html
 == 596455-2b.html 596455-ref-2.html
 == 610935.html 610935-ref.html
 == 649134-1.html 649134-ref.html
 skip-if(Android) == 649134-2.html 649134-2-ref.html
 
-== hidden-1a.html hidden-1-ref.html
+skip-if(Android&&layersOpenGL) == hidden-1a.html hidden-1-ref.html
 == hidden-1b.html hidden-1-ref.html
 == hidden-1c.html hidden-1-ref.html
 == hidden-1d.html hidden-1-ref.html
 == hidden-1e.html hidden-1-ref.html
 == hidden-1f.html hidden-1-ref.html
 == hidden-1g.html hidden-1-ref.html
 == hidden-2.svg hidden-2-ref.svg
 == href-attr-change-restyles.html href-attr-change-restyles-ref.html
--- a/dom/plugins/test/reftest/reftest.list
+++ b/dom/plugins/test/reftest/reftest.list
@@ -4,18 +4,18 @@ fails-if(!haveTestPlugin) == plugin-sani
 fails-if(!haveTestPlugin) == plugin-alpha-zindex.html div-alpha-zindex.html
 fails-if(!haveTestPlugin) == plugin-alpha-opacity.html div-alpha-opacity.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == windowless-clipping-1.html windowless-clipping-1-ref.html # bug 631832
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-1.html border-padding-1-ref.html # bug 629430
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == border-padding-2.html border-padding-2-ref.html # bug 629430
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) skip-if(Android) == border-padding-3.html border-padding-3-ref.html # bug 629430
 random-if(cocoaWidget||d2d) fails-if(!haveTestPlugin&&!Android) skip-if(!testPluginIsOOP()) == pluginproblemui-direction-1.html pluginproblemui-direction-1-ref.html
 random-if(cocoaWidget) fails-if(!haveTestPlugin&&!Android) skip-if(!testPluginIsOOP()) == pluginproblemui-direction-2.html pluginproblemui-direction-2-ref.html
-fails-if(!haveTestPlugin) == plugin-canvas-alpha-zindex.html div-alpha-zindex.html
-fails-if(!haveTestPlugin) == plugin-transform-alpha-zindex.html div-alpha-zindex.html
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-busy-alpha-zindex.html div-alpha-zindex.html
+fails-if(!haveTestPlugin) skip-if(Android&&layersOpenGL) == plugin-canvas-alpha-zindex.html div-alpha-zindex.html
+fails-if(!haveTestPlugin) skip-if(Android&&layersOpenGL) == plugin-transform-alpha-zindex.html div-alpha-zindex.html
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) skip-if(Android&&layersOpenGL) == plugin-busy-alpha-zindex.html div-alpha-zindex.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background.html plugin-background-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background-1-step.html plugin-background-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background-2-step.html plugin-background-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background-5-step.html plugin-background-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fails-if(!haveTestPlugin) == plugin-background-10-step.html plugin-background-ref.html
 random-if(!haveTestPlugin) == plugin-transform-1.html plugin-transform-1-ref.html
 fails-if(!haveTestPlugin) fails-if(http.platform=="X11"&&!layersGPUAccelerated) == plugin-transform-2.html plugin-transform-2-ref.html # bug 468496
--- a/layout/reftests/border-radius/reftest.list
+++ b/layout/reftests/border-radius/reftest.list
@@ -32,17 +32,17 @@ random == corner-2.html corner-2-ref.svg
 
 # Test that radii too long are reduced
 == border-reduce-height.html border-reduce-height-ref.html
 
 # Tests for border clipping
 fails == clipping-1.html clipping-1-ref.html # background color should completely fill box; bug 466572
 != clipping-2.html about:blank # background color clipped to inner/outer border, can't get
 # great tests for this due to antialiasing problems described in bug 466572
-== clipping-3.html clipping-3-ref.xhtml # edge of border-radius clips an underlying object's background
+fails-if(Android&&layersOpenGL) == clipping-3.html clipping-3-ref.xhtml # edge of border-radius clips an underlying object's background
 
 # Tests for clipping the contents of replaced elements and overflow!=visible
 != clipping-4-ref.html clipping-4-notref.html
 fails-if(cocoaWidget) == clipping-4-canvas.html clipping-4-ref.html
 fails-if(Android) == clipping-4-image.html clipping-4-ref.html
 == clipping-4-overflow-hidden.html clipping-4-ref.html
 == clipping-5-canvas.html clipping-5-refc.html
 == clipping-5-image.html clipping-5-refi.html
@@ -58,24 +58,24 @@ fails-if(cocoaWidget) == intersecting-cl
 
 # Inheritance
 == inherit-1.html inherit-1-ref.html # border-radius shouldn't inherit
 
 # Table elements
 == table-collapse-1.html table-collapse-1-ref.html # border-radius is ignored on internal table elements
 # when border-collapse: collapse
 
-== invalidate-1a.html invalidate-1-ref.html
-== invalidate-1b.html invalidate-1-ref.html
+fails-if(Android&&layersOpenGL) == invalidate-1a.html invalidate-1-ref.html
+fails-if(Android&&layersOpenGL) == invalidate-1b.html invalidate-1-ref.html
 
 # test that border-radius is reduced for scrollbars
 fails-if(Android) == scrollbar-clamping-1.html scrollbar-clamping-1-ref.html
 fails-if(Android) == scrollbar-clamping-2.html scrollbar-clamping-2-ref.html
 
 # Test for bad corner joins.
 == corner-joins-1.xhtml corner-joins-1-ref.xhtml
 random-if(winWidget) HTTP(..) == corner-joins-2.xhtml corner-joins-2-ref.xhtml
 
-== scroll-1.html scroll-1-ref.html # see bug 602892
+fails-if(Android&&layersOpenGL) == scroll-1.html scroll-1-ref.html # see bug 602892
 
 == zero-radius-clip-1.html zero-radius-clip-ref.html
 
 == iframe-1.html iframe-1-ref.html
--- a/layout/reftests/canvas/reftest.list
+++ b/layout/reftests/canvas/reftest.list
@@ -1,10 +1,10 @@
 == default-size.html default-size-ref.html
-== size-1.html size-1-ref.html
+fails-if(Android&&layersOpenGL) == size-1.html size-1-ref.html
 
 == image-rendering-test.html image-rendering-ref.html
 == image-shadow.html image-shadow-ref.html
 
 asserts-if(cocoaWidget,0-2) == size-change-1.html size-change-1-ref.html
 
 != text-ltr-left.html text-blank.html
 != text-ltr-right.html text-blank.html
--- a/layout/reftests/margin-collapsing/reftest.list
+++ b/layout/reftests/margin-collapsing/reftest.list
@@ -1,39 +1,39 @@
 == inline-horizontal-1.html inline-horizontal-1-ref.html
 != inline-horizontal-1.html inline-horizontal-1-noref.html
 == inline-horizontal-2.html inline-horizontal-2-ref.html
 != inline-horizontal-2.html inline-horizontal-2-noref.html
 == inline-horizontal-1-dyn.html inline-horizontal-1-ref.html
 != inline-horizontal-1-dyn.html inline-horizontal-1-noref.html
-== inline-horizontal-2-dyn.html inline-horizontal-2-ref.html
+fails-if(Android&&layersOpenGL) == inline-horizontal-2-dyn.html inline-horizontal-2-ref.html
 != inline-horizontal-2-dyn.html inline-horizontal-2-noref.html
 == block-horizontal-1.html block-horizontal-1-ref.html
 != block-horizontal-1.html block-horizontal-1-noref.html
 == block-horizontal-2.html block-horizontal-2-ref.html
 != block-horizontal-2.html block-horizontal-2-noref.html
 == block-horizontal-3.html block-horizontal-3-ref.html
 != block-horizontal-3.html block-horizontal-3-noref.html
 == block-horizontal-4.html block-horizontal-4-ref.html
 != block-horizontal-4.html block-horizontal-4-noref.html
 == block-horizontal-1-dyn.html block-horizontal-1-ref.html
 != block-horizontal-1-dyn.html block-horizontal-1-noref.html
 == block-horizontal-2-dyn.html block-horizontal-2-ref.html
 != block-horizontal-2-dyn.html block-horizontal-2-noref.html
-== block-horizontal-3-dyn.html block-horizontal-3-ref.html
+fails-if(Android&&layersOpenGL) == block-horizontal-3-dyn.html block-horizontal-3-ref.html
 != block-horizontal-3-dyn.html block-horizontal-3-noref.html
-== block-horizontal-4-dyn.html block-horizontal-4-ref.html
+fails-if(Android&&layersOpenGL) == block-horizontal-4-dyn.html block-horizontal-4-ref.html
 != block-horizontal-4-dyn.html block-horizontal-4-noref.html
 == inline-block-horizontal-1.html inline-block-horizontal-1-ref.html
 != inline-block-horizontal-1.html inline-block-horizontal-1-noref.html
 == inline-block-horizontal-2.html inline-block-horizontal-2-ref.html
 != inline-block-horizontal-2.html inline-block-horizontal-2-noref.html
 == inline-block-horizontal-1-dyn.html inline-block-horizontal-1-ref.html
 != inline-block-horizontal-1-dyn.html inline-block-horizontal-1-noref.html
-== inline-block-horizontal-2-dyn.html inline-block-horizontal-2-ref.html
+fails-if(Android&&layersOpenGL) == inline-block-horizontal-2-dyn.html inline-block-horizontal-2-ref.html
 != inline-block-horizontal-2-dyn.html inline-block-horizontal-2-noref.html
 == inline-table-horizontal-1.html inline-table-horizontal-1-ref.html
 != inline-table-horizontal-1.html inline-table-horizontal-1-noref.html
 == inline-table-horizontal-1-dyn.html inline-table-horizontal-1-ref.html
 != inline-table-horizontal-1-dyn.html inline-table-horizontal-1-noref.html
 == block-sibling-1a.html block-sibling-1-ref.html
 == block-sibling-1a.html block-sibling-1-ref2.html
 != block-sibling-1a.html block-sibling-1-noref.html
@@ -53,18 +53,18 @@
 == block-sibling-1a-dyn.html block-sibling-1-ref2.html
 != block-sibling-1a-dyn.html block-sibling-1-noref.html
 == block-sibling-1b-dyn.html block-sibling-1-ref.html
 == block-sibling-1b-dyn.html block-sibling-1-ref2.html
 != block-sibling-1b-dyn.html block-sibling-1-noref.html
 == block-sibling-1c-dyn.html block-sibling-1-ref.html
 == block-sibling-1c-dyn.html block-sibling-1-ref2.html
 != block-sibling-1c-dyn.html block-sibling-1-noref2.html
-== block-sibling-2-dyn.html block-sibling-2-ref.html
-== block-sibling-2-dyn.html block-sibling-2-ref2.html
+fails-if(Android&&layersOpenGL) == block-sibling-2-dyn.html block-sibling-2-ref.html
+fails-if(Android&&layersOpenGL) == block-sibling-2-dyn.html block-sibling-2-ref2.html
 != block-sibling-2-dyn.html block-sibling-2-noref.html
 == block-sibling-3-dyn.html block-sibling-1-ref.html
 == block-sibling-3-dyn.html block-sibling-1-ref2.html
 != block-sibling-3-dyn.html block-sibling-1-noref.html
 == block-negative-1a.html block-negative-1-ref.html
 == block-negative-1b.html block-negative-1-ref.html
 == block-negative-2a.html block-negative-2-ref.html
 == block-negative-2b.html block-negative-2-ref.html
--- a/layout/reftests/marquee/reftest.list
+++ b/layout/reftests/marquee/reftest.list
@@ -1,9 +1,9 @@
 == 166591-dynamic-1.html 166591-dynamic-1-ref.html
-== 336736-1a.html 336736-1-ref.html
-== 336736-1b.html 336736-1-ref.html
+fails-if(Android&&layersOpenGL) == 336736-1a.html 336736-1-ref.html
+fails-if(Android&&layersOpenGL) == 336736-1b.html 336736-1-ref.html
 == 406073-1.html 406073-1-ref.html
 == 407016-2.html 407016-2-ref.html
-== 413027-4.html 413027-4-ref.html
+fails-if(Android&&layersOpenGL) == 413027-4.html 413027-4-ref.html
 == 425247-1.html 425247-1-ref.html
 == 425247-2.html 425247-2-ref.html
 random == 429849-1.html 429849-1-ref.html # bug 432288
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@@ -16,17 +16,17 @@
 == mfenced-7.html mfenced-7-ref.html
 != mfenced-8.html mfenced-8-ref.html
 == mfenced-9.html mfenced-9-ref.html
 fails-if(winWidget) == mfenced-10.html mfenced-10-ref.html
 == mi-mathvariant-1.xhtml mi-mathvariant-1-ref.xhtml
 == mi-mathvariant-2.xhtml mi-mathvariant-2-ref.xhtml
 != non-spacing-accent-1.xhtml non-spacing-accent-1-ref.xhtml
 == overbar-width-1.xhtml overbar-width-1-ref.xhtml
-== quotes-1.xhtml quotes-1-ref.xhtml
+fails-if(Android&&layersOpenGL) == quotes-1.xhtml quotes-1-ref.xhtml
 != stretchy-underbar-1.xhtml stretchy-underbar-1-ref.xhtml 
 == table-width-1.xhtml table-width-1-ref.xhtml
 == underbar-width-1.xhtml underbar-width-1-ref.xhtml
 == mathml-type-supported.xhtml mathml-type-supported-ref.xml
 == mtable-align-negative-rownumber.html mtable-align-negative-rownumber-ref.html
 != embellished-op-1-1.html embellished-op-1-1-ref.html
 != embellished-op-1-2.html embellished-op-1-2-ref.html
 != embellished-op-1-3.html embellished-op-1-3-ref.html
--- a/layout/reftests/ogg-video/reftest.list
+++ b/layout/reftests/ogg-video/reftest.list
@@ -1,18 +1,18 @@
 fails-if(Android) HTTP(..) == aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
 fails-if(Android) HTTP(..) == aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
 fails-if(Android) skip-if(gtk2Widget) HTTP(..) == aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
 fails-if(Android) skip-if(gtk2Widget) HTTP(..) == aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
 HTTP(..) == aspect-ratio-3a.xhtml aspect-ratio-3-ref.xhtml
 HTTP(..) == aspect-ratio-3b.xhtml aspect-ratio-3-ref.xhtml
 fails-if(Android) random-if(layersGPUAccelerated) fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu))  == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html # bug 623460 for WinXP
 fails-if(Android) HTTP(..) == basic-1.xhtml basic-1-ref.html
-skip-if(Android) HTTP(..) == canvas-1a.xhtml basic-1-ref.html
-fails-if(Android) HTTP(..) == canvas-1b.xhtml basic-1-ref.html
+skip-if(Android) skip-if(Android&&layersOpenGL) HTTP(..) == canvas-1a.xhtml basic-1-ref.html
+fails-if(Android) skip-if(Android&&layersOpenGL) HTTP(..) == canvas-1b.xhtml basic-1-ref.html
 == clipping-1a.html clipping-1-ref.html
 == empty-1a.html empty-1-ref.html
 == empty-1b.html empty-1-ref.html
 #these is skipped because we hang on the htmlparser tests when this is ran
 random skip-if(Android) HTTP(..) == object-aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
 random skip-if(Android) HTTP(..) == object-aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
 skip-if(Android) HTTP(..) == offset-1.xhtml offset-1-ref.html
 random skip-if(Android) HTTP(..) == object-aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
--- a/layout/reftests/reftest-sanity/reftest.list
+++ b/layout/reftests/reftest-sanity/reftest.list
@@ -84,17 +84,17 @@ needs-focus load needs-focus.html
 
 # Bug 632636
 fails == data:text/plain,HELLO about:blank
 needs-focus == data:text/plain, about:blank
 
 # Sanity check of viewport+displayport overrides
 fails-if(!browserIsRemote) == test-displayport.html test-displayport-ref.html # bug 593168
 skip-if(!browserIsRemote) != test-displayport-2.html test-displayport-ref.html # bug 593168
-skip-if(!browserIsRemote) == 647192-1.html 647192-1-ref.html
+skip-if(!browserIsRemote) fails-if(Android&&layersOpenGL) == 647192-1.html 647192-1-ref.html
 skip-if(!browserIsRemote) == 656041-1.html 656041-1-ref.html
 
 # IPC Position-fixed frames/layers test
 # Fixed layers are temporarily disabled (bug 656167).
 #== test-pos-fixed.html test-pos-fixed-ref.html
 == test-bg-attachment-fixed.html test-bg-attachment-fixed-ref.html
 
 # reftest syntax: require-or
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -34,17 +34,17 @@ include box-properties/reftest.list
 
 # box-shadow/
 skip-if(Android) include box-shadow/reftest.list
 
 # bugs/
 skip-if(Android) include bugs/reftest.list
 
 # canvas 2D
-include canvas/reftest.list
+skip-if(Android&&layersOpenGL) include canvas/reftest.list
 
 # css calc() tests
 include css-calc/reftest.list
 
 # css character encoding tests
 include css-charset/reftest.list
 
 # css default pseudo class tests
@@ -55,17 +55,17 @@ skip-if(Android) include css-disabled/re
 
 # css :enable tests
 skip-if(Android) include css-enabled/reftest.list
 
 # css @import tests
 include css-import/reftest.list
 
 # css gradients
-include css-gradients/reftest.list
+skip-if(Android&&layersOpenGL) include css-gradients/reftest.list
 
 # css media queries (tests for print mode)
 include css-mediaqueries/reftest.list
 
 # css namespaces
 include css-namespace/reftest.list
 
 # css parsing
@@ -160,17 +160,17 @@ include ../../gfx/tests/reftest/reftest.
 
 # block-inside-inline splits
 include ib-split/reftest.list
 
 # image/
 include image/reftest.list
 
 # image-element/
-include image-element/reftest.list
+skip-if(Android&&layersOpenGL) include image-element/reftest.list
 
 # image-rect/
 include image-rect/reftest.list
 
 # image-region/
 include image-region/reftest.list
 
 # inline borders and padding
@@ -227,17 +227,17 @@ include pagination/reftest.list
 
 # scrolling
 include scrolling/reftest.list
 
 # selection
 include selection/reftest.list
 
 # svg/
-include svg/reftest.list
+skip-if(Android&&layersOpenGL) include svg/reftest.list
 
 # tab-size/
 include tab-size/reftest.list
 
 # table-anonymous-boxes/
 include table-anonymous-boxes/reftest.list
 
 # table-background/
--- a/layout/reftests/scrolling/reftest.list
+++ b/layout/reftests/scrolling/reftest.list
@@ -1,13 +1,13 @@
 HTTP == fixed-1.html fixed-1.html?ref
 HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
 HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref
-HTTP == fixed-text-1.html fixed-text-1.html?ref
-HTTP == fixed-text-2.html fixed-text-2.html?ref
+fails-if(Android&&layersOpenGL) HTTP == fixed-text-1.html fixed-text-1.html?ref
+fails-if(Android&&layersOpenGL) HTTP == fixed-text-2.html fixed-text-2.html?ref
 HTTP == opacity-mixed-scrolling-1.html opacity-mixed-scrolling-1.html?ref
-random-if(cocoaWidget) HTTP == opacity-mixed-scrolling-2.html opacity-mixed-scrolling-2.html?ref # see bug 625357
-HTTP == simple-1.html simple-1.html?ref
+random-if(cocoaWidget) fails-if(Android&&layersOpenGL) HTTP == opacity-mixed-scrolling-2.html opacity-mixed-scrolling-2.html?ref # see bug 625357
+fails-if(Android&&layersOpenGL) HTTP == simple-1.html simple-1.html?ref
 HTTP == text-1.html text-1.html?ref
 HTTP == transformed-1.html transformed-1.html?ref
 HTTP == transformed-1.html?up transformed-1.html?ref
-== uncovering-1.html uncovering-1-ref.html
-== uncovering-2.html uncovering-2-ref.html
+fails-if(Android&&layersOpenGL) == uncovering-1.html uncovering-1-ref.html
+fails-if(Android&&layersOpenGL) == uncovering-2.html uncovering-2-ref.html
--- a/layout/reftests/selection/reftest.list
+++ b/layout/reftests/selection/reftest.list
@@ -1,9 +1,9 @@
-== dynamic-text-1a.html dynamic-text-1-ref.html
+fails-if(Android&&layersOpenGL) == dynamic-text-1a.html dynamic-text-1-ref.html
 == dynamic-text-1b.html dynamic-text-1-ref.html
 != extend-1-sanity.html extend-1-ref.html
 == extend-1a.html extend-1-ref.html
 == extend-1b.html extend-1-ref.html
 == extend-1c.html extend-1-ref.html
 == extend-1d.html extend-1-ref.html
 == extend-1e.html extend-1-ref.html
 == extend-1f.html extend-1-ref.html
@@ -13,21 +13,21 @@
 == extend-2a.html extend-2-ref.html
 == extend-2b.html extend-2-ref.html
 != extend-3-sanity.html extend-3-ref.html
 == extend-3a.html extend-3-ref.html
 == extend-3b.html extend-3-ref.html
 == extend-3c.html extend-3-ref.html
 == extend-3d.html extend-3-ref.html
 == extend-3e.html extend-3-ref.html
-== extend-3f.html extend-3-ref.html
+fails-if(Android&&layersOpenGL) == extend-3f.html extend-3-ref.html
 == extend-3g.html extend-3-ref.html
-== extend-3h.html extend-3-ref.html
+fails-if(Android&&layersOpenGL) == extend-3h.html extend-3-ref.html
 == extend-3i.html extend-3-ref.html
 == extend-4a.html extend-4-ref.html
 == extend-4b.html extend-4-ref.html
 fails-if(Android) != 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.
 fails-if(cocoaWidget) == non-themed-widget.html non-themed-widget-ref.html
 fails-if(cocoaWidget) == themed-widget.html themed-widget-ref.html
 == addrange-1.html addrange-ref.html
 == addrange-2.html addrange-ref.html
-== splitText-normalize.html splitText-normalize-ref.html
+fails-if(Android&&layersOpenGL) == splitText-normalize.html splitText-normalize-ref.html
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@@ -23,28 +23,28 @@ include zoom/reftest.list
 
 # Test for -moz-border-image
 == border-image-simple-1.html       lime100x100-ref.html
 == border-image-simple-2.html       lime100x100-ref.html
 
 # Test for canvas "drawImage" method
 # NOTE: The canvas reftests that involve scaling currently fail with fuzziness
 # on various edges, as noted below. These will be fixed in followup bugs.
-== canvas-drawImage-simple-1a.html lime100x100-ref.html
-== canvas-drawImage-simple-1b.html lime100x100-ref.html
+skip-if(Android&&layersOpenGL) == canvas-drawImage-simple-1a.html lime100x100-ref.html
+skip-if(Android&&layersOpenGL) == canvas-drawImage-simple-1b.html lime100x100-ref.html
 
-== canvas-drawImage-scale-1a.html lime100x100-ref.html
-== canvas-drawImage-scale-1b.html lime100x100-ref.html
-== canvas-drawImage-scale-1c.html lime100x100-ref.html
+skip-if(Android&&layersOpenGL) == canvas-drawImage-scale-1a.html lime100x100-ref.html
+skip-if(Android&&layersOpenGL) == canvas-drawImage-scale-1b.html lime100x100-ref.html
+skip-if(Android&&layersOpenGL) == canvas-drawImage-scale-1c.html lime100x100-ref.html
 
-fails == canvas-drawImage-scale-2a.html canvas-drawImage-scale-2-ref.html # XXX all edges fuzzy
-fails == canvas-drawImage-scale-2b.html canvas-drawImage-scale-2-ref.html # XXX all edges fuzzy
+skip-if(Android&&layersOpenGL) fails == canvas-drawImage-scale-2a.html canvas-drawImage-scale-2-ref.html # XXX all edges fuzzy
+skip-if(Android&&layersOpenGL) fails == canvas-drawImage-scale-2b.html canvas-drawImage-scale-2-ref.html # XXX all edges fuzzy
 
-== canvas-drawImage-slice-1a.html lime100x100-ref.html
-fails == canvas-drawImage-slice-1b.html lime100x100-ref.html # XXX all edges fuzzy
+skip-if(Android&&layersOpenGL) == canvas-drawImage-slice-1a.html lime100x100-ref.html
+skip-if(Android&&layersOpenGL) fails == canvas-drawImage-slice-1b.html lime100x100-ref.html # XXX all edges fuzzy
 
 # Simple <img> tests
 == img-simple-1.html  lime100x100-ref.html
 == img-simple-2.html  lime100x100-ref.html
 == img-simple-3.html  img-simple-3-ref.html
 == img-simple-4.html  lime100x100-ref.html
 == img-simple-5.html  img-simple-5-ref.html
 == img-simple-6.html  lime100x100-ref.html
--- a/layout/reftests/svg/moz-only/reftest.list
+++ b/layout/reftests/svg/moz-only/reftest.list
@@ -7,15 +7,15 @@
 == xbl-grad-ref--grad-in-binding-02.svg         pass.svg
 == xbl-grad-ref--grad-in-bound-01.svg           pass.svg
 fails == xbl-grad-ref--grad-in-bound-02.svg     pass-black.svg
 fails == xbl-grad-ref--grad-in-resources-01.svg pass.svg
 fails == xbl-grad-ref--grad-in-resources-02.svg pass.svg
 == xbl-grad-ref--grad-in-binding-03.svg         pass.svg
 == xbl-grad-ref--grad-in-bound-03.svg           pass.svg
 == xbl-grad-ref--grad-in-binding-04.svg         pass.svg
-== xbl-grad-ref--grad-in-bound-04.svg           pass.svg
+skip-if(Android&&layersOpenGL) == xbl-grad-ref--grad-in-bound-04.svg           pass.svg
 
 # Tests for zooming with the full page zoom UI
 == feImage-zoom-01a.svg                         feImage-zoom-01-ref.svg
 == feImage-zoom-01b.svg                         feImage-zoom-01-ref.svg
 == foreignObject-zoom-01.svg                    pass.svg
 skip == zoomed-svg-with-viewBox-01.svg          zoomed-svg-with-viewBox-01-ref.svg
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -1,10 +1,10 @@
 # svg-as-an-image tests
-include as-image/reftest.list
+skip-if(Android&&layersOpenGL) include as-image/reftest.list
 
 # <image> tests
 include image/reftest.list
 
 # sizing tests
 include sizing/reftest.list
 
 # filter tests
@@ -56,17 +56,17 @@ fails-if(Android) == dynamic-conditions-
 == dynamic-conditions-06.svg about:blank
 == dynamic-conditions-07.svg pass.svg
 == dynamic-conditions-08.svg pass.svg
 == dynamic-conditions-09.svg about:blank
 == dynamic-conditions-10.svg about:blank
 == dynamic-conditions-11.svg pass.svg
 == dynamic-conditions-12.svg pass.svg
 == dynamic-conditions-13.svg about:blank
-== dynamic-clipPath-01.svg pass.svg
+fails-if(Android&&layersOpenGL) == dynamic-clipPath-01.svg pass.svg
 == dynamic-clipPath-02.svg pass.svg
 == dynamic-feFlood-01.svg pass.svg
 == dynamic-feImage-01.svg pass.svg
 == dynamic-filter-contents-01a.svg dynamic-filter-contents-01-ref.svg
 == dynamic-filter-contents-01b.svg dynamic-filter-contents-01-ref.svg
 == dynamic-gradient-contents-01.svg pass.svg
 == dynamic-gradient-contents-02.svg pass.svg
 == dynamic-inner-svg-01.svg pass.svg
@@ -93,17 +93,17 @@ fails-if(Android) == dynamic-switch-01.s
 == dynamic-text-02.svg dynamic-text-02-ref.svg
 == dynamic-text-03.svg dynamic-text-03-ref.svg
 fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) == dynamic-text-04.svg dynamic-text-04-ref.svg # bug 421587 for WinXP
 == dynamic-textPath-01.svg dynamic-textPath-01-ref.svg
 == dynamic-use-01.svg pass.svg
 == dynamic-use-02.svg pass.svg
 == dynamic-use-03.svg pass.svg
 == dynamic-use-04.svg pass.svg
-== dynamic-use-05.svg pass.svg
+fails-if(Android&&layersOpenGL) == dynamic-use-05.svg pass.svg
 random == dynamic-use-nested-01.svg dynamic-use-nested-01-ref.svg # bug 467498
 == dynamic-use-remove-width.svg dynamic-use-remove-width-ref.svg
 == linked-pattern-01.svg pass.svg
 == use-01.svg pass.svg
 == use-01-extref.svg pass.svg
 == use-02-extref.svg use-02-extref-ref.svg
 == use-children.svg pass.svg
 == fallback-color-01a.svg pass.svg
@@ -158,21 +158,21 @@ random-if(gtk2Widget) == objectBoundingB
 == objectBoundingBox-and-pattern-01a.svg objectBoundingBox-and-pattern-01-ref.svg
 == objectBoundingBox-and-pattern-01b.svg objectBoundingBox-and-pattern-01-ref.svg
 == objectBoundingBox-and-pattern-01c.svg objectBoundingBox-and-pattern-01-ref.svg
 == objectBoundingBox-and-pattern-02.svg pass.svg
 == objectBoundingBox-and-pattern-03.svg objectBoundingBox-and-pattern-03-ref.svg
 == opacity-and-gradient-01.svg pass.svg
 == opacity-and-gradient-02.svg opacity-and-gradient-02-ref.svg
 == opacity-and-pattern-01.svg pass.svg
-== outer-svg-border-and-padding-01.svg outer-svg-border-and-padding-01-ref.svg 
+fails-if(Android&&layersOpenGL) == outer-svg-border-and-padding-01.svg outer-svg-border-and-padding-01-ref.svg 
 == path-01.svg path-01-ref.svg
 == path-02.svg pass.svg
 == path-03.svg pass.svg
-== path-04.svg pass.svg
+fails-if(Android&&layersOpenGL) == path-04.svg pass.svg
 == path-05.svg pass.svg
 == pathLength-01.svg pass.svg
 == pathLength-02.svg pass.svg
 == pattern-invalid-01.svg pattern-invalid-01-ref.svg
 == pattern-live-01a.svg pattern-live-01-ref.svg
 == pattern-live-01b.svg pattern-live-01-ref.svg
 == pattern-live-01c.svg pattern-live-01-ref.svg
 == pattern-transform-presence-01.svg pattern-transform-presence-01-ref.svg
--- a/layout/reftests/svg/smil/event/reftest.list
+++ b/layout/reftests/svg/smil/event/reftest.list
@@ -5,21 +5,21 @@
 == event-begin-offset-2.svg green-box-ref.svg
 == event-begin-timeevent-1.svg green-box-ref.svg
 == event-begin-timeevent-2.svg green-box-ref.svg
 random-if(Android) == event-begin-timeevent-3.svg green-box-ref.svg
 == event-begin-load-1.svg green-box-ref.svg
 == event-bubble-1.svg green-box-ref.svg
 == event-custom-1.svg green-box-ref.svg
 == event-end-1.svg green-box-ref.svg
-== event-end-2.svg green-box-ref.svg
+fails-if(Android&&layersOpenGL) == event-end-2.svg green-box-ref.svg
 == event-end-open-1.svg green-box-ref.svg
 == event-end-trimmed-1.svg green-box-ref.svg
 == event-preventDefault-1.svg green-box-ref.svg
-== event-seek-1.svg green-box-ref.svg
+fails-if(Android&&layersOpenGL) == event-seek-1.svg green-box-ref.svg
 == event-target-default-1.svg green-box-ref.svg
 == event-target-default-2.svg green-box-ref.svg
 == event-target-id-change-1.svg green-box-ref.svg
 == event-target-id-change-2.svg green-box-ref.svg
 == event-target-id-change-3.svg green-box-ref.svg
 == event-target-xlink-change-1.svg green-box-ref.svg
 == event-target-xlink-change-2.svg green-box-ref.svg
 == event-target-xlink-change-3.svg green-box-ref.svg
--- a/layout/reftests/svg/smil/reftest.list
+++ b/layout/reftests/svg/smil/reftest.list
@@ -116,17 +116,17 @@ fails == anim-fillcolor-1.svg      anim-
 == anim-polygon-points-01.svg anim-polygon-points-01-ref.svg
 == anim-polyline-points-01.svg anim-polyline-points-01-ref.svg
 
 # animate path data:
 == anim-path-d-01.svg anim-path-d-01-ref.svg
 
 # animate some enumeration attributes:
 == anim-feComposite-operator-01.svg lime.svg
-== anim-filter-filterUnits-01.svg lime.svg
+fails-if(Android&&layersOpenGL) == anim-filter-filterUnits-01.svg lime.svg
 
 # animate some boolean attributes:
 == anim-feConvolveMatrix-preserveAlpha-01.svg lime.svg
 
 # animate some viewBox attributes
 == anim-svg-viewBox-01.svg lime.svg
 == anim-svg-viewBox-02.svg lime.svg
 
@@ -159,18 +159,18 @@ fails == anim-fillcolor-1.svg      anim-
 
 == anim-remove-1.svg anim-standard-ref.svg
 == anim-remove-2.svg anim-standard-ref.svg
 == anim-remove-3.svg anim-standard-ref.svg
 == anim-remove-4.svg anim-standard-ref.svg
 == anim-remove-5.svg anim-standard-ref.svg
 == anim-remove-6.svg anim-standard-ref.svg
 == anim-remove-7.svg anim-standard-ref.svg
-== anim-remove-8css.svg anim-standard-ref.svg
-== anim-remove-8xml.svg anim-standard-ref.svg
+fails-if(Android&&layersOpenGL) == anim-remove-8css.svg anim-standard-ref.svg
+fails-if(Android&&layersOpenGL) == anim-remove-8xml.svg anim-standard-ref.svg
 == anim-retarget-1.svg anim-standard-ref.svg
 == anim-retarget-2.svg anim-standard-ref.svg
 == anim-retarget-3.svg anim-standard-ref.svg
 == anim-retarget-4.svg anim-standard-ref.svg
 == anim-retarget-5.svg anim-standard-ref.svg
 == anim-retarget-6.svg anim-standard-ref.svg
 == anim-retarget-7.svg anim-standard-ref.svg
 == anim-retarget-8.svg anim-standard-ref.svg
--- a/layout/reftests/svg/smil/transform/reftest.list
+++ b/layout/reftests/svg/smil/transform/reftest.list
@@ -5,11 +5,11 @@
 == paced-1.svg paced-1-ref.svg
 == rotate-angle-1.svg rotate-angle-ref.svg
 == rotate-angle-2.svg rotate-angle-ref.svg
 == rotate-angle-3.svg rotate-angle-ref.svg
 == rotate-angle-4.svg rotate-angle-ref.svg
 == rotate-angle-5.svg rotate-angle-ref.svg
 == scale-1.svg scale-1-ref.svg
 == skew-1.svg skew-1-ref.svg
-== translate-clipPath-1.svg lime.svg
+fails-if(Android&&layersOpenGL) == translate-clipPath-1.svg lime.svg
 fails-if(cocoaWidget) == translate-gradient-1.svg lime.svg
-== translate-pattern-1.svg lime.svg
+fails-if(Android&&layersOpenGL) == translate-pattern-1.svg lime.svg
--- a/layout/reftests/text-overflow/reftest.list
+++ b/layout/reftests/text-overflow/reftest.list
@@ -2,17 +2,17 @@
 HTTP(..) == marker-basic.html marker-basic-ref.html
 HTTP(..) == marker-string.html marker-string-ref.html
 skip-if(Android) HTTP(..) == bidi-simple.html bidi-simple-ref.html # Fails on Android due to anti-aliasing
 skip-if(!gtk2Widget) HTTP(..) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing
 HTTP(..) == scroll-rounding.html scroll-rounding-ref.html
 HTTP(..) == anonymous-block.html anonymous-block-ref.html
 HTTP(..) == false-marker-overlap.html false-marker-overlap-ref.html
 HTTP(..) == visibility-hidden.html visibility-hidden-ref.html
-HTTP(..) == block-padding.html block-padding-ref.html
+fails-if(Android&&layersOpenGL) HTTP(..) == block-padding.html block-padding-ref.html
 HTTP(..) == quirks-decorations.html quirks-decorations-ref.html
 HTTP(..) == quirks-line-height.html quirks-line-height-ref.html
 HTTP(..) == standards-decorations.html standards-decorations-ref.html
 HTTP(..) == standards-line-height.html standards-line-height-ref.html
 HTTP(..) == selection.html selection-ref.html
 HTTP(..) == marker-shadow.html marker-shadow-ref.html
 == aligned-baseline.html aligned-baseline-ref.html
 skip-if(Android) == clipped-elements.html clipped-elements-ref.html
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -12,21 +12,21 @@ random-if(!cocoaWidget) == font-size-adj
 # see bug #366138 for some (inconclusive) discussion
 # == font-size-adjust-03.html font-size-adjust-03-ref.html
 == justification-1.html justification-1-ref.html
 == justification-2a.html justification-2-ref.html
 == justification-2b.html justification-2-ref.html
 == justification-2c.html justification-2-ref.html
 != justification-2d.html justification-2-ref.html
 load ligature-with-space-1.html
-== line-editing-1a.html line-editing-1-ref.html
-== line-editing-1b.html line-editing-1-ref.html
-== line-editing-1c.html line-editing-1-ref.html
-== line-editing-1d.html line-editing-1-ref.html
-== line-editing-1e.html line-editing-1-ref.html
+fails-if(Android&&layersOpenGL) == line-editing-1a.html line-editing-1-ref.html
+fails-if(Android&&layersOpenGL) == line-editing-1b.html line-editing-1-ref.html
+fails-if(Android&&layersOpenGL) == line-editing-1c.html line-editing-1-ref.html
+fails-if(Android&&layersOpenGL) == line-editing-1d.html line-editing-1-ref.html
+fails-if(Android&&layersOpenGL) == line-editing-1e.html line-editing-1-ref.html
 fails-if(cocoaWidget||winWidget) HTTP(..) == lineheight-metrics-1.html lineheight-metrics-1-ref.html # bug 657864
 == long-1.html long-ref.html
 == pre-line-1.html pre-line-1-ref.html
 == pre-line-2.html pre-line-2-ref.html
 == pre-line-3.html pre-line-3-ref.html
 == pre-line-4.html pre-line-4-ref.html
 == soft-hyphens-1a.html soft-hyphens-1-ref.html
 == soft-hyphens-1b.html soft-hyphens-1-ref.html
@@ -41,18 +41,18 @@ fails-if(cocoaWidget||winWidget) HTTP(..
 fails-if(Android) skip-if(d2d||cocoaWidget) == subpixel-glyphs-x-1a.html subpixel-glyphs-x-1b.html
 # Platforms with subpixel positioning already have inconsistent glyphs by
 # design, but that is considered more tolerable because they are subpixel
 # inconsistencies.  On those platforms we just test that glyph positions are
 # subpixel.
 # D2D/DirectWrite results depend on the rendering mode chosen, so considering this as random for now.
 skip-if(!(d2d||cocoaWidget)) random-if(d2d) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
 # No platforms do subpixel positioning vertically
-== subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
-== subpixel-lineheight-1a.html subpixel-lineheight-1b.html
+fails-if(Android&&layersOpenGL) == subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
+fails-if(Android&&layersOpenGL) == subpixel-lineheight-1a.html subpixel-lineheight-1b.html
 == swash-1.html swash-1-ref.html
 HTTP(..) != synthetic-bold-metrics-01.html synthetic-bold-metrics-01-notref.html
 == variation-selector-unsupported-1.html variation-selector-unsupported-1-ref.html
 == white-space-1a.html white-space-1-ref.html
 == white-space-1b.html white-space-1-ref.html
 == white-space-2.html white-space-2-ref.html
 == wordwrap-01.html wordwrap-01-ref.html
 HTTP(..) == wordwrap-02.html wordwrap-02-ref.html
--- a/layout/reftests/webm-video/reftest.list
+++ b/layout/reftests/webm-video/reftest.list
@@ -1,18 +1,18 @@
 fails-if(Android) HTTP(..) == aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
 fails-if(Android) HTTP(..) == aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
 fails-if(Android) skip-if(gtk2Widget) HTTP(..) == aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
 fails-if(Android) skip-if(gtk2Widget) HTTP(..) == aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
 HTTP(..) == aspect-ratio-3a.xhtml aspect-ratio-3-ref.xhtml
 HTTP(..) == aspect-ratio-3b.xhtml aspect-ratio-3-ref.xhtml
 fails-if(Android) random-if(layersGPUAccelerated) fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu))  == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html # bug 623460 for WinXP
 fails-if(Android) HTTP(..) == basic-1.xhtml basic-1-ref.html
-skip-if(Android) HTTP(..) == canvas-1a.xhtml basic-1-ref.html
-fails-if(Android) HTTP(..) == canvas-1b.xhtml basic-1-ref.html
+skip-if(Android) skip-if(Android&&layersOpenGL) HTTP(..) == canvas-1a.xhtml basic-1-ref.html
+fails-if(Android) skip-if(Android&&layersOpenGL) HTTP(..) == canvas-1b.xhtml basic-1-ref.html
 == clipping-1a.html clipping-1-ref.html
 == empty-1a.html empty-1-ref.html
 == empty-1b.html empty-1-ref.html
 #these is skipped because we hang on the htmlparser tests when this is ran
 random skip-if(Android) HTTP(..) == object-aspect-ratio-1a.xhtml aspect-ratio-1-ref.html
 random skip-if(Android) HTTP(..) == object-aspect-ratio-1b.xhtml aspect-ratio-1-ref.html
 skip-if(Android) HTTP(..) == offset-1.xhtml offset-1-ref.html
 random skip-if(Android) HTTP(..) == object-aspect-ratio-2a.xhtml aspect-ratio-2-ref.html
--- a/layout/xul/base/src/grid/reftests/reftest.list
+++ b/layout/xul/base/src/grid/reftests/reftest.list
@@ -4,15 +4,15 @@
 == row-or-column-sizing-1.xul row-or-column-sizing-3.xul
 == row-or-column-sizing-1.xul row-or-column-sizing-4.xul
 == z-order-1.xul z-order-1-ref.xul
 == z-order-2.xul z-order-2-ref.xul
 == not-full-basic.xul not-full-basic-ref.xhtml
 == not-full-grid-pack-align.xul not-full-basic-ref.xhtml
 == not-full-row-group-align.xul not-full-row-group-align-ref.xhtml # does anyone want/need this behavior?
 == not-full-row-group-pack.xul not-full-row-group-pack-ref.xhtml
-== not-full-row-group-direction.xul not-full-row-group-direction-ref.xhtml
+fails-if(Android&&layersOpenGL) == not-full-row-group-direction.xul not-full-row-group-direction-ref.xhtml
 == not-full-row-leaf-align.xul not-full-basic-ref.xhtml
 == not-full-row-leaf-pack.xul not-full-row-leaf-pack-ref.xhtml
 == not-full-row-leaf-direction.xul not-full-row-leaf-pack-ref.xhtml
 fails-if(Android) == scrollable-columns.xul scrollable-columns-ref.xhtml # bug 650597
 fails == scrollable-rows.xul scrollable-rows-ref.xhtml
 == sizing-2d.xul sizing-2d-ref.xul