Bug 1367636 - Update stylo-vs-stylo reftest expectations. r=heycam

MozReview-Commit-ID: DVO2R2RQuiK
2017-05-25 16:44:44 +08:00
parent e6716204a1
commit cbdd5066a7
54 changed files with 480 additions and 480 deletions
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -116,7 +116,7 @@ fuzzy-if(Android,24,1) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!laye
 == 613157-1.html 613157-1-ref.html
 fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&!layersGPUAccelerated&&!azureSkia,255,6) == 613157-2.html 613157-2-ref.html
 == 662288-1.html 662288-1-ref.html
-fails-if(styloVsGecko) == 670226-1.html 670226-1-ref.html
+fails-if(styloVsGecko||stylo) == 670226-1.html 670226-1-ref.html
 == 676245-1.html 676245-1-ref.html
 fuzzy-if(skiaContent,1,3) fails-if(styloVsGecko) == 698291-1.html 698291-1-ref.html
 == 698706-1.html 698706-1-ref.html
@@ -169,7 +169,7 @@ fuzzy-if(Android,254,231) == brackets-2c-rtl.html brackets-2c-rtl-ref.html
 == brackets-3a-rtl.html brackets-3a-rtl-ref.html
 == brackets-3b-ltr.html brackets-3b-ltr-ref.html
 == brackets-3b-rtl.html brackets-3b-rtl-ref.html
-fails-if(styloVsGecko) == 1217833-1.html 1217833-1-ref.html
+fails-if(styloVsGecko||stylo) == 1217833-1.html 1217833-1-ref.html
-fails-if(styloVsGecko) == 1217833-2.html 1217833-2-ref.html
+fails-if(styloVsGecko||stylo) == 1217833-2.html 1217833-2-ref.html
 == 1231175-1.html 1231175-1-ref.html
 == 1366623-1.html 1366623-1-ref.html
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -94,10 +94,10 @@ fuzzy-if(skiaContent,2,13) == 84400-2.html 84400-2-ref.html
 == 97777-2.html 97777-2-ref.html
 == 98223-1.html 98223-1-ref.html
 == 98223-2.html 98223-2-ref.html
-fails-if(styloVsGecko) == 99850-1a.html 99850-1-ref.html
+fails-if(styloVsGecko||stylo) == 99850-1a.html 99850-1-ref.html
 random == 99850-1b.html 99850-1-ref.html # bug 471629
-fails-if(styloVsGecko) == 99850-1c.html 99850-1-ref.html
+fails-if(styloVsGecko||stylo) == 99850-1c.html 99850-1-ref.html
-fails-if(styloVsGecko) == 99850-1d.html 99850-1-ref.html
+fails-if(styloVsGecko||stylo) == 99850-1d.html 99850-1-ref.html
 == 105030-1.html 105030-1-ref.html
 == 109735-1.html 109735-1-ref.html
 == 116882-1.html 116882-1-ref.html
@@ -466,7 +466,7 @@ fuzzy-if(skiaContent,4,2) == 346774-1c.html 346774-1-ref.html
 == 347348-1.xhtml 347348-1-ref.xhtml
 == 347496-1.xhtml 347496-1-ref.xhtml
 == 347912-1.html 347912-1-ref.html
-fails-if(styloVsGecko) == 348049-1.xhtml 348049-1-ref.xhtml
+fails-if(styloVsGecko||stylo) == 348049-1.xhtml 348049-1-ref.xhtml
 == 348516-1.html 348516-1-ref.html
 == 348516-2.html 348516-2-ref.html
 != 348516-2.html 348516-2-notref.html
@@ -789,7 +789,7 @@ skip-if(!winWidget) == 391045.html 391045-ref.html # windows-specific Uniscribe
 skip-if(Android) == 391979.html 391979-ref.html
 == 391994-1.html 391994-1-ref.html
 == 392047.html 392047-ref.html
-fails-if(styloVsGecko) == 392435-1.html 392435-1-ref.html
+fails-if(styloVsGecko||stylo) == 392435-1.html 392435-1-ref.html
 == 393330-1.html 393330-1-ref.html
 == 393490-1.html 393490-1-ref.html
 == 393517-1.xhtml about:blank  # crash test
@@ -846,7 +846,7 @@ fails-if(winWidget) fails-if(cocoaWidget) random-if(!cocoaWidget&&!winWidget) !=
 == 400171-2c.html 400171-2-ref.html
 == 400421-1.html 400421-1-ref.html
 == 400813-1.html 400813-1-ref.html
-fails-if(styloVsGecko) == 400826-1.html 400826-1-ref.html
+fails-if(styloVsGecko||stylo) == 400826-1.html 400826-1-ref.html
 == 401946-1.xul about:blank
 == 402338-1.html 402338-1-ref.html
 == 402567-1.html 402567-1-ref.html
@@ -981,7 +981,7 @@ fuzzy-if(Android,11,17) == 413361-1.html 413361-1-ref.html # bug 1128229
 == 414123.xhtml 414123-ref.xhtml
 == 414638.html 414638-ref.html
 == 414851-1.html 414851-1-ref.html
-fails-if(styloVsGecko) == 416106-1.xhtml 416106-1-ref.xhtml
+fails-if(styloVsGecko||stylo) == 416106-1.xhtml 416106-1-ref.xhtml
 == 416752-1.html 416752-1-ref.html
 == 417178-1.html 417178-1-ref.html
 == 417246-1.html 417246-1-ref.html
@@ -1245,7 +1245,7 @@ fuzzy-if(skiaContent,1,12000) == 461512-1.html 461512-1-ref.html
 == 467444-1.html 467444-1-ref.html
 == 467460-1.html 467460-1-ref.html
 == 468473-1.xul 468473-1-ref.xul
-fails-if(styloVsGecko) == 468546-1.xhtml 468546-1-ref.xhtml
+fails-if(styloVsGecko||stylo) == 468546-1.xhtml 468546-1-ref.xhtml
 == 471356-1.html 471356-1-ref.html
 == 471594-1.xhtml 471594-1-ref.html
 fuzzy(255,15) == 472020-1a.xul 472020-1-ref.xul
@@ -1321,8 +1321,8 @@ fails-if(Android) == 481024-1c.html 481024-1-ref.html
 != 481948-2.html 481948-2-ref.html
 fails-if(Android) random-if(winWidget) fails-if(gtkWidget&&!styloVsGecko) == 481948-3.html 481948-3-ref.html # questionable test, see bug 488364
 == 482398-1.html 482398-1-ref.html
-random-if(d2d) fails-if(styloVsGecko) == 482592-1a.xhtml 482592-1-ref.html # bug 586771
+random-if(d2d) fails-if(styloVsGecko||stylo) == 482592-1a.xhtml 482592-1-ref.html # bug 586771
-random-if(d2d) fails-if(styloVsGecko) == 482592-1b.xhtml 482592-1-ref.html # bug 586771
+random-if(d2d) fails-if(styloVsGecko||stylo) == 482592-1b.xhtml 482592-1-ref.html # bug 586771
 random-if(winWidget) fuzzy-if(skiaContent,1,5) == 482659-1a.html 482659-1-ref.html
 fuzzy-if(skiaContent,1,5) == 482659-1b.html 482659-1-ref.html
 fuzzy-if(skiaContent,1,5) == 482659-1c.html 482659-1-ref.html
@@ -1364,8 +1364,8 @@ pref(browser.display.focus_ring_width,1) == 491180-2.html 491180-2-ref.html
 == 494667-1.html 494667-1-ref.html
 == 494667-2.html 494667-2-ref.html
 == 495274-1.html 495274-1-ref.html
-fails-if(styloVsGecko) == 495354-1a.xhtml 495354-1-ref.xhtml
+fails-if(styloVsGecko||stylo) == 495354-1a.xhtml 495354-1-ref.xhtml
-fails-if(styloVsGecko) == 495354-1b.xhtml 495354-1-ref.xhtml
+fails-if(styloVsGecko||stylo) == 495354-1b.xhtml 495354-1-ref.xhtml
 == 495385-1a.html 495385-1-ref.html
 == 495385-1b.html 495385-1-ref.html
 == 495385-1c.html 495385-1-ref.html
@@ -1384,7 +1384,7 @@ pref(dom.use_xbl_scopes_for_remote_xul,true) == 495385-2f.xhtml 495385-2-ref.htm
 == 495385-3.html 495385-3-ref.html
 == 495385-4.html 495385-4-ref.html
 fails-if(styloVsGecko) == 495385-5.html 495385-5-ref.html
-fails-if(styloVsGecko) == 496032-1.html 496032-1-ref.html
+fails-if(styloVsGecko||stylo) == 496032-1.html 496032-1-ref.html
 == 496840-1.html 496840-1-ref.html
 fuzzy-if(skiaContent,1,17000) == 498228-1.xul 498228-1-ref.xul
 == 501037.html 501037-ref.html
@@ -1555,7 +1555,7 @@ needs-focus == 568441.html 568441-ref.html
 == 571347-1b.html 571347-1-ref.html
 == 571347-2a.html 571347-2-ref.html
 == 571347-2b.html 571347-2-ref.html
-fails-if(styloVsGecko) == 571347-2c.html 571347-2-ref.html
+fails-if(styloVsGecko||stylo) == 571347-2c.html 571347-2-ref.html
 == 571347-2d.html 571347-2-ref.html
 == 571347-3.html 571347-3-ref.html
 == 572598-1.html 572598-ref.html
@@ -1587,8 +1587,8 @@ asserts(1-2) asserts-if(styloVsGecko,4) == 582146-1.html about:blank
 fuzzy-if(Android,2,48) == 585598-2.xhtml 585598-2-ref.xhtml
 == 586400-1.html 586400-1-ref.html
 fuzzy-if(d2d,52,1051) == 586683-1.html 586683-1-ref.html
-fails-if(styloVsGecko) == 589615-1a.xhtml 589615-1-ref.html
+fails-if(styloVsGecko||stylo) == 589615-1a.xhtml 589615-1-ref.html
-fails-if(styloVsGecko) == 589615-1b.html 589615-1-ref.html
+fails-if(styloVsGecko||stylo) == 589615-1b.html 589615-1-ref.html
 == 589672-1.html 589672-1-ref.html
 != 589682-1.html 589682-1-notref.html
 pref(dom.meta-viewport.enabled,true) skip-if(Android) == 593243-1.html 593243-1-ref.html # bug 593168
@@ -1649,7 +1649,7 @@ fuzzy-if(d2d,5,1) == 622585-1.html 622585-1-ref.html # bug 789402
 fuzzy-if(Android,8,300) fuzzy-if(skiaContent,1,40000) == 625409-1.html 625409-1-ref.html
 == 627393-1.html about:blank
 fuzzy-if(skiaContent,1,500) == 630835-1.html about:blank
-fails-if(styloVsGecko) == 631352-1.html 631352-1-ref.html
+fails-if(styloVsGecko||stylo) == 631352-1.html 631352-1-ref.html
 skip-if(!haveTestPlugin) fails-if(Android) fuzzy-if(winWidget&&!layersGPUAccelerated,102,535) fuzzy-if(skiaContent&&!Android,102,11000) HTTP == 632423-1.html 632423-1-ref.html
 skip-if(Android) random-if(winWidget||OSX==1010) == 632781-verybig.html 632781-ref.html
 == 632781-normalsize.html 632781-ref.html
@@ -1667,7 +1667,7 @@ fuzzy-if(Android,8,500) fuzzy-if(skiaContent,2,1) == 637852-2.html 637852-2-ref.
 fuzzy-if(Android,8,500) == 637852-3.html 637852-3-ref.html
 == 641770-1.html 641770-1-ref.html
 == 641856-1.html 641856-1-ref.html
-fails-if(styloVsGecko) == 645491-1.html 645491-1-ref.html
+fails-if(styloVsGecko||stylo) == 645491-1.html 645491-1-ref.html
 == 645647-1.html 645647-1-ref.html
 == 645647-2.html 645647-2-ref.html
 == 645768-1.html 645768-1-ref.html
@@ -1704,7 +1704,7 @@ fuzzy-if(skiaContent,1,200) == 696307-1.html 696307-1-ref.html
 fuzzy-if(skiaContent,1,550) == 696739-1.html 696739-1-ref.html
 needs-focus fails-if(styloVsGecko) == 703186-1.html 703186-1-ref.html
 needs-focus == 703186-2.html 703186-2-ref.html
-needs-focus fails-if(styloVsGecko) != 703186-1.html 703186-2.html
+needs-focus fails-if(styloVsGecko||stylo) != 703186-1.html 703186-2.html
 == 711359-1.html 711359-1-ref.html
 == 712849-1.html 712849-1-ref.html
 == 713856-static.html  713856-ref.html
@@ -1720,9 +1720,9 @@ fuzzy(2,40000) == 722923-1.html 722923-1-ref.html
 == 723484-1.html 723484-1-ref.html
 random-if(Android) == 728983-1.html 728983-1-ref.html
 == 729143-1.html 729143-1-ref.html
-fails-if(styloVsGecko) == 731521-1.html 731521-1-ref.html
+fails-if(styloVsGecko||stylo) == 731521-1.html 731521-1-ref.html
 needs-focus fails-if(styloVsGecko) == 731726-1.html 731726-1-ref.html
-fails-if(styloVsGecko) == 735481-1.html 735481-1-ref.html
+fails-if(styloVsGecko||stylo) == 735481-1.html 735481-1-ref.html
 fuzzy-if(cocoaWidget,1,300000) fuzzy-if(skiaContent,2,300000) == 745934-1.html 745934-1-ref.html
 == 748692-1a.html 748692-1-ref.html
 == 748692-1b.html 748692-1-ref.html
@@ -1779,11 +1779,11 @@ fuzzy-if(OSX,1,364) fuzzy-if(skiaContent,1,320) == 846144-1.html 846144-1-ref.ht
 != 860370.html 860370-notref.html
 == 871338-1.html 871338-1-ref.html
 == 875060-1.html 875060-1-ref.html
-fails-if(styloVsGecko) == 883987-1a.html 883987-1-ref.html
+fails-if(styloVsGecko||stylo) == 883987-1a.html 883987-1-ref.html
-fails-if(styloVsGecko) == 883987-1b.html 883987-1-ref.html
+fails-if(styloVsGecko||stylo) == 883987-1b.html 883987-1-ref.html
-fails-if(styloVsGecko) == 883987-1c.html 883987-1-ref.html
+fails-if(styloVsGecko||stylo) == 883987-1c.html 883987-1-ref.html
-fails-if(styloVsGecko) == 883987-1d.html 883987-1-ref.html
+fails-if(styloVsGecko||stylo) == 883987-1d.html 883987-1-ref.html
-fails-if(styloVsGecko) == 883987-1e.html 883987-1-ref.html
+fails-if(styloVsGecko||stylo) == 883987-1e.html 883987-1-ref.html
 == 883987-1f.html 883987-1-ref.html
 == 890495-1.html 890495-1-ref.html
 == 894931-1.html 894931-1-ref.html
@@ -1811,7 +1811,7 @@ fuzzy-if(skiaContent,1,5) == 956513-1.svg 956513-1-ref.svg
 fuzzy-if(skiaContent,1,80) == 961887-1.html 961887-1-ref.html
 == 961887-2.html 961887-2-ref.html
 == 961887-3.html 961887-3-ref.html
-pref(layout.css.overflow-clip-box.enabled,true) fuzzy(50,145) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,3712) fails-if(styloVsGecko) == 966992-1.html 966992-1-ref.html
+pref(layout.css.overflow-clip-box.enabled,true) fuzzy(50,145) fuzzy-if(asyncPan&&!layersGPUAccelerated,102,3712) fails-if(styloVsGecko||stylo) == 966992-1.html 966992-1-ref.html
 skip-if(Android) == 966510-1.html 966510-1-ref.html # scrollable elements other than the root probably won't work well on android until bug 776030 is fixed
 skip-if(Android) == 966510-2.html 966510-2-ref.html # same as above
 fuzzy-if(skiaContent,1,123) == 978911-1.svg 978911-1-ref.svg
@@ -1952,7 +1952,7 @@ fuzzy-if(skiaContent,1,1) == 1202512-2.html 1202512-2-ref.html
 == 1209994-3.html 1209994-3-ref.html
 == 1209994-4.html 1209994-4-ref.html
 == 1222226-1.html 1222226-1-ref.html
-pref(layout.css.overflow-clip-box.enabled,true) fails-if(styloVsGecko) == 1226278.html 1226278-ref.html
+pref(layout.css.overflow-clip-box.enabled,true) fails-if(styloVsGecko||stylo) == 1226278.html 1226278-ref.html
 == 1230466.html about:blank
 random-if(gtkWidget) != 1238243-1.html 1238243-1-notref.html # may fail on Linux, depending on Korean fonts available
 == 1238243-2.html 1238243-2-ref.html
--- a/layout/reftests/counter-style/reftest.list
+++ b/layout/reftests/counter-style/reftest.list
@@ -31,5 +31,5 @@ fails-if(webrender) == dependent-builtin.html           dependent-builtin-ref.ht
 == redefine-builtin.html            redefine-builtin-ref.html
 == redefine-attr-mapping.html       redefine-attr-mapping-ref.html
 == disclosure-styles.html           disclosure-styles-ref.html
-fails-if(styloVsGecko) == symbols-function.html            symbols-function-ref.html
+fails-if(styloVsGecko||stylo) == symbols-function.html            symbols-function-ref.html
 == symbols-function-invalid.html    symbols-function-invalid-ref.html
--- a/layout/reftests/css-display/reftest.list
+++ b/layout/reftests/css-display/reftest.list
@@ -5,11 +5,11 @@ fuzzy-if(Android,8,604) == display-contents-acid.html display-contents-acid-ref.
 fuzzy-if(Android,8,604) == display-contents-acid-dyn-1.html display-contents-acid-ref.html
 fuzzy-if(Android,8,604) == display-contents-acid-dyn-2.html display-contents-acid-ref.html
 fuzzy-if(Android,8,604) == display-contents-acid-dyn-3.html display-contents-acid-ref.html
-skip-if(styloVsGecko) == display-contents-generated-content.html display-contents-generated-content-ref.html
+skip-if(styloVsGecko||stylo) == display-contents-generated-content.html display-contents-generated-content-ref.html
-skip-if(styloVsGecko) == display-contents-generated-content-2.html display-contents-generated-content-ref.html
+skip-if(styloVsGecko||stylo) == display-contents-generated-content-2.html display-contents-generated-content-ref.html
-fails-if(styloVsGecko) == display-contents-style-inheritance-1.html display-contents-style-inheritance-1-ref.html
+fails-if(styloVsGecko||stylo) == display-contents-style-inheritance-1.html display-contents-style-inheritance-1-ref.html
-fails-if(styloVsGecko) == display-contents-style-inheritance-1-stylechange.html display-contents-style-inheritance-1-ref.html
+fails-if(styloVsGecko||stylo) == display-contents-style-inheritance-1-stylechange.html display-contents-style-inheritance-1-ref.html
-fuzzy-if(winWidget,12,100) skip-if(styloVsGecko) == display-contents-style-inheritance-1-dom-mutations.html display-contents-style-inheritance-1-ref.html
+fuzzy-if(winWidget,12,100) skip-if(styloVsGecko||stylo) == display-contents-style-inheritance-1-dom-mutations.html display-contents-style-inheritance-1-ref.html
 == display-contents-tables.xhtml display-contents-tables-ref.xhtml
 == display-contents-tables-2.xhtml display-contents-tables-ref.xhtml
 == display-contents-tables-3.xhtml display-contents-tables-3-ref.xhtml
@@ -17,7 +17,7 @@ fuzzy-if(winWidget,12,100) skip-if(styloVsGecko) == display-contents-style-inher
 == display-contents-visibility-hidden-2.html display-contents-visibility-hidden-ref.html
 == display-contents-495385-2d.html display-contents-495385-2d-ref.html
 fuzzy-if(Android,7,3935) == display-contents-xbl.xhtml display-contents-xbl-ref.html
-fuzzy-if(Android,7,1186) pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko) == display-contents-shadow-dom-1.html display-contents-shadow-dom-1-ref.html
+fuzzy-if(Android,7,1186) pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko||stylo) == display-contents-shadow-dom-1.html display-contents-shadow-dom-1-ref.html
 == display-contents-xbl-2.xul display-contents-xbl-2-ref.xul
 asserts(1) asserts-if(styloVsGecko,2) == display-contents-xbl-3.xul display-contents-xbl-3-ref.xul # bug 1089223
 skip == display-contents-xbl-4.xul display-contents-xbl-4-ref.xul # fails (not just asserts) due to bug 1089223
@@ -29,4 +29,4 @@ asserts(1) asserts-if(styloVsGecko,2) == display-contents-xbl-5.xul display-cont
 == display-contents-writing-mode-2.html display-contents-writing-mode-2-ref.html
 needs-focus == display-contents-state-change.html display-contents-state-change-ref.html
 pref(layout.css.display-flow-root.enabled,true) == display-flow-root-001.html display-flow-root-001-ref.html
-pref(layout.css.display-flow-root.enabled,false) fails-if(styloVsGecko) == display-flow-root-001.html display-flow-root-disabled-001-ref.html
+pref(layout.css.display-flow-root.enabled,false) fails-if(styloVsGecko||stylo) == display-flow-root-001.html display-flow-root-disabled-001-ref.html
--- a/layout/reftests/css-grid/reftest.list
+++ b/layout/reftests/css-grid/reftest.list
@@ -19,19 +19,19 @@ fails-if(!styloVsGecko) skip-if(styloVsGecko) == grid-whitespace-handling-1b.xht
 == grid-track-sizing-002.html grid-track-sizing-002-ref.html
 == grid-abspos-items-001.html grid-abspos-items-001-ref.html
 == grid-abspos-items-002.html grid-abspos-items-002-ref.html
-fails-if(styloVsGecko) == grid-abspos-items-003.html grid-abspos-items-003-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-items-003.html grid-abspos-items-003-ref.html
-fails-if(styloVsGecko) == grid-abspos-items-004.html grid-abspos-items-004-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-items-004.html grid-abspos-items-004-ref.html
-fails-if(styloVsGecko) == grid-abspos-items-005.html grid-abspos-items-005-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-items-005.html grid-abspos-items-005-ref.html
-fails-if(styloVsGecko) == grid-abspos-items-006.html grid-abspos-items-006-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-items-006.html grid-abspos-items-006-ref.html
-fails-if(styloVsGecko) == grid-abspos-items-007.html grid-abspos-items-007-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-items-007.html grid-abspos-items-007-ref.html
-fails-if(styloVsGecko) == grid-abspos-items-008.html grid-abspos-items-008-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-items-008.html grid-abspos-items-008-ref.html
-fails-if(styloVsGecko) == grid-abspos-items-009.html grid-abspos-items-009-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-items-009.html grid-abspos-items-009-ref.html
-fails-if(styloVsGecko) == grid-abspos-items-010.html grid-abspos-items-010-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-items-010.html grid-abspos-items-010-ref.html
 == grid-abspos-items-011.html grid-abspos-items-011-ref.html
 == grid-abspos-items-012.html grid-abspos-items-012-ref.html
 == grid-abspos-items-013.html grid-abspos-items-013-ref.html
-fails-if(styloVsGecko) == grid-abspos-items-014.html grid-abspos-items-014-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-items-014.html grid-abspos-items-014-ref.html
-fails-if(styloVsGecko) == grid-abspos-items-015.html grid-abspos-items-015-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-items-015.html grid-abspos-items-015-ref.html
 == grid-order-abspos-items-001.html grid-order-abspos-items-001-ref.html
 == grid-order-placement-auto-001.html grid-order-placement-auto-001-ref.html
 fuzzy-if(skiaContent,1,200) == grid-order-placement-definite-001.html grid-order-placement-definite-001-ref.html
@@ -54,30 +54,30 @@ fuzzy-if(winWidget,70,130) fuzzy-if(cocoaWidget,85,180) == grid-col-max-sizing-m
 fuzzy-if(winWidget,70,130) fuzzy-if(cocoaWidget,85,180) == grid-col-max-sizing-max-content-002.html grid-col-max-sizing-max-content-002-ref.html
 == grid-min-max-content-sizing-001.html grid-min-max-content-sizing-001-ref.html
 == grid-min-max-content-sizing-002.html grid-min-max-content-sizing-002-ref.html
-fuzzy-if(winWidget,1,36) == grid-auto-min-sizing-definite-001.html grid-auto-min-sizing-definite-001-ref.html
+fuzzy-if(winWidget,1,36) fails-if(stylo) == grid-auto-min-sizing-definite-001.html grid-auto-min-sizing-definite-001-ref.html
 == grid-auto-min-sizing-intrinsic-001.html grid-auto-min-sizing-intrinsic-001-ref.html
 == grid-auto-min-sizing-intrinsic-002.html grid-auto-min-sizing-intrinsic-002-ref.html
 == grid-auto-min-sizing-intrinsic-003.html grid-auto-min-sizing-intrinsic-003-ref.html
 == grid-auto-min-sizing-intrinsic-004.html grid-auto-min-sizing-intrinsic-004-ref.html
 == grid-auto-min-sizing-transferred-size-001.html grid-auto-min-sizing-transferred-size-001-ref.html
 == grid-auto-min-sizing-transferred-size-002.html grid-auto-min-sizing-transferred-size-002-ref.html
-== grid-auto-min-sizing-transferred-size-003.html grid-auto-min-sizing-transferred-size-003-ref.html
+fails-if(stylo) == grid-auto-min-sizing-transferred-size-003.html grid-auto-min-sizing-transferred-size-003-ref.html
-== grid-auto-min-sizing-transferred-size-004.html grid-auto-min-sizing-transferred-size-004-ref.html
+fails-if(stylo) == grid-auto-min-sizing-transferred-size-004.html grid-auto-min-sizing-transferred-size-004-ref.html
 == grid-auto-min-sizing-min-content-min-size-001.html grid-auto-min-sizing-min-content-min-size-001-ref.html
 == grid-auto-min-sizing-min-content-min-size-002.html grid-auto-min-sizing-min-content-min-size-002-ref.html
-== grid-auto-min-sizing-min-content-min-size-003.html grid-auto-min-sizing-min-content-min-size-003-ref.html
+fails-if(stylo) == grid-auto-min-sizing-min-content-min-size-003.html grid-auto-min-sizing-min-content-min-size-003-ref.html
-== grid-auto-min-sizing-min-content-min-size-004.html grid-auto-min-sizing-min-content-min-size-004-ref.html
+fails-if(stylo) == grid-auto-min-sizing-min-content-min-size-004.html grid-auto-min-sizing-min-content-min-size-004-ref.html
 == grid-min-content-min-sizing-transferred-size-001.html grid-min-content-min-sizing-transferred-size-001-ref.html
 == grid-min-content-min-sizing-transferred-size-002.html grid-min-content-min-sizing-transferred-size-002-ref.html
 == grid-min-content-min-sizing-transferred-size-003.html grid-min-content-min-sizing-transferred-size-003-ref.html
-== grid-min-content-min-sizing-transferred-size-004.html grid-min-content-min-sizing-transferred-size-004-ref.html
+fails-if(stylo) == grid-min-content-min-sizing-transferred-size-004.html grid-min-content-min-sizing-transferred-size-004-ref.html
 skip-if(Android) == grid-auto-min-sizing-percent-001.html grid-auto-min-sizing-percent-001-ref.html # bug 1305716
 == grid-track-intrinsic-sizing-001.html grid-track-intrinsic-sizing-001-ref.html
 == grid-track-intrinsic-sizing-002.html grid-track-intrinsic-sizing-002-ref.html
 == grid-track-intrinsic-sizing-003.html grid-track-intrinsic-sizing-003-ref.html
 == grid-track-intrinsic-sizing-004.html grid-track-intrinsic-sizing-004-ref.html
-== grid-track-percent-sizing-001.html grid-track-percent-sizing-001-ref.html
+fails-if(stylo) == grid-track-percent-sizing-001.html grid-track-percent-sizing-001-ref.html
-fails-if(styloVsGecko) == grid-track-fit-content-sizing-001.html grid-track-fit-content-sizing-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-track-fit-content-sizing-001.html grid-track-fit-content-sizing-001-ref.html
 == grid-track-fit-content-sizing-002.html grid-track-fit-content-sizing-002-ref.html
 == grid-max-sizing-flex-001.html grid-max-sizing-flex-001-ref.html
 == grid-max-sizing-flex-002.html grid-max-sizing-flex-002-ref.html
@@ -85,30 +85,30 @@ fails-if(styloVsGecko) == grid-track-fit-content-sizing-001.html grid-track-fit-
 == grid-max-sizing-flex-004.html grid-max-sizing-flex-004-ref.html
 == grid-max-sizing-flex-005.html grid-max-sizing-flex-005-ref.html
 == grid-max-sizing-flex-006.html grid-max-sizing-flex-006-ref.html
-fails-if(styloVsGecko) == grid-max-sizing-flex-007.html grid-max-sizing-flex-007-ref.html
+fails-if(styloVsGecko||stylo) == grid-max-sizing-flex-007.html grid-max-sizing-flex-007-ref.html
-fails-if(styloVsGecko) == grid-max-sizing-flex-008.html grid-max-sizing-flex-008-ref.html
+fails-if(styloVsGecko||stylo) == grid-max-sizing-flex-008.html grid-max-sizing-flex-008-ref.html
 == grid-flex-min-sizing-001.html grid-flex-min-sizing-001-ref.html
 == grid-flex-min-sizing-002.html grid-flex-min-sizing-002-ref.html
-fails-if(styloVsGecko) == grid-item-align-001.html grid-item-align-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-align-001.html grid-item-align-001-ref.html
-fails-if(styloVsGecko) == grid-item-align-002.html grid-item-align-002-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-align-002.html grid-item-align-002-ref.html
-fails-if(styloVsGecko) == grid-item-align-003.html grid-item-align-003-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-align-003.html grid-item-align-003-ref.html
-fails-if(styloVsGecko) == grid-item-justify-001.html grid-item-justify-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-justify-001.html grid-item-justify-001-ref.html
-fails-if(styloVsGecko) == grid-item-justify-002.html grid-item-justify-002-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-justify-002.html grid-item-justify-002-ref.html
-fails-if(styloVsGecko) == grid-item-stretch-001.html grid-item-stretch-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-stretch-001.html grid-item-stretch-001-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-ratio-stretch-001.html grid-item-intrinsic-ratio-stretch-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-ratio-stretch-001.html grid-item-intrinsic-ratio-stretch-001-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-ratio-stretch-002.html grid-item-intrinsic-ratio-stretch-002-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-ratio-stretch-002.html grid-item-intrinsic-ratio-stretch-002-ref.html
 fails-if(styloVsGecko) == grid-item-intrinsic-ratio-stretch-003.html grid-item-intrinsic-ratio-stretch-003-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-ratio-stretch-004.html grid-item-intrinsic-ratio-stretch-004-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-ratio-stretch-004.html grid-item-intrinsic-ratio-stretch-004-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-ratio-stretch-005.html grid-item-intrinsic-ratio-stretch-005-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-ratio-stretch-005.html grid-item-intrinsic-ratio-stretch-005-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-ratio-stretch-006.html grid-item-intrinsic-ratio-stretch-006-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-ratio-stretch-006.html grid-item-intrinsic-ratio-stretch-006-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-ratio-stretch-007.html grid-item-intrinsic-ratio-stretch-007-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-ratio-stretch-007.html grid-item-intrinsic-ratio-stretch-007-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-ratio-normal-001.html grid-item-intrinsic-ratio-normal-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-ratio-normal-001.html grid-item-intrinsic-ratio-normal-001-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-ratio-normal-002.html grid-item-intrinsic-ratio-normal-002-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-ratio-normal-002.html grid-item-intrinsic-ratio-normal-002-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-ratio-normal-003.html grid-item-intrinsic-ratio-normal-003-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-ratio-normal-003.html grid-item-intrinsic-ratio-normal-003-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-ratio-normal-004.html grid-item-intrinsic-ratio-normal-004-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-ratio-normal-004.html grid-item-intrinsic-ratio-normal-004-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-ratio-normal-005.html grid-item-intrinsic-ratio-normal-005-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-ratio-normal-005.html grid-item-intrinsic-ratio-normal-005-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-size-normal-001.html grid-item-intrinsic-size-normal-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-size-normal-001.html grid-item-intrinsic-size-normal-001-ref.html
-fails-if(styloVsGecko) == grid-item-intrinsic-size-normal-002.html grid-item-intrinsic-size-normal-002-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-intrinsic-size-normal-002.html grid-item-intrinsic-size-normal-002-ref.html
 == grid-item-auto-min-size-clamp-001.html grid-item-auto-min-size-clamp-001-ref.html
 == grid-item-auto-min-size-clamp-002.html grid-item-auto-min-size-clamp-002-ref.html
 == grid-item-auto-min-size-clamp-003.html grid-item-auto-min-size-clamp-003-ref.html
@@ -116,50 +116,50 @@ fails-if(styloVsGecko) == grid-item-intrinsic-size-normal-002.html grid-item-int
 == grid-item-auto-min-size-clamp-005.html grid-item-auto-min-size-clamp-005-ref.html
 == grid-item-auto-min-size-clamp-006.html grid-item-auto-min-size-clamp-006-ref.html
 == grid-item-auto-min-size-clamp-007.html grid-item-auto-min-size-clamp-007-ref.html
-fails-if(styloVsGecko) == grid-item-overflow-stretch-001.html grid-item-overflow-stretch-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-overflow-stretch-001.html grid-item-overflow-stretch-001-ref.html
-fails-if(styloVsGecko) == grid-item-overflow-stretch-002.html grid-item-overflow-stretch-002-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-overflow-stretch-002.html grid-item-overflow-stretch-002-ref.html
-fails-if(styloVsGecko) == grid-item-overflow-stretch-003.html grid-item-overflow-stretch-003-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-overflow-stretch-003.html grid-item-overflow-stretch-003-ref.html
-fails-if(styloVsGecko) == grid-item-overflow-stretch-004.html grid-item-overflow-stretch-004-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-overflow-stretch-004.html grid-item-overflow-stretch-004-ref.html
-fails-if(styloVsGecko) == grid-item-overflow-stretch-005.html grid-item-overflow-stretch-005-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-overflow-stretch-005.html grid-item-overflow-stretch-005-ref.html
-fails-if(styloVsGecko) == grid-item-overflow-stretch-006.html grid-item-overflow-stretch-006-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-overflow-stretch-006.html grid-item-overflow-stretch-006-ref.html
-fails-if(styloVsGecko) == grid-item-canvas-001.html grid-item-canvas-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-canvas-001.html grid-item-canvas-001-ref.html
-skip-if(Android) fails-if(styloVsGecko) == grid-item-button-001.html grid-item-button-001-ref.html
+skip-if(Android) fails-if(styloVsGecko||stylo) == grid-item-button-001.html grid-item-button-001-ref.html
-fails-if(styloVsGecko) == grid-item-table-stretch-001.html grid-item-table-stretch-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-table-stretch-001.html grid-item-table-stretch-001-ref.html
-fails-if(styloVsGecko) == grid-item-table-stretch-002.html grid-item-table-stretch-002-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-table-stretch-002.html grid-item-table-stretch-002-ref.html
-fails-if(styloVsGecko) == grid-item-table-stretch-003.html grid-item-table-stretch-003-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-table-stretch-003.html grid-item-table-stretch-003-ref.html
-fails-if(styloVsGecko) == grid-item-table-stretch-004.html grid-item-table-stretch-004-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-table-stretch-004.html grid-item-table-stretch-004-ref.html
-fails-if(styloVsGecko) == grid-item-fieldset-stretch-001.html grid-item-fieldset-stretch-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-fieldset-stretch-001.html grid-item-fieldset-stretch-001-ref.html
-skip-if(Android) fails-if(styloVsGecko) == grid-item-video-stretch-001.html grid-item-video-stretch-001-ref.html # Huh, Android doesn't have webm support?
+skip-if(Android) fails-if(styloVsGecko||stylo) == grid-item-video-stretch-001.html grid-item-video-stretch-001-ref.html # Huh, Android doesn't have webm support?
-skip-if(Android) fails-if(styloVsGecko) == grid-item-video-stretch-002.html grid-item-video-stretch-002-ref.html # Huh, Android doesn't have webm support?
+skip-if(Android) fails-if(styloVsGecko||stylo) == grid-item-video-stretch-002.html grid-item-video-stretch-002-ref.html # Huh, Android doesn't have webm support?
-fails-if(styloVsGecko) == grid-item-input-stretch-001.html grid-item-input-stretch-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-input-stretch-001.html grid-item-input-stretch-001-ref.html
-fails-if(styloVsGecko) == grid-item-self-baseline-001.html grid-item-self-baseline-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-self-baseline-001.html grid-item-self-baseline-001-ref.html
 random-if(http.oscpu!="Linux\u0020i686") fails-if(styloVsGecko) == grid-item-content-baseline-001.html grid-item-content-baseline-001-ref.html # depends on exact Ahem baseline font metrics which seems to differ between platforms: bug 1310792
 random-if(http.oscpu!="Linux\u0020i686") fails-if(styloVsGecko) == grid-item-content-baseline-002.html grid-item-content-baseline-002-ref.html # ditto
 random-if(http.oscpu!="Linux\u0020i686") fails-if(styloVsGecko) == grid-item-mixed-baseline-001.html grid-item-mixed-baseline-001-ref.html # ditto
 random-if(http.oscpu!="Linux\u0020i686") fails-if(styloVsGecko) == grid-item-mixed-baseline-002.html grid-item-mixed-baseline-002-ref.html # ditto
 random-if(http.oscpu!="Linux\u0020i686") fails-if(styloVsGecko) == grid-item-mixed-baseline-003.html grid-item-mixed-baseline-003-ref.html # ditto
-skip-if(!gtkWidget) fails-if(styloVsGecko) == grid-item-mixed-baseline-004.html grid-item-mixed-baseline-004-ref.html # ditto
+skip-if(!gtkWidget) fails-if(styloVsGecko||stylo) == grid-item-mixed-baseline-004.html grid-item-mixed-baseline-004-ref.html # ditto
-fails-if(styloVsGecko) == grid-align-content-001.html grid-align-content-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-align-content-001.html grid-align-content-001-ref.html
-fails-if(styloVsGecko) == grid-justify-content-001.html grid-justify-content-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-justify-content-001.html grid-justify-content-001-ref.html
 skip-if(Android&&isDebugBuild) == grid-justify-content-002.html grid-justify-content-002-ref.html # Bug 1245884 - slow
 skip-if(Android&&isDebugBuild) == grid-justify-content-003.html grid-justify-content-003-ref.html # Bug 1245884 - slow
-skip-if(!gtkWidget) fails-if(styloVsGecko) == grid-container-baselines-001.html grid-container-baselines-001-ref.html
+skip-if(!gtkWidget) fails-if(styloVsGecko||stylo) == grid-container-baselines-001.html grid-container-baselines-001-ref.html
-skip-if(!gtkWidget) fails-if(styloVsGecko) == grid-container-baselines-002.html grid-container-baselines-002-ref.html
+skip-if(!gtkWidget) fails-if(styloVsGecko||stylo) == grid-container-baselines-002.html grid-container-baselines-002-ref.html
-skip-if(!gtkWidget) fails-if(styloVsGecko) == grid-container-baselines-003.html grid-container-baselines-003-ref.html
+skip-if(!gtkWidget) fails-if(styloVsGecko||stylo) == grid-container-baselines-003.html grid-container-baselines-003-ref.html
 == grid-container-baselines-004.html grid-container-baselines-004-ref.html
 == grid-container-synthesized-baseline-001-ref.html grid-container-synthesized-baseline-001-ref.html
 skip-if(Android&&isDebugBuild) == grid-column-gap-001.html grid-column-gap-001-ref.html # Bug 1245884 - slow
 == grid-column-gap-002.html grid-column-gap-002-ref.html
 == grid-column-gap-003.html grid-column-gap-003-ref.html
 fails-if(styloVsGecko) == grid-column-gap-004.html grid-column-gap-004-ref.html
-fails-if(styloVsGecko) == grid-row-gap-001.html grid-row-gap-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-row-gap-001.html grid-row-gap-001-ref.html
-fails-if(styloVsGecko) == grid-percent-grid-gap-001.html grid-percent-grid-gap-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-percent-grid-gap-001.html grid-percent-grid-gap-001-ref.html
 skip-if(Android&&isDebugBuild) == grid-row-gap-002.html grid-row-gap-002-ref.html # Bug 1245884 - slow
 skip-if(Android&&isDebugBuild) == grid-row-gap-003.html grid-row-gap-003-ref.html # Bug 1245884 - slow
 skip-if(Android&&isDebugBuild) == grid-row-gap-004.html grid-row-gap-004-ref.html # Bug 1245884 - slow
 fails-if(styloVsGecko) == grid-row-gap-005.html grid-row-gap-005-ref.html
 == grid-container-overflow-001.html grid-container-overflow-001-ref.html
-fails-if(styloVsGecko) == grid-item-margin-left-auto-001.html grid-item-margin-left-auto-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-margin-left-auto-001.html grid-item-margin-left-auto-001-ref.html
 fails-if(styloVsGecko) == grid-item-margin-left-auto-002.html grid-item-margin-left-auto-002-ref.html
 fails-if(styloVsGecko) == grid-item-margin-left-auto-003.html grid-item-margin-left-auto-003-ref.html
 fails-if(styloVsGecko) == grid-item-margin-left-auto-004.html grid-item-margin-left-auto-004-ref.html
@@ -167,11 +167,11 @@ fails-if(styloVsGecko) == grid-item-margin-left-right-auto-001.html grid-item-ma
 fails-if(styloVsGecko) == grid-item-margin-left-right-auto-002.html grid-item-margin-left-right-auto-002-ref.html
 fails-if(styloVsGecko) == grid-item-margin-left-right-auto-003.html grid-item-margin-left-right-auto-003-ref.html
 fails-if(styloVsGecko) == grid-item-margin-left-right-auto-004.html grid-item-margin-left-right-auto-004-ref.html
-fails-if(styloVsGecko) == grid-item-margin-right-auto-001.html grid-item-margin-right-auto-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-item-margin-right-auto-001.html grid-item-margin-right-auto-001-ref.html
 fails-if(styloVsGecko) == grid-item-margin-right-auto-002.html grid-item-margin-right-auto-002-ref.html
 fails-if(styloVsGecko) == grid-item-margin-right-auto-003.html grid-item-margin-right-auto-003-ref.html
 fails-if(styloVsGecko) == grid-item-margin-right-auto-004.html grid-item-margin-right-auto-004-ref.html
-fails-if(styloVsGecko) == grid-container-min-max-width-height-001.html grid-container-min-max-width-height-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-container-min-max-width-height-001.html grid-container-min-max-width-height-001-ref.html
 == grid-clamping-001.html grid-clamping-001-ref.html
 == grid-clamping-002.html grid-clamping-002-ref.html
 == grid-repeat-auto-fill-fit-001.html grid-repeat-auto-fill-fit-001-ref.html
@@ -183,8 +183,8 @@ fails-if(styloVsGecko) == grid-container-min-max-width-height-001.html grid-cont
 == grid-repeat-auto-fill-fit-007.html grid-repeat-auto-fill-fit-007-ref.html
 == grid-repeat-auto-fill-fit-008.html grid-repeat-auto-fill-fit-008-ref.html
 == grid-repeat-auto-fill-fit-009.html grid-repeat-auto-fill-fit-009-ref.html
-fails-if(styloVsGecko) == grid-repeat-auto-fill-fit-010.html grid-repeat-auto-fill-fit-010-ref.html
+fails-if(styloVsGecko||stylo) == grid-repeat-auto-fill-fit-010.html grid-repeat-auto-fill-fit-010-ref.html
-fails-if(styloVsGecko) == grid-repeat-auto-fill-fit-011.html grid-repeat-auto-fill-fit-010-ref.html
+fails-if(styloVsGecko||stylo) == grid-repeat-auto-fill-fit-011.html grid-repeat-auto-fill-fit-010-ref.html
 == grid-item-blockifying-001.html grid-item-blockifying-001-ref.html
 == grid-fragmentation-001.html grid-fragmentation-001-ref.html
 == grid-fragmentation-002.html grid-fragmentation-002-ref.html
--- a/layout/reftests/css-import/reftest.list
+++ b/layout/reftests/css-import/reftest.list
@@ -1,10 +1,10 @@
 == 290018-1.html 290018-ref.html
 == 436261-1.html 436261-ref.html
 == 436261-2.html 436261-ref.html
-fails-if(styloVsGecko) == 436261-3.html 436261-ref.html
+fails-if(styloVsGecko||stylo) == 436261-3.html 436261-ref.html
 == 444723-1.html 444723-ref.html
 == 444723-2.html 444723-ref.html
-fails-if(styloVsGecko) == 445415-1a.xhtml 445415-1-ref.xhtml
+fails-if(styloVsGecko||stylo) == 445415-1a.xhtml 445415-1-ref.xhtml
 == 445415-1b.xhtml 445415-1-ref.xhtml
 == 445415-2a.xhtml 445415-2-ref.xhtml
-fails-if(styloVsGecko) == 445415-2b.xhtml 445415-2-ref.xhtml
+fails-if(styloVsGecko||stylo) == 445415-2b.xhtml 445415-2-ref.xhtml
--- a/layout/reftests/css-mediaqueries/reftest.list
+++ b/layout/reftests/css-mediaqueries/reftest.list
@@ -16,4 +16,4 @@ fuzzy-if(Android,8,454) == mq_print_maxheight.xhtml mq_print-ref.xhtml
 == mq_print_minwidth_updown.xhtml mq_print-ref.xhtml
 == scoped-mq-update.html scoped-mq-update-ref.html
-fails-if(styloVsGecko) == system-metrics-1.html system-metrics-1-ref.html
+fails-if(styloVsGecko||stylo) == system-metrics-1.html system-metrics-1-ref.html
--- a/layout/reftests/css-parsing/reftest.list
+++ b/layout/reftests/css-parsing/reftest.list
@@ -1,5 +1,5 @@
 == at-rule-013.html at-rule-013-ref.html
-fails-if(styloVsGecko) == invalid-url-handling.xhtml invalid-url-handling-ref.xhtml
+fails-if(styloVsGecko||stylo) == invalid-url-handling.xhtml invalid-url-handling-ref.xhtml
 == pseudo-elements-1.html pseudo-elements-1-ref.html
 == invalid-attr-1.html invalid-attr-1-ref.html
 == at-rule-error-handling-import-1.html at-rule-error-handling-ref.html
--- a/layout/reftests/css-placeholder/reftest.list
+++ b/layout/reftests/css-placeholder/reftest.list
@@ -1,7 +1,7 @@
 include input/reftest.list
 include textarea/reftest.list
-fuzzy-if(skiaContent,1,4) fails-if(styloVsGecko) == css-restrictions.html css-restrictions-ref.html
+fuzzy-if(skiaContent,1,4) fails-if(styloVsGecko||stylo) == css-restrictions.html css-restrictions-ref.html
 fails-if(styloVsGecko) == css-simple-styling.html css-simple-styling-ref.html
 fails-if(styloVsGecko) != css-background.html css-background-ref.html
 fuzzy-if(skiaContent,1,180) fails-if(styloVsGecko) == ignore-pseudo-class.html ignore-pseudo-class-ref.html
--- a/layout/reftests/css-ruby/reftest.list
+++ b/layout/reftests/css-ruby/reftest.list
@@ -5,10 +5,10 @@
 == box-generation-3.html box-generation-3-ref.html
 == box-generation-4.html box-generation-4-ref.html
 == box-generation-5.html box-generation-5-ref.html
-fails-if(styloVsGecko) == box-properties-1.html box-properties-1-ref.html
+fails-if(styloVsGecko||stylo) == box-properties-1.html box-properties-1-ref.html
-fails-if(styloVsGecko) == box-properties-2.html box-properties-2-ref.html
+fails-if(styloVsGecko||stylo) == box-properties-2.html box-properties-2-ref.html
-fails-if(styloVsGecko) == box-properties-3.html box-properties-3-ref.html
+fails-if(styloVsGecko||stylo) == box-properties-3.html box-properties-3-ref.html
-fails-if(styloVsGecko) == box-properties-4.html box-properties-4-ref.html
+fails-if(styloVsGecko||stylo) == box-properties-4.html box-properties-4-ref.html
 == dynamic-insertion-1.html dynamic-insertion-1-ref.html
 == dynamic-insertion-2.html dynamic-insertion-2-ref.html
 fails-if(styloVsGecko) == dynamic-insertion-3.html dynamic-insertion-3-ref.html
@@ -22,29 +22,29 @@ test-pref(dom.meta-viewport.enabled,true) test-pref(font.size.inflation.emPerLin
 == intra-level-whitespace-3.html intra-level-whitespace-3-ref.html
 == intrinsic-isize-1.html intrinsic-isize-1-ref.html
 == intrinsic-isize-2.html intrinsic-isize-2-ref.html
-fails-if(styloVsGecko) == justification-1.html justification-1-ref.html
+fails-if(styloVsGecko||stylo) == justification-1.html justification-1-ref.html
 fails-if(styloVsGecko) == justification-2.html justification-2-ref.html
 fuzzy-if(winWidget,255,792) == lang-specific-style-1.html lang-specific-style-1-ref.html # bug 1134947
 == line-breaking-1.html line-breaking-1-ref.html
-fails-if(styloVsGecko) == line-breaking-2.html line-breaking-2-ref.html
+fails-if(styloVsGecko||stylo) == line-breaking-2.html line-breaking-2-ref.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),3,2) skip-if(styloVsGecko) == line-break-suppression-1.html line-break-suppression-1-ref.html
+fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),3,2) skip-if(styloVsGecko||stylo) == line-break-suppression-1.html line-break-suppression-1-ref.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),3,2) skip-if(styloVsGecko) == line-break-suppression-2.html line-break-suppression-2-ref.html
+fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),3,2) skip-if(styloVsGecko||stylo) == line-break-suppression-2.html line-break-suppression-2-ref.html
-skip-if(styloVsGecko) == line-break-suppression-3.html line-break-suppression-3-ref.html
+skip-if(styloVsGecko||stylo) == line-break-suppression-3.html line-break-suppression-3-ref.html
 == line-break-suppression-4.html line-break-suppression-4-ref.html
 == line-break-suppression-5.html line-break-suppression-5-ref.html
 == line-height-1.html line-height-1-ref.html
 == line-height-2.html line-height-2-ref.html
 == line-height-3.html line-height-3-ref.html
 == line-height-4.html line-height-4-ref.html
-test-pref(font.minimum-size.ja,16) fails-if(styloVsGecko) == min-font-size-1.html min-font-size-1-ref.html
+test-pref(font.minimum-size.ja,16) fails-if(styloVsGecko||stylo) == min-font-size-1.html min-font-size-1-ref.html
 skip-if(styloVsGecko) load nested-ruby-1.html
 == no-transform.html no-transform-ref.html
-fails-if(styloVsGecko) == relative-positioning-1.html relative-positioning-1-ref.html
+fails-if(styloVsGecko||stylo) == relative-positioning-1.html relative-positioning-1-ref.html
 == relative-positioning-2.html relative-positioning-2-ref.html
-fails-if(styloVsGecko) == ruby-align-1.html ruby-align-1-ref.html
+fails-if(styloVsGecko||stylo) == ruby-align-1.html ruby-align-1-ref.html
-fails-if(styloVsGecko) == ruby-align-1a.html ruby-align-1-ref.html
+fails-if(styloVsGecko||stylo) == ruby-align-1a.html ruby-align-1-ref.html
-fails-if(styloVsGecko) == ruby-align-2.html ruby-align-2-ref.html
+fails-if(styloVsGecko||stylo) == ruby-align-2.html ruby-align-2-ref.html
-fails-if(styloVsGecko) == ruby-align-2a.html ruby-align-2-ref.html
+fails-if(styloVsGecko||stylo) == ruby-align-2a.html ruby-align-2-ref.html
 == ruby-position-horizontal.html ruby-position-horizontal-ref.html
 == ruby-position-vertical-lr.html ruby-position-vertical-lr-ref.html
 == ruby-position-vertical-rl.html ruby-position-vertical-rl-ref.html
--- a/layout/reftests/css-selectors/reftest.list
+++ b/layout/reftests/css-selectors/reftest.list
@@ -2,5 +2,5 @@
 == attr-case-insensitive-1.html attr-case-insensitive-1-ref.html
 == sibling-combinators-on-anon-content-1.xhtml sibling-combinators-on-anon-content-ref.xhtml
 == sibling-combinators-on-anon-content-2.xhtml sibling-combinators-on-anon-content-ref.xhtml
-fails-if(styloVsGecko) == nth-child-1.html nth-child-ref.html
+fails-if(styloVsGecko||stylo) == nth-child-1.html nth-child-ref.html
-fails-if(styloVsGecko) == nth-child-2.html nth-child-ref.html
+fails-if(styloVsGecko||stylo) == nth-child-2.html nth-child-ref.html
--- a/layout/reftests/css-valuesandunits/reftest.list
+++ b/layout/reftests/css-valuesandunits/reftest.list
@@ -1,15 +1,15 @@
-fails-if(stylo) == unit-rem-div-fontsize.html unit-rem-ref.html
+fails-if(styloVsGecko||stylo) == unit-rem-div-fontsize.html unit-rem-ref.html
-fails-if(stylo) == unit-rem-div-width-inner.html unit-rem-ref.html
+fails-if(styloVsGecko||stylo) == unit-rem-div-width-inner.html unit-rem-ref.html
-fails-if(stylo) == unit-rem-div-width-outer.html unit-rem-ref.html
+fails-if(styloVsGecko||stylo) == unit-rem-div-width-outer.html unit-rem-ref.html
-fails-if(stylo) == unit-rem-iframe.html unit-rem-ref-iframe.html
+skip-if(styloVsGecko||stylo) == unit-rem-iframe.html unit-rem-ref-iframe.html
 == unit-rem-root-fontsize.html unit-rem-ref-root-fontsize.html
 == unit-rem-root-fontsize.html unit-rem-ref2-root-fontsize.html
 == unit-rem-root-width.html unit-rem-ref-root-width.html
-fails-if(stylo) == unit-rem.svg unit-rem-ref.svg
+fails-if(styloVsGecko||stylo) == unit-rem.svg unit-rem-ref.svg
 == unit-vh-vw.html unit-vh-vw-ref.html
 == unit-vh-vw-zoom.html unit-vh-vw-zoom-ref.html
 == unit-vh-vw-overflow-auto.html unit-vh-vw-overflow-auto-ref.html
-fails-if(styloVsGecko) == unit-vh-vw-overflow-scroll.html unit-vh-vw-overflow-scroll-ref.html
+fails-if(styloVsGecko||stylo) == unit-vh-vw-overflow-scroll.html unit-vh-vw-overflow-scroll-ref.html
-fails-if(styloVsGecko) == unit-vh-vw-overflow-scroll-x.html unit-vh-vw-overflow-scroll-x-ref.html
+fails-if(styloVsGecko||stylo) == unit-vh-vw-overflow-scroll-x.html unit-vh-vw-overflow-scroll-x-ref.html
-fails-if(styloVsGecko) == unit-vh-vw-overflow-scroll-y.html unit-vh-vw-overflow-scroll-y-ref.html
+fails-if(styloVsGecko||stylo) == unit-vh-vw-overflow-scroll-y.html unit-vh-vw-overflow-scroll-y-ref.html
-skip-if(Android) != unit-vh-vw-overflow-auto.html unit-vh-vw-overflow-scroll.html
+skip-if(Android) fails-if(stylo) != unit-vh-vw-overflow-auto.html unit-vh-vw-overflow-scroll.html
--- a/layout/reftests/dom/reftest.list
+++ b/layout/reftests/dom/reftest.list
@@ -49,7 +49,7 @@
 == multipleappendwithinput.xhtml multipleappendwithinput-ref.xhtml
 == multipleappendwitheditable.xhtml multipleappendwitheditable-ref.xhtml
-fails-if(styloVsGecko) == xbl-children-1.xhtml xbl-children-1-ref.xhtml
+fails-if(styloVsGecko||stylo) == xbl-children-1.xhtml xbl-children-1-ref.xhtml
 == xbl-children-2.xhtml about:blank
 == xbl-children-3.xhtml xbl-children-3-ref.html
 == xbl-children-4.xhtml about:blank
--- a/layout/reftests/first-letter/reftest.list
+++ b/layout/reftests/first-letter/reftest.list
@@ -22,10 +22,10 @@ fails-if(!styloVsGecko) == quote-1d.html quote-1-ref.html
 fails-if(!styloVsGecko) == quote-1e.html quote-1-ref.html # bug 509685
 == quote-1e.html quote-1b.html
 == quote-1f.html quote-1-ref.html
-fails-if(!styloVsGecko) fails-if(styloVsGecko) == dynamic-1.html dynamic-1-ref.html # bug 8253
+fails-if(!stylo) fails-if(styloVsGecko) == dynamic-1.html dynamic-1-ref.html # bug 8253
 random-if(d2d) == dynamic-2.html dynamic-2-ref.html
-fails-if(styloVsGecko) asserts-if(styloVsGecko,6) == dynamic-3a.html dynamic-3-ref.html
+fails-if(styloVsGecko) asserts-if(styloVsGecko,6) asserts-if(stylo,6) fails-if(stylo) == dynamic-3a.html dynamic-3-ref.html
-fails-if(styloVsGecko) asserts-if(styloVsGecko,6) == dynamic-3b.html dynamic-3-ref.html
+fails-if(styloVsGecko) asserts-if(styloVsGecko,6) asserts-if(stylo,6) fails-if(stylo) == dynamic-3b.html dynamic-3-ref.html
 == 23605-1.html 23605-1-ref.html
 == 23605-2.html 23605-2-ref.html
 == 23605-3.html 23605-3-ref.html
@@ -33,14 +33,14 @@ fails-if(styloVsGecko) asserts-if(styloVsGecko,6) == dynamic-3b.html dynamic-3-r
 == 23605-5.html 23605-5-ref.html
 == 23605-6.html 23605-6-ref.html
 != 229764-1.html 229764-ref.html
-fails-if(styloVsGecko) == 229764-2.html 229764-ref.html
+fails-if(styloVsGecko||stylo) == 229764-2.html 229764-ref.html
 == 329069-1.html 329069-1-ref.html
 fails-if(Android) == 329069-2.html 329069-2-ref.html # Bug 999139
 == 329069-3.html 329069-3-ref.html
 == 329069-4.html 329069-4-ref.html
 HTTP(..) == 329069-5.html 329069-5-ref.html
 == 342120-1.xhtml 342120-1-ref.xhtml
-fails-if(styloVsGecko) asserts-if(styloVsGecko,6) == 379799-1.html 379799-1-ref.html
+fails-if(styloVsGecko) asserts-if(styloVsGecko,6) asserts-if(stylo,6) fails-if(stylo) == 379799-1.html 379799-1-ref.html
 == 399941-1.html 399941-1-ref.html
 == 399941-2.html 399941-2-ref.html
 == 399941-3.html 399941-3-ref.html
@@ -51,7 +51,7 @@ fails-if(styloVsGecko) asserts-if(styloVsGecko,6) == 379799-1.html 379799-1-ref.
 == 399941-8.html 399941-8-ref.html
 == 399941-9.html 399941-9-ref.html
 == 429968-1a.html 429968-1-ref.html
-fails-if(styloVsGecko) == 429968-1b.html 429968-1-ref.html
+fails-if(styloVsGecko||stylo) == 429968-1b.html 429968-1-ref.html
 == 429968-2a.html 429968-2-ref.html
 == 429968-2b.html 429968-2-ref.html
 == 429968-2c.html 429968-2-ref.html
--- a/layout/reftests/first-line/reftest.list
+++ b/layout/reftests/first-line/reftest.list
@@ -1,11 +1,11 @@
 # basic functionality
-fails-if(styloVsGecko) == basic-1.html basic-ref.html
+fails-if(styloVsGecko||stylo) == basic-1.html basic-ref.html
 # handling of out-of-flows when ::first-line happens
 == out-of-flow-1a.html out-of-flow-1-ref.html
-fails-if(styloVsGecko) == out-of-flow-1b.html out-of-flow-1-ref.html
+fails-if(styloVsGecko||stylo) == out-of-flow-1b.html out-of-flow-1-ref.html
 == out-of-flow-1c.html out-of-flow-1-ref.html
-fails fails-if(styloVsGecko) == out-of-flow-1d.html out-of-flow-1-ref.html # bug 396645
+fails-if(!stylo) fails-if(styloVsGecko) == out-of-flow-1d.html out-of-flow-1-ref.html # bug 396645
 # parent style context correct
 == parent-style-1.html parent-style-1-ref.html
@@ -25,13 +25,13 @@ load stress-7.html # assertion/crash test
 load stress-10.html # crash test
 == stress-11.xhtml stress-11-ref.xhtml
-fails-if(styloVsGecko) == border-not-apply.html border-not-apply-ref.html
+fails-if(styloVsGecko||stylo) == border-not-apply.html border-not-apply-ref.html
-fails-if(styloVsGecko) == 287088-1.html 287088-1-ref.html
+fails-if(styloVsGecko||stylo) == 287088-1.html 287088-1-ref.html
-fails-if(styloVsGecko) == 287088-2.html 287088-2-ref.html
+fails-if(styloVsGecko||stylo) == 287088-2.html 287088-2-ref.html
 fails-if(styloVsGecko) == 403177-1.html 403177-1-ref.html
-fails-if(styloVsGecko) == 469227-2.html 469227-2-ref.html
+fails-if(styloVsGecko||stylo) == 469227-2.html 469227-2-ref.html
-fails-if(styloVsGecko) == 469227-3.html 469227-3-ref.html
+fails-if(styloVsGecko||stylo) == 469227-3.html 469227-3-ref.html
-fails-if(styloVsGecko) == restyle-inside-first-line.html restyle-inside-first-line-ref.html
+fails-if(styloVsGecko||stylo) == restyle-inside-first-line.html restyle-inside-first-line-ref.html
-fails-if(styloVsGecko) == font-styles.html font-styles-ref.html
+fails-if(styloVsGecko||stylo) == font-styles.html font-styles-ref.html
-fuzzy-if(OSX==1010,1,2) fails-if(styloVsGecko) == font-styles-nooverflow.html font-styles-ref.html
+fuzzy-if(OSX==1010,1,2) fails-if(styloVsGecko||stylo) == font-styles-nooverflow.html font-styles-ref.html
--- a/layout/reftests/font-face/reftest.list
+++ b/layout/reftests/font-face/reftest.list
@@ -91,8 +91,8 @@ random-if(styloVsGecko) HTTP(..) == media-query-remove-1.html media-query-remove
 HTTP(..) != media-query-add-1-ref.html media-query-remove-1-ref.html
 HTTP(..) == ahem-metrics-1.html ahem-metrics-1-ref.html
-skip-if(styloVsGecko) HTTP(..) == ex-unit-1.html ex-unit-1-ref.html
+skip-if(styloVsGecko) fails-if(stylo) HTTP(..) == ex-unit-1.html ex-unit-1-ref.html
-skip-if(styloVsGecko) HTTP(..) == ex-unit-1-dynamic.html ex-unit-1-ref.html
+skip-if(styloVsGecko||stylo) HTTP(..) == ex-unit-1-dynamic.html ex-unit-1-ref.html
 == local-1.html local-1-ref.html
 == local-styled-1.html local-styled-1-ref.html
--- a/layout/reftests/font-features/reftest.list
+++ b/layout/reftests/font-features/reftest.list
@@ -34,11 +34,11 @@ HTTP(..) == font-features-hlig-3.html font-features-noliga.html
 # compare font-language-override rendering to lang-tagged rendering
 HTTP(..) == font-features-turkish-override-1.html font-features-turkish.html
-fails-if(styloVsGecko) HTTP(..) == font-features-turkish-override-2.html font-features-turkish.html
+fails-if(styloVsGecko||stylo) HTTP(..) == font-features-turkish-override-2.html font-features-turkish.html
 # check use of font-language-override to override explicit lang tag
 HTTP(..) == font-features-turkish-override-3.html font-features-ref.html
-fails-if(styloVsGecko) HTTP(..) == font-features-turkish-override-4.html font-features-ref.html
+fails-if(styloVsGecko||stylo) HTTP(..) == font-features-turkish-override-4.html font-features-ref.html
 HTTP(..) == font-features-turkish-override-5.html font-features-turkish.html
 # check that last value wins if a feature is repeated
@@ -51,7 +51,7 @@ HTTP(..) == font-features-order-4.html font-features-noliga.html
 HTTP(..) == font-features-order-5.html font-features-hlig.html
 # check priority involving feature settings and font-variant-alternates
-fails-if(styloVsGecko) HTTP(..) == alternates-order.html alternates-order-ref.html
+fails-if(styloVsGecko||stylo) HTTP(..) == alternates-order.html alternates-order-ref.html
 # check that font-specific values line up with @font-face feature settings
 HTTP(..) == annotations.html annotations-ref.html
@@ -59,7 +59,7 @@ HTTP(..) == annotations.html annotations-ref.html
 # font-variant subproperties
 # test for specific features being on and others off, based on prop values
 # (debug problems with font-variant-debug.html which displays all props)
-fails-if(styloVsGecko) HTTP(..) == font-variant-alternates.html font-variant-alternates-ref.html
+fails-if(styloVsGecko||stylo) HTTP(..) == font-variant-alternates.html font-variant-alternates-ref.html
 HTTP(..) == font-variant-caps.html font-variant-caps-ref.html
 HTTP(..) == font-variant-east-asian.html font-variant-east-asian-ref.html
 HTTP(..) == font-variant-ligatures.html font-variant-ligatures-ref.html
--- a/layout/reftests/font-loading-api/reftest.list
+++ b/layout/reftests/font-loading-api/reftest.list
@@ -2,7 +2,7 @@ default-preferences pref(layout.css.font-loading-api.enabled,true)
 HTTP(..) == dynamic-insert-1.html dynamic-insert-1-ref.html
 HTTP(..) == dynamic-remove-1.html dynamic-remove-1-ref.html
-fails-if(styloVsGecko) HTTP(..) == ex-unit-1.html ../font-face/ex-unit-1-ref.html
+fails-if(styloVsGecko||stylo) HTTP(..) == ex-unit-1.html ../font-face/ex-unit-1-ref.html
 fuzzy-if(skiaContent,2,10) HTTP(..) == multiple-sets-1.html multiple-sets-1-ref.html
 HTTP(..) == name-collision.html ../font-face/name-collision-ref.html
 HTTP(..) == order-1.html ../font-face/order-1-ref.html
--- a/layout/reftests/forms/fieldset/reftest.list
+++ b/layout/reftests/forms/fieldset/reftest.list
@@ -2,7 +2,7 @@ fuzzy-if(skiaContent,2,13) == dynamic-legend-scroll-1.html dynamic-legend-scroll
 == fieldset-hidden-1.html fieldset-hidden-1-ref.html
 == fieldset-intrinsic-width-1.html fieldset-intrinsic-width-1-ref.html
 == fieldset-percentage-padding-1.html fieldset-percentage-padding-1-ref.html
-fails-if(styloVsGecko) == fieldset-scroll-1.html fieldset-scroll-1-ref.html
+fails-if(styloVsGecko||stylo) == fieldset-scroll-1.html fieldset-scroll-1-ref.html
 == fieldset-scrolled-1.html fieldset-scrolled-1-ref.html
 == fieldset-overflow-auto-1.html fieldset-overflow-auto-1-ref.html
 fuzzy-if(winWidget&&!layersGPUAccelerated,140,276) == positioned-container-1.html positioned-container-1-ref.html
@@ -14,8 +14,8 @@ fuzzy-if(winWidget&&!layersGPUAccelerated,140,276) == positioned-container-1.htm
 fuzzy-if(skiaContent,1,40768) == abs-pos-child-sizing.html abs-pos-child-sizing-ref.html
 == overflow-hidden.html overflow-hidden-ref.html
 == legend-rtl.html legend-rtl-ref.html
-fails-if(styloVsGecko) == fieldset-grid-001.html fieldset-grid-001-ref.html
+fails-if(styloVsGecko||stylo) == fieldset-grid-001.html fieldset-grid-001-ref.html
-fails-if(styloVsGecko) == fieldset-flexbox-001.html fieldset-flexbox-001-ref.html
+fails-if(styloVsGecko||stylo) == fieldset-flexbox-001.html fieldset-flexbox-001-ref.html
 == fieldset-min-width-1a.html fieldset-min-width-1-ref.html
 == fieldset-min-width-1b.html fieldset-min-width-1-ref.html
 == fieldset-min-width-2a.html fieldset-min-width-2-ref.html
--- a/layout/reftests/forms/input/number/reftest.list
+++ b/layout/reftests/forms/input/number/reftest.list
@@ -36,7 +36,7 @@ skip-if(Android) == number-max-height-2.html number-max-height-2-ref.html
 == number-significant-fractional-digits.html number-significant-fractional-digits-ref.html
 # focus
-fuzzy-if(skiaContent,2,5) needs-focus skip-if(styloVsGecko) == focus-handling.html focus-handling-ref.html
+fuzzy-if(skiaContent,2,5) needs-focus skip-if(styloVsGecko||stylo) == focus-handling.html focus-handling-ref.html
 # select
 fuzzy-if(skiaContent,1,1) skip-if(styloVsGecko) == number-selected.html number-selected-ref.html
--- a/layout/reftests/forms/legend/reftest.list
+++ b/layout/reftests/forms/legend/reftest.list
@@ -1,4 +1,4 @@
 == legend.html legend-ref.html
-fuzzy-if(skiaContent,1,7) pref(dom.webcomponents.enabled,true) fails-if(styloVsGecko) == shadow-dom.html shadow-dom-ref.html
+fuzzy-if(skiaContent,1,7) pref(dom.webcomponents.enabled,true) fails-if(styloVsGecko||stylo) == shadow-dom.html shadow-dom-ref.html
 == 1273433.html 1273433-ref.html
-fails-if(styloVsGecko) == 1339287.html 1339287-ref.html
+fails-if(styloVsGecko||stylo) == 1339287.html 1339287-ref.html
--- a/layout/reftests/forms/reftest.list
+++ b/layout/reftests/forms/reftest.list
@@ -2,7 +2,7 @@ fuzzy-if(skiaContent,1,10) fails-if(styloVsGecko) HTTP(..) == text-control-basel
 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),88,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
 fails-if(styloVsGecko) == display-block-baselines-3.html display-block-baselines-3-ref.html
-fails-if(styloVsGecko) == display-block-baselines-4.html display-block-baselines-4-ref.html
+fails-if(styloVsGecko||stylo) == display-block-baselines-4.html display-block-baselines-4-ref.html
 fuzzy-if(Android,4,8) fuzzy-if(skiaContent,7,2) == display-block-baselines-5.html display-block-baselines-5-ref.html
 # button element
--- a/layout/reftests/forms/textarea/reftest.list
+++ b/layout/reftests/forms/textarea/reftest.list
@@ -1,14 +1,14 @@
 skip-if(Android) fails-if(styloVsGecko) == 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) fails-if(styloVsGecko) == resize-background.html resize-background-ref.html
+skip-if(Android) skip-if(winWidget) fuzzy-if(cocoaWidget,1,33) fuzzy-if(skiaContent&&!winWidget&&!Android,5,10) fails-if(styloVsGecko||stylo) == resize-background.html resize-background-ref.html
-skip-if(Android) fails-if(styloVsGecko) != ltr.html rtl.html
+skip-if(Android) fails-if(styloVsGecko||stylo) != 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) fails-if(styloVsGecko) != ltr.html no-resize.html
+skip-if(Android) fails-if(styloVsGecko||stylo) != ltr.html no-resize.html
-skip-if(Android) fails-if(xulRuntime.widgetToolkit=="gtk2") fails-if(styloVsGecko) != rtl.html no-resize.html # bug 834724
+skip-if(Android) fails-if(xulRuntime.widgetToolkit=="gtk2") fails-if(styloVsGecko||stylo) != rtl.html no-resize.html # bug 834724
 fuzzy-if(skiaContent,1,1) fails-if(styloVsGecko) == rtl.html rtl-dynamic-attr.html
 fuzzy-if(skiaContent,1,1) fails-if(styloVsGecko) == rtl.html rtl-dynamic-style.html
 fails-if(styloVsGecko) == rtl.html in-dynamic-rtl-doc.html
 fuzzy-if(skiaContent,1,3) fails-if(styloVsGecko) == setvalue-framereconstruction-1.html setvalue-framereconstruction-ref.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,102,4168) fails-if(styloVsGecko) == padding-scrollbar-placement.html padding-scrollbar-placement-ref.html
+fuzzy-if(asyncPan&&!layersGPUAccelerated,102,4168) fails-if(styloVsGecko||stylo) == padding-scrollbar-placement.html padding-scrollbar-placement-ref.html
 fails-if(styloVsGecko) == various-cols.html various-cols-ref.html
--- a/layout/reftests/image/reftest.list
+++ b/layout/reftests/image/reftest.list
@@ -43,7 +43,7 @@ fuzzy(1,1) == image-orientation-explicit.html?180&flip image-orientation-ref.htm
 fuzzy(1,1) == image-orientation-explicit.html?270&flip image-orientation-ref.html?270&flip
 # Tests for image-orientation used with non-axis-aligned angles:
-fuzzy(1,1) fails-if(styloVsGecko) == image-orientation-explicit.html?-45      image-orientation-ref.html?0
+fuzzy(1,1) fails-if(styloVsGecko||stylo) == image-orientation-explicit.html?-45      image-orientation-ref.html?0
 fuzzy(1,1) == image-orientation-explicit.html?-15      image-orientation-ref.html?0
 fuzzy(1,1) == image-orientation-explicit.html?15       image-orientation-ref.html?0
 fuzzy(1,1) == image-orientation-explicit.html?45       image-orientation-ref.html?90
@@ -55,7 +55,7 @@ fuzzy(1,1) == image-orientation-explicit.html?195      image-orientation-ref.htm
 fuzzy(1,1) == image-orientation-explicit.html?225      image-orientation-ref.html?270
 fuzzy(1,1) == image-orientation-explicit.html?255      image-orientation-ref.html?270
 fuzzy(1,1) == image-orientation-explicit.html?285      image-orientation-ref.html?270
-fuzzy(1,1) fails-if(styloVsGecko) == image-orientation-explicit.html?315      image-orientation-ref.html?0
+fuzzy(1,1) fails-if(styloVsGecko||stylo) == image-orientation-explicit.html?315      image-orientation-ref.html?0
 fuzzy(1,1) == image-orientation-explicit.html?345      image-orientation-ref.html?0
 # Tests for image-orientation used on generated content:
--- a/layout/reftests/mathml/reftest.list
+++ b/layout/reftests/mathml/reftest.list
@@ -11,8 +11,8 @@ fails-if(!styloVsGecko) == dir-9.html dir-9-ref.html # Bug 787215
 == dir-10.html dir-10-ref.html
 == dir-11.html dir-11-ref.html
 == css-spacing-1.html css-spacing-1-ref.html
-pref(mathml.disabled,true) fails-if(styloVsGecko) == disabled-scriptlevel-1.html disabled-scriptlevel-1-ref.html
+pref(mathml.disabled,true) fails-if(styloVsGecko||stylo) == disabled-scriptlevel-1.html disabled-scriptlevel-1-ref.html
-pref(mathml.disabled,true) fails-if(styloVsGecko) == disabled-scriptlevel-1.xhtml disabled-scriptlevel-1-ref.xhtml
+pref(mathml.disabled,true) fails-if(styloVsGecko||stylo) == disabled-scriptlevel-1.xhtml disabled-scriptlevel-1-ref.xhtml
 == displaystyle-1.html displaystyle-1-ref.html
 == displaystyle-2.html displaystyle-2-ref.html
 == displaystyle-3.html displaystyle-3-ref.html
@@ -294,8 +294,8 @@ fails-if(Android||OSX) == mathvariant-2.html mathvariant-2-ref.html # Bugs 10106
 == mathvariant-4.html mathvariant-4-ref.html
 == mathvariant-5.html mathvariant-5-ref.html
 == dtls-1.html dtls-1-ref.html
-fails-if(styloVsGecko) == dtls-2.html dtls-2-ref.html # bug 1366206
+fails-if(styloVsGecko||stylo) == dtls-2.html dtls-2-ref.html # bug 1366206
-fails-if(styloVsGecko) == dtls-3.html dtls-3-ref.html # bug 1366206
+fails-if(styloVsGecko||stylo) == dtls-3.html dtls-3-ref.html # bug 1366206
 == ssty-1.html ssty-1-ref.html
 == ssty-2.html ssty-2-ref.html
 == ssty-3.html ssty-3-ref.html
@@ -369,7 +369,7 @@ fuzzy-if(OSX,1,100) fuzzy-if(skiaContent,1,14) == mfrac-D-1.html mfrac-D-1-ref.h
 == mfrac-E-1.html mfrac-E-1-ref.html
 test-pref(dom.webcomponents.enabled,true) == shadow-dom-1.html shadow-dom-1-ref.html
 pref(font.size.inflation.emPerLine,25) == font-inflation-1.html font-inflation-1-ref.html
-test-pref(font.minimum-size.x-math,40) fails-if(styloVsGecko) == default-font.html default-font-ref.html
+test-pref(font.minimum-size.x-math,40) fails-if(styloVsGecko||stylo) == default-font.html default-font-ref.html
 != radicalbar-1.html about:blank
 != radicalbar-1a.html about:blank
 != radicalbar-1b.html about:blank
--- a/layout/reftests/native-theme/reftest.list
+++ b/layout/reftests/native-theme/reftest.list
@@ -12,7 +12,7 @@ fails-if(styloVsGecko) != textarea-not-blank.html about:blank
 # 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-nonnative.html
-fuzzy-if(skiaContent,2,88) fails-if(styloVsGecko) == text-input-nonnative-when-styled.html text-input-nonnative-when-styled-ref.html
+fuzzy-if(skiaContent,2,88) fails-if(styloVsGecko||stylo) == text-input-nonnative-when-styled.html text-input-nonnative-when-styled-ref.html
 fails-if(!nativeThemePref) fails-if(styloVsGecko) != textarea-native.html textarea-nonnative.html
 fuzzy-if(skiaContent,2,53) fails-if(styloVsGecko) == textarea-nonnative-when-styled.html textarea-nonnative-when-styled-ref.html
 fails-if(!nativeThemePref) != button-native.html button-nonnative.html
--- a/layout/reftests/pagination/reftest.list
+++ b/layout/reftests/pagination/reftest.list
@@ -74,4 +74,4 @@ fuzzy-if(skiaContent,1,23) == resize-reflow-001.html resize-reflow-001.ref.html
 # == table-caption-splitaftercaption-10.html blank.html # bug 672654
 # == table-caption-splitaftercaption-11.html blank.html # bug 672654
 == column-balancing-break-inside-avoid-2.html column-balancing-break-inside-avoid-2-ref.html
-fails-if(styloVsGecko) == combobox-page-break-inside.html combobox-page-break-inside-ref.html
+fails-if(styloVsGecko||stylo) == combobox-page-break-inside.html combobox-page-break-inside-ref.html
--- a/layout/reftests/pixel-rounding/reftest.list
+++ b/layout/reftests/pixel-rounding/reftest.list
@@ -179,5 +179,5 @@ fuzzy-if(skiaContent,1,145) == rounded-background-color-width-left-6.html rounde
 == iframe-1.html iframe-1-ref.html
-fails-if(styloVsGecko) == viewport-units-rounding-1.html viewport-units-rounding-1-ref.html
+fails-if(styloVsGecko||stylo) == viewport-units-rounding-1.html viewport-units-rounding-1-ref.html
 == viewport-units-rounding-2.html about:blank
--- a/layout/reftests/printing/reftest.list
+++ b/layout/reftests/printing/reftest.list
@@ -23,7 +23,7 @@
 == 626395-2c.html 626395-2-ref.html
 == 626395-2d.html 626395-2-ref.html
 == 652178-1.html 652178-1-ref.html
-fails-if(styloVsGecko) == 115199-1.html 115199-1-ref.html
+fails-if(styloVsGecko||stylo) == 115199-1.html 115199-1-ref.html
 == 115199-2a.html 115199-2-ref.html
 == 115199-2b.html 115199-2-ref.html
 == 652178-1.html 652178-1-ref2.html
--- a/layout/reftests/scoped-style/reftest.list
+++ b/layout/reftests/scoped-style/reftest.list
@@ -1,57 +1,57 @@
-fails-if(styloVsGecko) == scoped-style-001.html scoped-style-001-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-001.html scoped-style-001-ref.html
-fails-if(styloVsGecko) == scoped-style-002.html scoped-style-002-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-002.html scoped-style-002-ref.html
-fails-if(styloVsGecko) == scoped-style-003.html scoped-style-003-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-003.html scoped-style-003-ref.html
-fails-if(styloVsGecko) == scoped-style-004.html scoped-style-004-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-004.html scoped-style-004-ref.html
-fails-if(styloVsGecko) == scoped-style-005.html scoped-style-005-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-005.html scoped-style-005-ref.html
 == scoped-style-006.html scoped-style-006-ref.html
 == scoped-style-007.html scoped-style-007-ref.html
-fails-if(styloVsGecko) == scoped-style-008.html scoped-style-008-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-008.html scoped-style-008-ref.html
-fails-if(styloVsGecko) == scoped-style-009.html scoped-style-009-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-009.html scoped-style-009-ref.html
-fails-if(styloVsGecko) == scoped-style-010.html scoped-style-010-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-010.html scoped-style-010-ref.html
-fails-if(styloVsGecko) == scoped-style-011.html scoped-style-011-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-011.html scoped-style-011-ref.html
-fails-if(styloVsGecko) == scoped-style-012.html scoped-style-012-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-012.html scoped-style-012-ref.html
-fails-if(styloVsGecko) == scoped-style-013.html scoped-style-013-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-013.html scoped-style-013-ref.html
 == scoped-style-014.html scoped-style-014-ref.html
-fails-if(styloVsGecko) == scoped-style-015.html scoped-style-015-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-015.html scoped-style-015-ref.html
 == scoped-style-016.html scoped-style-016-ref.html
-fails-if(styloVsGecko) == scoped-style-017.html scoped-style-017-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-017.html scoped-style-017-ref.html
-fails-if(styloVsGecko) == scoped-style-018.html scoped-style-018-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-018.html scoped-style-018-ref.html
-fails-if(styloVsGecko) == scoped-style-019.svg scoped-style-019-ref.svg
+fails-if(styloVsGecko||stylo) == scoped-style-019.svg scoped-style-019-ref.svg
 == scoped-style-020.html scoped-style-020-ref.html
 == scoped-style-021.html scoped-style-021-ref.html
 == scoped-style-022.html scoped-style-022-ref.html
-fails-if(styloVsGecko) == scoped-style-023.html scoped-style-023-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-023.html scoped-style-023-ref.html
 == scoped-style-024.html scoped-style-024-ref.html
 == scoped-style-important-001.html scoped-style-important-001-ref.html
-fails-if(styloVsGecko) == scoped-style-important-002.html scoped-style-important-002-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-important-002.html scoped-style-important-002-ref.html
 == scoped-style-important-003.html scoped-style-important-003-ref.html
 == scoped-style-important-004.html scoped-style-important-004-ref.html
 == scoped-style-important-005.html scoped-style-important-005-ref.html
 == scoped-style-important-006.html scoped-style-important-006-ref.html
 == scoped-style-important-007.html scoped-style-important-007-ref.html
-fails-if(styloVsGecko) == scoped-style-dynamic-001.html scoped-style-dynamic-001-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-dynamic-001.html scoped-style-dynamic-001-ref.html
-fails-if(styloVsGecko) == scoped-style-dynamic-002.html scoped-style-dynamic-002-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-dynamic-002.html scoped-style-dynamic-002-ref.html
-fails-if(styloVsGecko) == scoped-style-dynamic-003.html scoped-style-dynamic-003-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-dynamic-003.html scoped-style-dynamic-003-ref.html
-fails-if(styloVsGecko) == scoped-style-dynamic-004.html scoped-style-dynamic-004-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-dynamic-004.html scoped-style-dynamic-004-ref.html
-asserts-if(styloVsGecko,1) == scoped-style-dynamic-005.html scoped-style-dynamic-005-ref.html
+asserts-if(styloVsGecko,1) asserts-if(stylo,1) == scoped-style-dynamic-005.html scoped-style-dynamic-005-ref.html
-skip-if(styloVsGecko) == scoped-style-dynamic-006.html scoped-style-dynamic-006-ref.html
+skip-if(styloVsGecko) asserts-if(stylo,1) fails-if(stylo) == scoped-style-dynamic-006.html scoped-style-dynamic-006-ref.html
-fails-if(styloVsGecko) == scoped-style-dynamic-007.html scoped-style-dynamic-007-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-dynamic-007.html scoped-style-dynamic-007-ref.html
-fails-if(styloVsGecko) == scoped-style-dynamic-008.html scoped-style-dynamic-008-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-dynamic-008.html scoped-style-dynamic-008-ref.html
-skip-if(styloVsGecko) == scoped-style-dynamic-009.html scoped-style-dynamic-009-ref.html
+skip-if(styloVsGecko) asserts-if(stylo,1) fails-if(stylo) == scoped-style-dynamic-009.html scoped-style-dynamic-009-ref.html
-asserts-if(styloVsGecko,1) == scoped-style-dynamic-010.html scoped-style-dynamic-010-ref.html
+asserts-if(styloVsGecko,1) asserts-if(stylo,1) == scoped-style-dynamic-010.html scoped-style-dynamic-010-ref.html
-fails-if(styloVsGecko) == scoped-style-dynamic-011.html scoped-style-dynamic-011-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-dynamic-011.html scoped-style-dynamic-011-ref.html
-asserts-if(styloVsGecko,1) == scoped-style-dynamic-012.svg scoped-style-dynamic-012-ref.svg
+asserts-if(styloVsGecko,1) asserts-if(stylo,1) == scoped-style-dynamic-012.svg scoped-style-dynamic-012-ref.svg
-fails-if(styloVsGecko) asserts-if(styloVsGecko,1) == scoped-style-dynamic-013.svg scoped-style-dynamic-013-ref.svg
+fails-if(styloVsGecko) asserts-if(styloVsGecko,1) asserts-if(stylo,1) fails-if(stylo) == scoped-style-dynamic-013.svg scoped-style-dynamic-013-ref.svg
-asserts-if(styloVsGecko,1) == scoped-style-dynamic-014.svg scoped-style-dynamic-014-ref.svg
+asserts-if(styloVsGecko,1) asserts-if(stylo,1) == scoped-style-dynamic-014.svg scoped-style-dynamic-014-ref.svg
-fails-if(styloVsGecko) asserts-if(styloVsGecko,1) == scoped-style-dynamic-015.svg scoped-style-dynamic-015-ref.svg
+fails-if(styloVsGecko) asserts-if(styloVsGecko,1) asserts-if(stylo,1) fails-if(stylo) == scoped-style-dynamic-015.svg scoped-style-dynamic-015-ref.svg
-fails-if(styloVsGecko) == scoped-style-import.html scoped-style-import-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-import.html scoped-style-import-ref.html
-fails-if(styloVsGecko) == scoped-style-media.html scoped-style-media-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-media.html scoped-style-media-ref.html
-fails-if(styloVsGecko) == scoped-style-namespace.html scoped-style-namespace-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-namespace.html scoped-style-namespace-ref.html
-fails-if(styloVsGecko) == scoped-style-charset.html scoped-style-charset-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-charset.html scoped-style-charset-ref.html
-fails-if(styloVsGecko) == scoped-style-document.html scoped-style-document-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-document.html scoped-style-document-ref.html
-fails-if(styloVsGecko) HTTP(..) == scoped-style-font-face.html scoped-style-font-face-ref.html
+fails-if(styloVsGecko||stylo) HTTP(..) == scoped-style-font-face.html scoped-style-font-face-ref.html
-fails-if(styloVsGecko) == scoped-style-keyframes.html scoped-style-keyframes-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-keyframes.html scoped-style-keyframes-ref.html
-fails-if(styloVsGecko) == scoped-style-supports.html scoped-style-supports-ref.html
+fails-if(styloVsGecko||stylo) == scoped-style-supports.html scoped-style-supports-ref.html
-pref(layout.css.scope-pseudo.enabled,true) fails-if(styloVsGecko) == scoped-style-pseudo-001.html scoped-style-pseudo-001-ref.html
+pref(layout.css.scope-pseudo.enabled,true) fails-if(styloVsGecko||stylo) == scoped-style-pseudo-001.html scoped-style-pseudo-001-ref.html
-pref(layout.css.scope-pseudo.enabled,true) fails-if(styloVsGecko) == scoped-style-pseudo-002.html scoped-style-pseudo-002-ref.html
+pref(layout.css.scope-pseudo.enabled,true) fails-if(styloVsGecko||stylo) == scoped-style-pseudo-002.html scoped-style-pseudo-002-ref.html
 pref(layout.css.scope-pseudo.enabled,true) == scoped-style-pseudo-003.html scoped-style-pseudo-003-ref.html
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@@ -57,30 +57,30 @@ fuzzy(1,2) fuzzy-if(azureSkia,1,40000) == canvas-drawImage-alpha-2.html canvas-d
 # Context paint tests (this feature is currently not part of any spec.)
 # context-fill:
 == context-fill-01.html blue100x100-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-fill-01.html lime100x100-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-fill-01.html lime100x100-ref.html
 == context-fill-02.html transparent100x100-w-border-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-fill-02.html lime100x100-w-border-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-fill-02.html lime100x100-w-border-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-fill-03.html lime100x100-50pct-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-fill-03.html lime100x100-50pct-ref.html
 # fuzz because on win8 the r & b components are off by one
-fails-if(styloVsGecko) fuzzy-if(winWidget,1,10000) test-pref(svg.context-properties.content.enabled,true) == context-fill-04.html lime100x100-50pct-ref.html
+fails-if(styloVsGecko) fuzzy-if(winWidget,1,10000) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-fill-04.html lime100x100-50pct-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-fill-05.html context-fill-or-stroke-05-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-fill-05.html context-fill-or-stroke-05-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-fill-06.html lime100x100-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-fill-06.html lime100x100-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-fill-07.html context-fill-07-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-fill-07.html context-fill-07-ref.html
 test-pref(svg.context-properties.content.enabled,true) == context-fill-08.html blue100x100-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-fill-bg-image-01.html blue100x100-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-fill-bg-image-01.html blue100x100-ref.html
 # context-stroke:
 == context-stroke-01.html blue100x100-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-stroke-01.html lime100x100-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-stroke-01.html lime100x100-ref.html
 == context-stroke-02.html transparent100x100-w-border-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-stroke-02.html lime100x100-w-border-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-stroke-02.html lime100x100-w-border-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-stroke-03.html lime100x100-50pct-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-stroke-03.html lime100x100-50pct-ref.html
 # fuzz because on win8 the r & b components are off by one
-fails-if(styloVsGecko) fuzzy-if(winWidget,1,10000) test-pref(svg.context-properties.content.enabled,true) == context-stroke-04.html lime100x100-50pct-ref.html
+fails-if(styloVsGecko) fuzzy-if(winWidget,1,10000) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-stroke-04.html lime100x100-50pct-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-stroke-05.html context-fill-or-stroke-05-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-stroke-05.html context-fill-or-stroke-05-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-stroke-06.html lime100x100-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-stroke-06.html lime100x100-ref.html
 test-pref(svg.context-properties.content.enabled,true) == context-stroke-07.html context-stroke-07-ref.html
 test-pref(svg.context-properties.content.enabled,true) == context-stroke-08.html blue100x100-border-ref.html
-fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) == context-stroke-bg-image-01.html blue100x100-border-ref.html
+fails-if(styloVsGecko) test-pref(svg.context-properties.content.enabled,true) fails-if(stylo) == context-stroke-bg-image-01.html blue100x100-border-ref.html
 # Simple <img> tests
 == img-simple-1.html  lime100x100-ref.html
--- a/layout/reftests/svg/filters/css-filters/reftest.list
+++ b/layout/reftests/svg/filters/css-filters/reftest.list
@@ -10,7 +10,7 @@ default-preferences pref(layout.css.filters.enabled,true)
 skip-if(d2d) == blur-cap-large-radius-on-software.html blur-cap-large-radius-on-software-ref.html
 == blur-em-radius.html blur-em-radius-ref.html
 == blur-invalid-radius.html blur-invalid-radius-ref.html
-fails-if(stylo) == blur-rem-radius.html blur-rem-radius-ref.html
+fails-if(styloVsGecko||stylo) == blur-rem-radius.html blur-rem-radius-ref.html
 == blur-zero-radius.html blur-zero-radius-ref.html
 == blur-zoomed-page.html blur-zoomed-page-ref.html
 == brightness.html brightness-ref.html
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -95,9 +95,9 @@ default-preferences
 fuzzy-if(skiaContent,1,320) == conditions-08.svg conditions-08-ref.svg
 == conditions-09.svg conditions-09-ref.svg
-fails-if(styloVsGecko) == currentColor-01.svg pass.svg
+fails-if(styloVsGecko||stylo) == currentColor-01.svg pass.svg
-fails-if(styloVsGecko) == currentColor-02.svg pass.svg
+fails-if(styloVsGecko||stylo) == currentColor-02.svg pass.svg
-fails-if(styloVsGecko) == currentColor-03.svg pass.svg
+fails-if(styloVsGecko||stylo) == currentColor-03.svg pass.svg
 == data-uri-with-filter-01.xhtml data-uri-with-filter-01-ref.svg
 == data-uri-with-gradient-01.xhtml data-uri-with-gradient-01-ref.svg
@@ -289,7 +289,7 @@ fuzzy(1,5000) == mask-opacity-01.svg mask-opacity-01-ref.svg
 fuzzy-if(d2d||skiaContent,1,6400) == mask-type-01.svg mask-type-01-ref.svg
 fuzzy-if(d2d||skiaContent,1,6400) == mask-type-02.svg mask-type-01-ref.svg
 fuzzy-if(d2d||skiaContent,1,6400) == mask-type-03.svg mask-type-01-ref.svg
-fuzzy-if(d2d||skiaContent,1,6400) fails-if(styloVsGecko) == mask-type-04.svg mask-type-01-ref.svg
+fuzzy-if(d2d||skiaContent,1,6400) fails-if(styloVsGecko||stylo) == mask-type-04.svg mask-type-01-ref.svg
 == mask-use-element-01.svg pass.svg
 != nested-mask-mode.svg about:blank
--- a/layout/reftests/svg/smil/container/reftest.list
+++ b/layout/reftests/svg/smil/container/reftest.list
@@ -5,8 +5,8 @@
 random == enveloped-tree-1.xhtml enveloped-tree-1-ref.xhtml  # bug 470868
 fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,3) fuzzy-if(skiaContent,1,810) == promoted-tree-1.xhtml promoted-tree-1-ref.xhtml
 random == moved-tree-1.xhtml moved-tree-1-ref.xhtml  # bug 470868
-random-if(cocoaWidget||d2d) fails-if(styloVsGecko) == deferred-anim-1.xhtml deferred-anim-1-ref.xhtml # bug 470868, bug 585484
+random-if(cocoaWidget||d2d) fails-if(styloVsGecko||stylo) == deferred-anim-1.xhtml deferred-anim-1-ref.xhtml # bug 470868, bug 585484
-random-if(cocoaWidget&&layersGPUAccelerated) fails-if(styloVsGecko) == deferred-tree-1.xhtml deferred-tree-1-ref.xhtml # bug 470868
+random-if(cocoaWidget&&layersGPUAccelerated) fails-if(styloVsGecko||stylo) == deferred-tree-1.xhtml deferred-tree-1-ref.xhtml # bug 470868
 random-if(cocoaWidget&&layersGPUAccelerated) fuzzy-if(skiaContent,1,530) == deferred-tree-2a.xhtml deferred-tree-2-ref.xhtml # bug 470868
 random-if(cocoaWidget&&layersGPUAccelerated) fuzzy-if(skiaContent,1,530) == deferred-tree-2b.xhtml deferred-tree-2-ref.xhtml # bug 470868
 fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,16) fuzzy-if(skiaContent,1,410) == deferred-tree-3a.xhtml deferred-tree-3-ref.xhtml
--- a/layout/reftests/svg/smil/event/reftest.list
+++ b/layout/reftests/svg/smil/event/reftest.list
@@ -1,32 +1,32 @@
 # Tests related to SVG Animation (using SMIL) that use event timing.
-fails-if(styloVsGecko) == event-begin-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-begin-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-begin-offset-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-begin-offset-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-begin-offset-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-begin-offset-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-begin-timeevent-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-begin-timeevent-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-begin-timeevent-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-begin-timeevent-2.svg green-box-ref.svg
-random-if(Android) fails-if(styloVsGecko) == event-begin-timeevent-3.svg green-box-ref.svg
+random-if(Android) fails-if(styloVsGecko||stylo) == event-begin-timeevent-3.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-begin-load-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-begin-load-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-bubble-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-bubble-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-custom-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-custom-1.svg green-box-ref.svg
 == event-end-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-end-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-end-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-end-open-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-end-open-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-end-trimmed-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-end-trimmed-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-preventDefault-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-preventDefault-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-seek-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-seek-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-target-default-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-target-default-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-target-default-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-target-default-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-target-id-change-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == 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
-fails-if(styloVsGecko) == event-target-xlink-change-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-target-xlink-change-1.svg green-box-ref.svg
 == event-target-xlink-change-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-target-xlink-change-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-target-xlink-change-3.svg green-box-ref.svg
 == event-target-xlink-change-4.svg green-box-ref.svg
 == event-target-surgery-1.svg green-box-ref.svg
 == event-target-surgery-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-target-surgery-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == event-target-surgery-3.svg green-box-ref.svg
-fails-if(styloVsGecko) == event-target-non-svg-1.xhtml green-box-ref.xhtml
+fails-if(styloVsGecko||stylo) == event-target-non-svg-1.xhtml green-box-ref.xhtml
-fails-if(styloVsGecko) == accesskey-entity-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == accesskey-entity-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == accesskey-entity-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == accesskey-entity-2.svg green-box-ref.svg
--- a/layout/reftests/svg/smil/reftest.list
+++ b/layout/reftests/svg/smil/reftest.list
@@ -75,9 +75,9 @@ include event/reftest.list
 == anim-indefinite-to-4.svg        anim-standard-ref.svg
 fails-if(!styloVsGecko) == anim-fillcolor-1.svg      anim-standard-ref.svg # bug 436296
-fails-if(styloVsGecko) == anim-fillopacity-1none.svg anim-standard-ref.svg
+fails-if(styloVsGecko||stylo) == anim-fillopacity-1none.svg anim-standard-ref.svg
-fails-if(styloVsGecko) == anim-fillopacity-1css.svg  anim-standard-ref.svg
+fails-if(styloVsGecko||stylo) == anim-fillopacity-1css.svg  anim-standard-ref.svg
-fails-if(styloVsGecko) == anim-fillopacity-1xml.svg  anim-standard-ref.svg
+fails-if(styloVsGecko||stylo) == anim-fillopacity-1xml.svg  anim-standard-ref.svg
 fuzzy-if(skiaContent,1,3600) == anim-opacity-01.svg lime.svg
@@ -156,23 +156,23 @@ skip-if(styloVsGecko) == anim-view-01.svg#view lime.svg # bug 1354406
 == anim-use-href-01.svg lime.svg
 # animate the class attribute
-fails-if(styloVsGecko) == anim-class-01.svg lime.svg
+fails-if(styloVsGecko||stylo) == anim-class-01.svg lime.svg
-fails-if(styloVsGecko) == anim-class-02.svg lime.svg
+fails-if(styloVsGecko||stylo) == anim-class-02.svg lime.svg
-fails-if(styloVsGecko) == anim-class-03.svg lime.svg
+fails-if(styloVsGecko||stylo) == anim-class-03.svg lime.svg
-fails-if(styloVsGecko) == anim-class-04.svg anim-class-04-ref.svg
+fails-if(styloVsGecko||stylo) == anim-class-04.svg anim-class-04-ref.svg
 # animate with some paint server values
-fails-if(styloVsGecko) == anim-paintserver-1.svg anim-paintserver-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-paintserver-1.svg anim-paintserver-1-ref.svg
 # animate attributes on text content children
 == anim-text-attr-01.svg anim-text-attr-01-ref.svg
 # animate where the base value is non-interpolatable but will be replaced anyway
-fails-if(styloVsGecko) == anim-fill-overpaintserver-1.svg lime.svg
+fails-if(styloVsGecko||stylo) == anim-fill-overpaintserver-1.svg lime.svg
-fails-if(styloVsGecko) == anim-fill-overpaintserver-2.svg lime.svg
+fails-if(styloVsGecko||stylo) == anim-fill-overpaintserver-2.svg lime.svg
 # animate where we fallback from 'additive' animation to non-additive
-fails-if(styloVsGecko) == anim-additive-fallback-1.svg anim-standard-ref.svg
+fails-if(styloVsGecko||stylo) == anim-additive-fallback-1.svg anim-standard-ref.svg
 == anim-remove-1.svg anim-standard-ref.svg
 == anim-remove-2.svg anim-standard-ref.svg
@@ -183,7 +183,7 @@ fails-if(styloVsGecko) == anim-additive-fallback-1.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(styloVsGecko) == anim-remove-9.svg anim-standard-ref.svg
+fails-if(styloVsGecko||stylo) == anim-remove-9.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
@@ -248,18 +248,18 @@ fuzzy-if(cocoaWidget&&layersGPUAccelerated,1,2) == anim-gradient-attr-presence-0
 == freeze-applied-late-4.svg anim-standard-ref.svg
 == frozen-to-anim-1.svg lime.svg
-fails-if(styloVsGecko) == inactivate-with-active-unchanged-1.svg anim-standard-ref.svg
+fails-if(styloVsGecko||stylo) == inactivate-with-active-unchanged-1.svg anim-standard-ref.svg
-fails-if(styloVsGecko) == inactivate-with-active-unchanged-2.svg anim-standard-ref.svg
+fails-if(styloVsGecko||stylo) == inactivate-with-active-unchanged-2.svg anim-standard-ref.svg
-fails-if(styloVsGecko) == mapped-attr-long-url-1.svg lime.svg
+fails-if(styloVsGecko||stylo) == mapped-attr-long-url-1.svg lime.svg
-fails-if(styloVsGecko) == mapped-attr-long-url-2.svg lime.svg
+fails-if(styloVsGecko||stylo) == mapped-attr-long-url-2.svg lime.svg
 == min-1.svg lime.svg
-fails-if(styloVsGecko) == smil-transitions-interaction-1a.svg lime.svg
+fails-if(styloVsGecko||stylo) == smil-transitions-interaction-1a.svg lime.svg
-fails-if(styloVsGecko) == smil-transitions-interaction-1b.svg lime.svg
+fails-if(styloVsGecko||stylo) == smil-transitions-interaction-1b.svg lime.svg
-fails-if(styloVsGecko) == smil-transitions-interaction-2a.svg lime.svg
+fails-if(styloVsGecko||stylo) == smil-transitions-interaction-2a.svg lime.svg
-fails-if(styloVsGecko) == smil-transitions-interaction-2b.svg lime.svg
+fails-if(styloVsGecko||stylo) == smil-transitions-interaction-2b.svg lime.svg
 == smil-transitions-interaction-3a.svg lime.svg
 == smil-transitions-interaction-3b.svg lime.svg
 == smil-transitions-interaction-4a.svg lime.svg
@@ -269,19 +269,19 @@ fails-if(styloVsGecko) == smil-transitions-interaction-2b.svg lime.svg
 == filtered-instance-time-1.svg anim-standard-ref.svg
 # Test animation using defs element
-fails-if(styloVsGecko) == anim-defs-gradient-property.svg lime.svg
+fails-if(styloVsGecko||stylo) == anim-defs-gradient-property.svg lime.svg
 == anim-defs-gradient-attribute.svg lime.svg
-fails-if(styloVsGecko) == anim-defs-fill.svg lime.svg
+fails-if(styloVsGecko||stylo) == anim-defs-fill.svg lime.svg
 == anim-defs-width.svg lime.svg
 # Test animation that changes 'display' attribute
-fails-if(styloVsGecko) == anim-display.svg lime.svg
+fails-if(styloVsGecko||stylo) == anim-display.svg lime.svg
-fails-if(styloVsGecko) == anim-display-in-g-element.svg lime.svg
+fails-if(styloVsGecko||stylo) == anim-display-in-g-element.svg lime.svg
 # Test animation that change 'display' style value to 'none'
 == anim-change-display-none-for-ancestor-elem.html lime.html
 == anim-change-display-none-for-target-elem.html lime.html
 == anim-change-display-none-for-dynamically-appended-elem.html lime.html
-fails-if(styloVsGecko) == anim-change-display-block-for-dynamically-appended-elem.html anim-standard-ref.html
+fails-if(styloVsGecko||stylo) == anim-change-display-block-for-dynamically-appended-elem.html anim-standard-ref.html
 pref(layout.css.clip-path-shapes.enabled,true) fuzzy(63,146) == anim-clipPath-viewBox.svg anim-clipPath-viewBox-ref.svg
--- a/layout/reftests/svg/smil/repeat/reftest.list
+++ b/layout/reftests/svg/smil/repeat/reftest.list
@@ -1,3 +1,3 @@
 # Tests for repeat behaviour
-fails-if(styloVsGecko) == indefinite-repeat-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == indefinite-repeat-1.svg green-box-ref.svg
 == init-repeat-1.svg init-repeat-1-ref.svg
--- a/layout/reftests/svg/smil/restart/reftest.list
+++ b/layout/reftests/svg/smil/restart/reftest.list
@@ -1,8 +1,8 @@
 # Tests for restart behaviour
 == reset-1.svg reset-1-ref.svg
 == reset-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == reset-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == reset-3.svg green-box-ref.svg
 == reset-4.svg green-box-ref.svg
 # reset-5.svg is no longer valid and has been removed
-fails-if(styloVsGecko) == reset-6.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == reset-6.svg green-box-ref.svg
 == reset-7.svg green-box-ref.svg
--- a/layout/reftests/svg/smil/style/reftest.list
+++ b/layout/reftests/svg/smil/style/reftest.list
@@ -4,46 +4,46 @@
 # (when it's implemented)
 # 'color' property, from/to/by with named colors & hex values
-fails-if(styloVsGecko) == anim-css-color-1-by-ident-hex.svg         anim-css-fill-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-color-1-by-ident-hex.svg         anim-css-fill-1-ref.svg
-fails-if(styloVsGecko) == anim-css-color-1-from-by-hex-hex.svg      anim-css-fill-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-color-1-from-by-hex-hex.svg      anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-color-1-from-by-ident-hex.svg    anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-color-1-from-by-ident-hex.svg    anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-color-1-from-to-hex-hex.svg      anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-color-1-from-to-hex-hex.svg      anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-color-1-from-to-ident-ident.svg  anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-color-1-from-to-ident-ident.svg  anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-color-1-to-ident-hex.svg         anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-color-1-to-ident-hex.svg         anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-color-1-to-ident-ident.svg       anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-color-1-to-ident-ident.svg       anim-css-fill-1-ref.svg
 # 'color' property, paced calcMode
-fails-if(styloVsGecko) == anim-css-color-2-paced-rgb.svg            anim-css-fill-2-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-color-2-paced-rgb.svg            anim-css-fill-2-ref.svg
 # 'color' property, animating *by* a named color
-fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko) == anim-css-color-3-by-ident-ident.svg       anim-css-fill-3-ref.svg
+fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko||stylo) == anim-css-color-3-by-ident-ident.svg       anim-css-fill-3-ref.svg
-fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko) == anim-css-color-3-from-by-ident-ident.svg  anim-css-fill-3-ref.svg
+fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko||stylo) == anim-css-color-3-from-by-ident-ident.svg  anim-css-fill-3-ref.svg
-fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko) == anim-css-color-3-from-by-rgb-ident.svg    anim-css-fill-3-ref.svg
+fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko||stylo) == anim-css-color-3-from-by-rgb-ident.svg    anim-css-fill-3-ref.svg
 # 'fill' property, from/to/by with named colors & hex values
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-by-ident-hex.svg         anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-by-ident-hex.svg         anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-from-by-hex-hex.svg      anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-from-by-hex-hex.svg      anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-from-by-ident-hex.svg    anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-from-by-ident-hex.svg    anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-from-to-hex-hex.svg      anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-from-to-hex-hex.svg      anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-from-to-ident-ident.svg  anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-from-to-ident-ident.svg  anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-to-ident-hex.svg         anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-to-ident-hex.svg         anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-to-ident-ident.svg       anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-to-ident-ident.svg       anim-css-fill-1-ref.svg
 # 'fill' property, from/to/by, with 'currentColor' keyword
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-by-ident-curcol.svg      anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-by-ident-curcol.svg      anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-from-by-curcol-hex.svg   anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-from-by-curcol-hex.svg   anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-from-by-hex-curcol.svg   anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-from-by-hex-curcol.svg   anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-from-to-curcol-hex.svg   anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-from-to-curcol-hex.svg   anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-from-to-hex-curcol.svg   anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-from-to-hex-curcol.svg   anim-css-fill-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fill-1-to-ident-curcol.svg      anim-css-fill-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fill-1-to-ident-curcol.svg      anim-css-fill-1-ref.svg
 # 'fill' property, paced calcMode
-fails-if(styloVsGecko) == anim-css-fill-2-paced-rgb.svg            anim-css-fill-2-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-fill-2-paced-rgb.svg            anim-css-fill-2-ref.svg
 # 'fill' property, animating *by* a named color
-fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko) == anim-css-fill-3-by-ident-ident.svg       anim-css-fill-3-ref.svg
+fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko||stylo) == anim-css-fill-3-by-ident-ident.svg       anim-css-fill-3-ref.svg
-fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko) == anim-css-fill-3-from-by-ident-ident.svg  anim-css-fill-3-ref.svg
+fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko||stylo) == anim-css-fill-3-from-by-ident-ident.svg  anim-css-fill-3-ref.svg
-fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko) == anim-css-fill-3-from-by-rgb-ident.svg    anim-css-fill-3-ref.svg
+fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko||stylo) == anim-css-fill-3-from-by-rgb-ident.svg    anim-css-fill-3-ref.svg
 # check handling of overflowing color values
 # NOTE: The second test fails because we compute "from + by" as the animation
@@ -51,23 +51,23 @@ fuzzy-if(skiaContent,1,580) fails-if(styloVsGecko) == anim-css-fill-3-from-by-rg
 # the clamped value for interpolation.  That's earlier than the SVG spec wants
 # us to clamp -- we're only supposed to clamp *final presentation values*.
 # (Reference: SVG 1.1 Appendix F.4)
-fails-if(styloVsGecko) == anim-css-fill-overflow-1-by.svg       anim-css-fill-overflow-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-fill-overflow-1-by.svg       anim-css-fill-overflow-1-ref.svg
 fails == anim-css-fill-overflow-1-from-by.svg anim-css-fill-overflow-1-ref.svg
 # 'fill-opacity' property
-fuzzy-if(skiaContent,1,885) fails-if(styloVsGecko) == anim-css-fillopacity-1-by.svg            anim-css-fillopacity-1-ref.svg
+fuzzy-if(skiaContent,1,885) fails-if(styloVsGecko||stylo) == anim-css-fillopacity-1-by.svg            anim-css-fillopacity-1-ref.svg
-fuzzy-if(skiaContent,1,210) fails-if(styloVsGecko) == anim-css-fillopacity-1-from-by.svg       anim-css-fillopacity-1-ref.svg
+fuzzy-if(skiaContent,1,210) fails-if(styloVsGecko||stylo) == anim-css-fillopacity-1-from-by.svg       anim-css-fillopacity-1-ref.svg
-fails-if(styloVsGecko) == anim-css-fillopacity-1-from-to.svg       anim-css-fillopacity-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-fillopacity-1-from-to.svg       anim-css-fillopacity-1-ref.svg
-fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko) == anim-css-fillopacity-1-to.svg            anim-css-fillopacity-1-ref.svg
+fuzzy-if(skiaContent,1,550) fails-if(styloVsGecko||stylo) == anim-css-fillopacity-1-to.svg            anim-css-fillopacity-1-ref.svg
-fails-if(styloVsGecko) == anim-css-fillopacity-2-paced.svg         anim-css-fillopacity-2-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-fillopacity-2-paced.svg         anim-css-fillopacity-2-ref.svg
 fails == anim-css-fillopacity-3-clamp-big.svg     anim-css-fillopacity-3-ref.svg # bug 501188
-fuzzy-if(skiaContent,1,365) fails-if(styloVsGecko) == anim-css-fillopacity-3-clamp-small.svg   anim-css-fillopacity-3-ref.svg
+fuzzy-if(skiaContent,1,365) fails-if(styloVsGecko||stylo) == anim-css-fillopacity-3-clamp-small.svg   anim-css-fillopacity-3-ref.svg
 # 'font' shorthand property
-fails-if(styloVsGecko) == anim-css-font-1.svg  anim-css-font-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-font-1.svg  anim-css-font-1-ref.svg
 # 'font-size' property, from/by/to with pixel values only
-fails-if(styloVsGecko) == anim-css-fontsize-1-from-by-px-px.svg    anim-css-fontsize-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-fontsize-1-from-by-px-px.svg    anim-css-fontsize-1-ref.svg
 == anim-css-fontsize-1-from-to-px-px.svg    anim-css-fontsize-1-ref.svg
 # 'font-size' property (accepts unitless values)
@@ -81,63 +81,63 @@ fails-if(styloVsGecko) == anim-css-fontsize-1-from-by-px-px.svg    anim-css-font
 == anim-mapped-fontsize-1-from-to-px-no.svg anim-css-fontsize-1-ref.svg
 # 'font-size' property, from/by/to with percent values
-fails-if(styloVsGecko) == anim-css-fontsize-1-from-by-pct-pct.svg  anim-css-fontsize-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-fontsize-1-from-by-pct-pct.svg  anim-css-fontsize-1-ref.svg
-fails-if(styloVsGecko) == anim-css-fontsize-1-from-by-pct-px.svg   anim-css-fontsize-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-fontsize-1-from-by-pct-px.svg   anim-css-fontsize-1-ref.svg
-fails-if(styloVsGecko) == anim-css-fontsize-1-from-by-px-pct.svg   anim-css-fontsize-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-fontsize-1-from-by-px-pct.svg   anim-css-fontsize-1-ref.svg
 == anim-css-fontsize-1-from-to-pct-pct.svg  anim-css-fontsize-1-ref.svg
 == anim-css-fontsize-1-from-to-pct-px.svg   anim-css-fontsize-1-ref.svg
 == anim-css-fontsize-1-from-to-px-pct.svg   anim-css-fontsize-1-ref.svg
 # 'font-size' property, with negative addition
-fails-if(styloVsGecko) == anim-css-fontsize-2-from-by-px-px.svg    anim-css-fontsize-2-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-fontsize-2-from-by-px-px.svg    anim-css-fontsize-2-ref.svg
-fails-if(styloVsGecko) == anim-css-fontsize-2-from-by-px-em.svg    anim-css-fontsize-2-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-fontsize-2-from-by-px-em.svg    anim-css-fontsize-2-ref.svg
-fails-if(styloVsGecko) == anim-css-fontsize-2-from-by-em-em.svg    anim-css-fontsize-2-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-fontsize-2-from-by-em-em.svg    anim-css-fontsize-2-ref.svg
 # 'stroke-dasharray' property, from/to with pixel values only
 skip-if(!styloVsGecko) == anim-css-strokedasharray-1.svg anim-css-strokedasharray-1-ref.svg
 # 'stroke-width' property, from/by/to with pixel values only
-fails-if(styloVsGecko) == anim-css-strokewidth-1-by-px-px.svg        anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-by-px-px.svg        anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-from-by-px-px.svg   anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-from-by-px-px.svg   anim-css-strokewidth-1-ref.svg
 == anim-css-strokewidth-1-from-to-px-px.svg   anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-to-px-px.svg        anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-to-px-px.svg        anim-css-strokewidth-1-ref.svg
 # 'stroke-width' property, from/by/to with unitless values only
-fails-if(styloVsGecko) == anim-css-strokewidth-1-by-no-no.svg        anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-by-no-no.svg        anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-from-by-no-no.svg   anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-from-by-no-no.svg   anim-css-strokewidth-1-ref.svg
 == anim-css-strokewidth-1-from-to-no-no.svg   anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-to-no-no.svg        anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-to-no-no.svg        anim-css-strokewidth-1-ref.svg
 # 'stroke-width' property, from/by/to with percent values
 # XXXdholbert the mixed pct + px tests fail right now, because we need calc()
 # in order to interpolate between pct and non-pct values, and we don't yet
 # support calc() for stroke-width & other SVG-specific properties (Bug 594933).
-fails-if(styloVsGecko) == anim-css-strokewidth-1-by-pct-pct.svg      anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-by-pct-pct.svg      anim-css-strokewidth-1-ref.svg
 fails == anim-css-strokewidth-1-by-pct-px.svg       anim-css-strokewidth-1-ref.svg
 fails == anim-css-strokewidth-1-by-px-pct.svg       anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-from-by-pct-pct.svg anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-from-by-pct-pct.svg anim-css-strokewidth-1-ref.svg
 fails-if(!styloVsGecko) == anim-css-strokewidth-1-from-by-pct-px.svg  anim-css-strokewidth-1-ref.svg
 fails-if(!styloVsGecko) == anim-css-strokewidth-1-from-by-px-pct.svg  anim-css-strokewidth-1-ref.svg
 == anim-css-strokewidth-1-from-to-pct-pct.svg anim-css-strokewidth-1-ref.svg
 fails-if(!styloVsGecko) fails-if(styloVsGecko) == anim-css-strokewidth-1-from-to-pct-px.svg  anim-css-strokewidth-1-ref.svg
 fails-if(!styloVsGecko) fails-if(styloVsGecko) == anim-css-strokewidth-1-from-to-px-pct.svg  anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-to-pct-pct.svg      anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-to-pct-pct.svg      anim-css-strokewidth-1-ref.svg
 fails-if(!styloVsGecko) == anim-css-strokewidth-1-to-pct-px.svg       anim-css-strokewidth-1-ref.svg
 fails-if(!styloVsGecko) == anim-css-strokewidth-1-to-px-pct.svg       anim-css-strokewidth-1-ref.svg
 # 'stroke-width' property, from/by/to with em values
-fails-if(styloVsGecko) == anim-css-strokewidth-1-by-px-em.svg        anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-by-px-em.svg        anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-by-em-em.svg        anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-by-em-em.svg        anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-by-em-px.svg        anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-by-em-px.svg        anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-from-by-px-em.svg   anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-from-by-px-em.svg   anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-from-by-em-em.svg   anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-from-by-em-em.svg   anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-from-by-em-px.svg   anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-from-by-em-px.svg   anim-css-strokewidth-1-ref.svg
 == anim-css-strokewidth-1-from-to-px-em.svg   anim-css-strokewidth-1-ref.svg
 == anim-css-strokewidth-1-from-to-em-em.svg   anim-css-strokewidth-1-ref.svg
 == anim-css-strokewidth-1-from-to-em-px.svg   anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-to-px-em.svg        anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-to-px-em.svg        anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-to-em-em.svg        anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-to-em-em.svg        anim-css-strokewidth-1-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-1-to-em-px.svg        anim-css-strokewidth-1-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-1-to-em-px.svg        anim-css-strokewidth-1-ref.svg
 # 'stroke-width' property, values-array & paced calc-mode support
 == anim-css-strokewidth-2-values-em-em.svg    anim-css-strokewidth-2-ref.svg
@@ -147,10 +147,10 @@ fuzzy-if(skiaContent,1,360) == anim-css-strokewidth-2-values-px-px.svg    anim-c
 == anim-css-strokewidth-3-paced.svg           anim-css-strokewidth-3-ref.svg
 # 'stroke-width' property, negative addition
-fails-if(styloVsGecko) == anim-css-strokewidth-4-from-by-px-px.svg   anim-css-strokewidth-4-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-4-from-by-px-px.svg   anim-css-strokewidth-4-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-4-from-by-px-em.svg   anim-css-strokewidth-4-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-4-from-by-px-em.svg   anim-css-strokewidth-4-ref.svg
-fails-if(styloVsGecko) == anim-css-strokewidth-4-from-by-em-em.svg   anim-css-strokewidth-4-ref.svg
+fails-if(styloVsGecko||stylo) == anim-css-strokewidth-4-from-by-em-em.svg   anim-css-strokewidth-4-ref.svg
-fuzzy-if(skiaContent,1,170) fails-if(styloVsGecko) == anim-css-strokewidth-4-from-by-no-no.svg   anim-css-strokewidth-4-ref.svg
+fuzzy-if(skiaContent,1,170) fails-if(styloVsGecko||stylo) == anim-css-strokewidth-4-from-by-no-no.svg   anim-css-strokewidth-4-ref.svg
 # check correct handling of "!important" values
 == important-set-1.svg  anim-standard-ref.svg
--- a/layout/reftests/svg/smil/syncbase/reftest.list
+++ b/layout/reftests/svg/smil/syncbase/reftest.list
@@ -1,48 +1,48 @@
 # Tests related to SVG Animation (using SMIL) that use syncbase timing.
 # New intervals
-fails-if(styloVsGecko) == new-interval-simple-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-simple-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-simple-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-simple-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-negative-offset-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-negative-offset-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-negative-offset-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-negative-offset-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-negative-offset-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-negative-offset-3.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-negative-offset-4.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-negative-offset-4.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-negative-syncbase-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-negative-syncbase-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-restart-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-restart-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-restart-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-restart-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-restart-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-restart-3.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-early-end-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-early-end-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-early-end-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-early-end-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-early-end-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-early-end-3.svg green-box-ref.svg
 == new-interval-early-end-4.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-early-end-5.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-early-end-5.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-early-end-6.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-early-end-6.svg green-box-ref.svg
 == new-interval-early-end-7.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-doubly-dependent-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-doubly-dependent-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-doubly-dependent-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-doubly-dependent-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-doubly-dependent-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-doubly-dependent-3.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-triply-dependent-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-triply-dependent-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-triply-dependent-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-triply-dependent-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-end-negative-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-end-negative-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-end-negative-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-end-negative-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-end-dep-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-end-dep-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-chain-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-chain-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-chain-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-chain-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-sample-order-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-sample-order-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == new-interval-freeze-begin-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == new-interval-freeze-begin-1.svg green-box-ref.svg
 # Changing intervals
-fails-if(styloVsGecko) == changed-interval-simple-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == changed-interval-simple-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == changed-interval-simple-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == changed-interval-simple-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == changed-interval-simple-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == changed-interval-simple-3.svg green-box-ref.svg
-fails-if(styloVsGecko) == changed-interval-simple-4.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == changed-interval-simple-4.svg green-box-ref.svg
 == changed-interval-simple-5.svg green-box-ref.svg
-fails-if(styloVsGecko) == changed-interval-resolved-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == changed-interval-resolved-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == changed-interval-resolved-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == changed-interval-resolved-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == changed-interval-sort-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == changed-interval-sort-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == changed-interval-change-spec-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == changed-interval-change-spec-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == changed-interval-change-spec-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == changed-interval-change-spec-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == changed-interval-change-spec-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == changed-interval-change-spec-3.svg green-box-ref.svg
 == changed-interval-change-spec-4.svg green-box-ref.svg
 # Deleted intervals
@@ -53,47 +53,47 @@ fails-if(styloVsGecko) == changed-interval-change-spec-3.svg green-box-ref.svg
 == deleted-interval-simple-5.svg green-box-ref.svg
 # Trimmed intervals
-fails-if(styloVsGecko) == trimmed-interval-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == trimmed-interval-1.svg green-box-ref.svg
 # Cyclic dependencies
-fails-if(styloVsGecko) == cycle-ok-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-ok-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-ok-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-ok-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-ok-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-ok-3.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-ok-4.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-ok-4.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-ok-5.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-ok-5.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-self-ref-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-self-ref-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-self-ref-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-self-ref-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-self-ref-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-self-ref-3.svg green-box-ref.svg
 == cycle-self-ref-4.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-self-ref-5.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-self-ref-5.svg green-box-ref.svg
 == cycle-invalid-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-invalid-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-invalid-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-invalid-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-invalid-3.svg green-box-ref.svg
 == cycle-invalid-4.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-change-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-change-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-change-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-change-2.svg green-box-ref.svg
 == cycle-delete-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == cycle-recursion-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == cycle-recursion-1.svg green-box-ref.svg
 == cycle-recursion-2.svg green-box-ref.svg
 # Animation sandwich priority
-fails-if(styloVsGecko) == sandwich-priority-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-1.svg green-box-ref.svg
-fails-if(styloVsGecko) == sandwich-priority-2.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-2.svg green-box-ref.svg
-fails-if(styloVsGecko) == sandwich-priority-3.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-3.svg green-box-ref.svg
-fails-if(styloVsGecko) == sandwich-priority-4.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-4.svg green-box-ref.svg
-fails-if(styloVsGecko) == sandwich-priority-5.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-5.svg green-box-ref.svg
-fails-if(styloVsGecko) == sandwich-priority-6.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-6.svg green-box-ref.svg
-fails-if(styloVsGecko) == sandwich-priority-7.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-7.svg green-box-ref.svg
-fails-if(styloVsGecko) == sandwich-priority-8.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-8.svg green-box-ref.svg
-fails-if(styloVsGecko) == sandwich-priority-9.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-9.svg green-box-ref.svg
-fails-if(styloVsGecko) == sandwich-priority-10.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-10.svg green-box-ref.svg
-fails-if(styloVsGecko) == sandwich-priority-11.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-11.svg green-box-ref.svg
-fails-if(styloVsGecko) == sandwich-priority-12.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == sandwich-priority-12.svg green-box-ref.svg
 # Cross-time container dependencies
-fails-if(styloVsGecko) == cross-container-1.xhtml green-box-ref.xhtml
+fails-if(styloVsGecko||stylo) == cross-container-1.xhtml green-box-ref.xhtml
 == cross-container-2.xhtml green-box-ref.xhtml
-fails-if(styloVsGecko) == cross-container-3.xhtml green-box-ref.xhtml
+fails-if(styloVsGecko||stylo) == cross-container-3.xhtml green-box-ref.xhtml
 # Filtering
-fails-if(styloVsGecko) == filtered-interval-1.svg green-box-ref.svg
+fails-if(styloVsGecko||stylo) == filtered-interval-1.svg green-box-ref.svg
--- a/layout/reftests/svg/text/reftest.list
+++ b/layout/reftests/svg/text/reftest.list
@@ -147,8 +147,8 @@ fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||/^Windows\x20NT\x206\.[12]/
 == ignore-text-align-2.svg ignore-text-align-2-ref.svg
 # pseudo-elements
-fails-if(styloVsGecko) == pseudo-first-line.svg pseudo-first-line-ref.svg
+fails-if(styloVsGecko||stylo) == pseudo-first-line.svg pseudo-first-line-ref.svg
-fails-if(styloVsGecko) == pseudo-first-line-2.svg pseudo-first-line-2-ref.svg
+fails-if(styloVsGecko||stylo) == pseudo-first-line-2.svg pseudo-first-line-2-ref.svg
 == pseudo-first-letter.svg pseudo-first-letter-ref.svg
 == pseudo-first-letter-2.svg pseudo-first-letter-2-ref.svg
 == ignore-before-after.svg ignore-prop-ref.svg
--- a/layout/reftests/tab-size/reftest.list
+++ b/layout/reftests/tab-size/reftest.list
@@ -9,4 +9,4 @@
 == tab-size-negative.html     tab-size-initial.html
 == tab-size-change-1a.html     tab-size-change-1-ref.html
 == tab-size-change-1b.html     tab-size-change-1-ref.html
-fuzzy-if(winWidget,100,1000) fails-if(styloVsGecko) == tab-size-length.html       tab-size-length-ref.html
+fuzzy-if(winWidget,100,1000) fails-if(styloVsGecko||stylo) == tab-size-length.html       tab-size-length-ref.html
--- a/layout/reftests/text-overflow/reftest.list
+++ b/layout/reftests/text-overflow/reftest.list
@@ -1,14 +1,14 @@
 == ellipsis-font-fallback.html ellipsis-font-fallback-ref.html
 == line-clipping.html line-clipping-ref.html
 fuzzy-if(Android,16,244) HTTP(..) == marker-basic.html marker-basic-ref.html  # Bug 1128229
-HTTP(..) == marker-string.html marker-string-ref.html
+fails-if(stylo) 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(!gtkWidget) fuzzy-if(gtkWidget,2,289) HTTP(..) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing
 fuzzy-if(Android,24,4000) fuzzy-if(cocoaWidget,1,40) fuzzy-if(asyncPan&&!layersGPUAccelerated,140,1836) HTTP(..) == scroll-rounding.html scroll-rounding-ref.html # bug 760264
 fuzzy(2,453) fuzzy-if(skiaContent,9,2100) fails-if(gtkWidget) HTTP(..) == anonymous-block.html anonymous-block-ref.html # gtkWidget:bug 1309103
 HTTP(..) == false-marker-overlap.html false-marker-overlap-ref.html
 HTTP(..) == visibility-hidden.html visibility-hidden-ref.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,102,1724) fuzzy-if(gtkWidget,10,8) HTTP(..) == block-padding.html block-padding-ref.html
+fuzzy-if(asyncPan&&!layersGPUAccelerated,102,1724) fuzzy-if(gtkWidget,10,8) skip-if(stylo) 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
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -326,7 +326,7 @@ fails-if(!cocoaWidget&&!styloVsGecko) != osx-font-smoothing.html osx-font-smooth
 fails-if(!cocoaWidget&&!styloVsGecko) != osx-font-smoothing-2.html osx-font-smoothing-2-notref.html
 == osx-font-smoothing-2.html osx-font-smoothing-2-ref.html
-pref(layout.css.text-align-unsafe-value.enabled,true) fails-if(styloVsGecko) == text-align-unsafe.html text-align-unsafe-ref.html
+pref(layout.css.text-align-unsafe-value.enabled,true) fails-if(styloVsGecko||stylo) == text-align-unsafe.html text-align-unsafe-ref.html
 # stray control chars should be visible by default, bug 1099557
 fails-if(styloVsGecko) != control-chars-01a.html control-chars-01-notref.html
--- a/layout/reftests/transform/reftest.list
+++ b/layout/reftests/transform/reftest.list
@@ -140,4 +140,4 @@ pref(svg.transform-box.enabled,true) == transform-box-svg-3a.svg pass.svg
 == animate-layer-scale-inherit-3.html animate-layer-scale-inherit-1-ref.html
 # Bug 1301500
 == dynamic-add-without-change-cb-1.html dynamic-add-without-change-cb-1-ref.html
-fuzzy-if(d2d,1,5) fuzzy-if(skiaContent,22,180) skip-if(stylo) == table-overflowed-by-animation.html table-overflowed-by-animation-ref.html # bug 1365851 for stylo
+fuzzy-if(d2d,1,5) fuzzy-if(skiaContent,22,180) skip-if(styloVsGecko||stylo) == table-overflowed-by-animation.html table-overflowed-by-animation-ref.html
--- a/layout/reftests/w3c-css/failures.list
+++ b/layout/reftests/w3c-css/failures.list
@@ -46,7 +46,7 @@ skip css-values-3/vh-support-transform-translate.html
 css-values-3/calc-in-calc.html
 fails-if(stylo) css-values-3/vh-support-atviewport.html
 # bug 1367947
-fails-if(stylo) css-values-3/vh-em-inherit.html
+fails-if(styloVsGecko||stylo) css-values-3/vh-em-inherit.html
 #### CSS Writing Modes 3 #############################################
--- a/layout/reftests/w3c-css/received/reftest.list
+++ b/layout/reftests/w3c-css/received/reftest.list
@@ -219,20 +219,20 @@ fails-if(!styloVsGecko) == css-values-3/attr-px-invalid-cast.html css-values-3/r
 == css-values-3/attr-px-invalid-fallback.html css-values-3/reference/200-200-green.html
 fails-if(!styloVsGecko) == css-values-3/attr-px-valid.html css-values-3/reference/200-200-green.html
 == css-values-3/calc-in-calc.html css-values-3/reference/all-green.html
-fails == css-values-3/calc-in-media-queries-001.html css-values-3/reference/all-green.html
+fails-if(!stylo) == css-values-3/calc-in-media-queries-001.html css-values-3/reference/all-green.html
-fails == css-values-3/calc-in-media-queries-002.html css-values-3/reference/all-green.html
+fails-if(!stylo) == css-values-3/calc-in-media-queries-002.html css-values-3/reference/all-green.html
 == css-values-3/calc-invalid-range-clamping.html css-values-3/reference/200-200-green.html
 == css-values-3/calc-parenthesis-stack.html css-values-3/reference/all-green.html
 fuzzy-if(OSX,40,6) == css-values-3/ch-unit-001.html css-values-3/reference/ch-unit-001-ref.html
 == css-values-3/initial-background-color.html css-values-3/reference/all-green.html
 == css-values-3/vh-calc-support-pct.html css-values-3/reference/all-green.html
 == css-values-3/vh-calc-support.html css-values-3/reference/all-green.html
-fails-if(stylo) == css-values-3/vh-em-inherit.html css-values-3/reference/all-green.html
+fails-if(styloVsGecko||stylo) == css-values-3/vh-em-inherit.html css-values-3/reference/all-green.html
 == css-values-3/vh-inherit.html css-values-3/reference/all-green.html
 == css-values-3/vh-interpolate-pct.html css-values-3/reference/all-green.html
 == css-values-3/vh-interpolate-px.html css-values-3/reference/all-green.html
 == css-values-3/vh-interpolate-vh.html css-values-3/reference/all-green.html
-fails-if(styloVsGecko) == css-values-3/vh-support-atviewport.html css-values-3/reference/all-green.html
+fails-if(styloVsGecko||stylo) == css-values-3/vh-support-atviewport.html css-values-3/reference/all-green.html
 == css-values-3/vh-support-margin.html css-values-3/reference/all-green.html
 skip == css-values-3/vh-support-transform-origin.html css-values-3/reference/all-green.html
 skip == css-values-3/vh-support-transform-translate.html css-values-3/reference/all-green.html
@@ -1032,10 +1032,10 @@ needs-focus == selectors-4/focus-within-004.html selectors-4/focus-within-001-re
 needs-focus == selectors-4/focus-within-005.html selectors-4/focus-within-001-ref.html
 needs-focus == selectors-4/focus-within-006.html selectors-4/focus-within-001-ref.html
 fails-if(!styloVsGecko) needs-focus == selectors-4/focus-within-shadow-001.html selectors-4/focus-within-shadow-001-ref.html
-pref(dom.webcomponents.enabled,true) needs-focus skip-if(styloVsGecko) == selectors-4/focus-within-shadow-002.html selectors-4/focus-within-shadow-001-ref.html
+pref(dom.webcomponents.enabled,true) needs-focus skip-if(styloVsGecko||stylo) == selectors-4/focus-within-shadow-002.html selectors-4/focus-within-shadow-001-ref.html
-pref(dom.webcomponents.enabled,true) needs-focus skip-if(styloVsGecko) == selectors-4/focus-within-shadow-003.html selectors-4/focus-within-shadow-001-ref.html
+pref(dom.webcomponents.enabled,true) needs-focus skip-if(styloVsGecko||stylo) == selectors-4/focus-within-shadow-003.html selectors-4/focus-within-shadow-001-ref.html
-pref(dom.webcomponents.enabled,true) needs-focus skip-if(styloVsGecko) == selectors-4/focus-within-shadow-004.html selectors-4/focus-within-shadow-001-ref.html
+pref(dom.webcomponents.enabled,true) needs-focus skip-if(styloVsGecko||stylo) == selectors-4/focus-within-shadow-004.html selectors-4/focus-within-shadow-001-ref.html
-pref(dom.webcomponents.enabled,true) needs-focus skip-if(styloVsGecko) == selectors-4/focus-within-shadow-005.html selectors-4/focus-within-shadow-001-ref.html
+pref(dom.webcomponents.enabled,true) needs-focus skip-if(styloVsGecko||stylo) == selectors-4/focus-within-shadow-005.html selectors-4/focus-within-shadow-001-ref.html
 == selectors-4/of-type-selectors.xhtml selectors-4/of-type-selectors-ref.xhtml
 == selectors-4/selector-required.html selectors-4/selector-required-ref.html
 == selectors-4/selectors-dir-selector-ltr-001.html selectors-4/selectors-dir-selector-ref.html
--- a/layout/reftests/w3c-css/submitted/align3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/align3/reftest.list
@@ -50,28 +50,28 @@
 == flex-abspos-staticpos-margin-001.html flex-abspos-staticpos-margin-001-ref.html
 == flex-abspos-staticpos-margin-002.html flex-abspos-staticpos-margin-002-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-align-self-001.html grid-abspos-staticpos-align-self-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-align-self-001.html grid-abspos-staticpos-align-self-001-ref.html
 == grid-abspos-staticpos-align-self-002.html grid-abspos-staticpos-align-self-002-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-align-self-img-001.html grid-abspos-staticpos-align-self-img-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-align-self-img-001.html grid-abspos-staticpos-align-self-img-001-ref.html
 == grid-abspos-staticpos-align-self-img-002.html grid-abspos-staticpos-align-self-img-002-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-align-self-rtl-001.html grid-abspos-staticpos-align-self-rtl-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-align-self-rtl-001.html grid-abspos-staticpos-align-self-rtl-001-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-align-self-rtl-002.html grid-abspos-staticpos-align-self-rtl-002-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-align-self-rtl-002.html grid-abspos-staticpos-align-self-rtl-002-ref.html
 == grid-abspos-staticpos-align-self-rtl-003.html grid-abspos-staticpos-align-self-rtl-003-ref.html
 == grid-abspos-staticpos-align-self-rtl-004.html grid-abspos-staticpos-align-self-rtl-004-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-align-self-vertWM-001.html grid-abspos-staticpos-align-self-vertWM-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-align-self-vertWM-001.html grid-abspos-staticpos-align-self-vertWM-001-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-align-self-vertWM-002.html grid-abspos-staticpos-align-self-vertWM-002-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-align-self-vertWM-002.html grid-abspos-staticpos-align-self-vertWM-002-ref.html
 == grid-abspos-staticpos-align-self-vertWM-003.html grid-abspos-staticpos-align-self-vertWM-003-ref.html
 == grid-abspos-staticpos-align-self-vertWM-004.html grid-abspos-staticpos-align-self-vertWM-004-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-justify-self-001.html grid-abspos-staticpos-justify-self-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-justify-self-001.html grid-abspos-staticpos-justify-self-001-ref.html
 == grid-abspos-staticpos-justify-self-002.html grid-abspos-staticpos-justify-self-002-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-justify-self-img-001.html grid-abspos-staticpos-justify-self-img-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-justify-self-img-001.html grid-abspos-staticpos-justify-self-img-001-ref.html
 == grid-abspos-staticpos-justify-self-img-002.html grid-abspos-staticpos-justify-self-img-002-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-justify-self-rtl-001.html grid-abspos-staticpos-justify-self-rtl-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-justify-self-rtl-001.html grid-abspos-staticpos-justify-self-rtl-001-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-justify-self-rtl-002.html grid-abspos-staticpos-justify-self-rtl-002-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-justify-self-rtl-002.html grid-abspos-staticpos-justify-self-rtl-002-ref.html
 == grid-abspos-staticpos-justify-self-rtl-003.html grid-abspos-staticpos-justify-self-rtl-003-ref.html
 == grid-abspos-staticpos-justify-self-rtl-004.html grid-abspos-staticpos-justify-self-rtl-004-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-justify-self-vertWM-001.html grid-abspos-staticpos-justify-self-vertWM-001-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-justify-self-vertWM-001.html grid-abspos-staticpos-justify-self-vertWM-001-ref.html
-fails-if(styloVsGecko) == grid-abspos-staticpos-justify-self-vertWM-002.html grid-abspos-staticpos-justify-self-vertWM-002-ref.html
+fails-if(styloVsGecko||stylo) == grid-abspos-staticpos-justify-self-vertWM-002.html grid-abspos-staticpos-justify-self-vertWM-002-ref.html
 == grid-abspos-staticpos-justify-self-vertWM-003.html grid-abspos-staticpos-justify-self-vertWM-003-ref.html
 == grid-abspos-staticpos-justify-self-vertWM-004.html grid-abspos-staticpos-justify-self-vertWM-004-ref.html
--- a/layout/reftests/w3c-css/submitted/lists-3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/lists-3/reftest.list
@@ -1,3 +1,3 @@
 # Tests for list-style-type
-fails-if(styloVsGecko||webrender) == list-style-type-string-001a.html list-style-type-string-001-ref.html
+fails-if(styloVsGecko||webrender) fails-if(stylo) == list-style-type-string-001a.html list-style-type-string-001-ref.html
-fails-if(styloVsGecko||webrender) == list-style-type-string-001b.html list-style-type-string-001-ref.html
+fails-if(styloVsGecko||webrender) fails-if(stylo) == list-style-type-string-001b.html list-style-type-string-001-ref.html
--- a/layout/reftests/w3c-css/submitted/ruby/reftest.list
+++ b/layout/reftests/w3c-css/submitted/ruby/reftest.list
@@ -1,9 +1,9 @@
 # Tests for inlinizing block-level boxes
-skip-if(styloVsGecko) == ruby-inlinize-blocks-001.html ruby-inlinize-blocks-001-ref.html
+skip-if(styloVsGecko||stylo) == ruby-inlinize-blocks-001.html ruby-inlinize-blocks-001-ref.html
-fails-if(styloVsGecko) == ruby-inlinize-blocks-002.html ruby-inlinize-blocks-002-ref.html
+fails-if(styloVsGecko||stylo) == ruby-inlinize-blocks-002.html ruby-inlinize-blocks-002-ref.html
 == ruby-inlinize-blocks-003.html ruby-inlinize-blocks-003-ref.html
-skip-if(styloVsGecko) == ruby-inlinize-blocks-004.html ruby-inlinize-blocks-004-ref.html
+skip-if(styloVsGecko||stylo) == ruby-inlinize-blocks-004.html ruby-inlinize-blocks-004-ref.html
-skip-if(styloVsGecko) == ruby-inlinize-blocks-005.html ruby-inlinize-blocks-005-ref.html
+skip-if(styloVsGecko||stylo) == ruby-inlinize-blocks-005.html ruby-inlinize-blocks-005-ref.html
 # Tests for autohiding base-identical annotations
 == ruby-autohide-001.html ruby-autohide-001-ref.html
@@ -12,8 +12,8 @@ skip-if(styloVsGecko) == ruby-inlinize-blocks-005.html ruby-inlinize-blocks-005-
 == ruby-autohide-004.html ruby-autohide-001-ref.html
 # Tests for ruby with text-combine-upright
-fails-if(styloVsGecko) == ruby-text-combine-upright-001a.html ruby-text-combine-upright-001-ref.html
+fails-if(styloVsGecko||stylo) == ruby-text-combine-upright-001a.html ruby-text-combine-upright-001-ref.html
-fails-if(styloVsGecko) == ruby-text-combine-upright-001b.html ruby-text-combine-upright-001-ref.html
+fails-if(styloVsGecko||stylo) == ruby-text-combine-upright-001b.html ruby-text-combine-upright-001-ref.html
 == ruby-text-combine-upright-002a.html ruby-text-combine-upright-002-ref.html
 == ruby-text-combine-upright-002b.html ruby-text-combine-upright-002-ref.html
--- a/layout/reftests/w3c-css/submitted/text-decor-3/reftest.list
+++ b/layout/reftests/w3c-css/submitted/text-decor-3/reftest.list
@@ -1,4 +1,4 @@
-== ruby-text-decoration-01.html ruby-text-decoration-01-ref.html
+fails-if(stylo) == ruby-text-decoration-01.html ruby-text-decoration-01-ref.html
 == text-decoration-propagation-01.html text-decoration-propagation-01-ref.html
 # text-emphasis-style
@@ -128,4 +128,4 @@ fuzzy-if(gtkWidget,3,4) == text-emphasis-line-height-002b.html text-emphasis-lin
 == text-emphasis-line-height-004c.html text-emphasis-line-height-004-ref.html
 == text-emphasis-line-height-004d.html text-emphasis-line-height-004-ref.html
 # END tests from support/generate-text-emphasis-line-height-tests.py
-fuzzy-if(gtkWidget,3,4) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),43,1) fails-if(styloVsGecko) == text-emphasis-line-height-001z.html text-emphasis-line-height-001-ref.html
+fuzzy-if(gtkWidget,3,4) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),43,1) fails-if(styloVsGecko||stylo) == text-emphasis-line-height-001z.html text-emphasis-line-height-001-ref.html
--- a/layout/reftests/webcomponents/reftest.list
+++ b/layout/reftests/webcomponents/reftest.list
@@ -4,16 +4,16 @@ pref(dom.webcomponents.enabled,true) == basic-shadow-2.html basic-shadow-2-ref.h
 pref(dom.webcomponents.enabled,true) == basic-shadow-3.html basic-shadow-3-ref.html
 pref(dom.webcomponents.enabled,true) == basic-shadow-4.html basic-shadow-4-ref.html
 pref(dom.webcomponents.enabled,true) == basic-insertion-point-1.html basic-insertion-point-1-ref.html
-pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko) == basic-insertion-point-2.html basic-insertion-point-2-ref.html
+pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko||stylo) == basic-insertion-point-2.html basic-insertion-point-2-ref.html
 pref(dom.webcomponents.enabled,true) == adjacent-insertion-points-1.html adjacent-insertion-points-1-ref.html
 pref(dom.webcomponents.enabled,true) == adjacent-insertion-points-2.html adjacent-insertion-points-2-ref.html
 pref(dom.webcomponents.enabled,true) == fallback-content-1.html fallback-content-1-ref.html
 pref(dom.webcomponents.enabled,true) == remove-insertion-point-1.html remove-insertion-point-1-ref.html
 pref(dom.webcomponents.enabled,true) == nested-insertion-point-1.html nested-insertion-point-1-ref.html
-pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko) == basic-shadow-element-1.html basic-shadow-element-1-ref.html
+pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko||stylo) == basic-shadow-element-1.html basic-shadow-element-1-ref.html
-pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko) == nested-shadow-element-1.html nested-shadow-element-1-ref.html
+pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko||stylo) == nested-shadow-element-1.html nested-shadow-element-1-ref.html
-pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko) == update-dist-node-descendants-1.html update-dist-node-descendants-1-ref.html
+pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko||stylo) == update-dist-node-descendants-1.html update-dist-node-descendants-1-ref.html
-pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko) == input-transition-1.html input-transition-1-ref.html
+pref(dom.webcomponents.enabled,true) skip-if(styloVsGecko||stylo) == input-transition-1.html input-transition-1-ref.html
 pref(dom.webcomponents.enabled,true) == dynamic-insertion-point-distribution-1.html dynamic-insertion-point-distribution-1-ref.html
 pref(dom.webcomponents.enabled,true) == dynamic-insertion-point-distribution-2.html dynamic-insertion-point-distribution-2-ref.html
 pref(dom.webcomponents.enabled,true) == remove-append-shadow-host-1.html remove-append-shadow-host-1-ref.html
--- a/layout/reftests/webkit-gradient/reftest.list
+++ b/layout/reftests/webkit-gradient/reftest.list
@@ -12,7 +12,7 @@ default-preferences pref(layout.css.prefixes.webkit,true)
 == webkit-gradient-linear-1b.html webkit-gradient-linear-1-ref.html
 == webkit-gradient-linear-1c.html webkit-gradient-linear-1-ref.html
 == webkit-gradient-linear-1d.html webkit-gradient-linear-1-ref.html
-fails-if(styloVsGecko) == webkit-gradient-linear-2.html webkit-gradient-linear-2-ref.html
+fails-if(styloVsGecko||stylo) == webkit-gradient-linear-2.html webkit-gradient-linear-2-ref.html
 # Tests for -webkit-gradient(radial, ...)
 == webkit-gradient-radial-1a.html webkit-gradient-radial-1-ref.html
--- a/layout/reftests/writing-mode/reftest.list
+++ b/layout/reftests/writing-mode/reftest.list
@@ -107,7 +107,7 @@ HTTP(..) == 1127488-align-right-vertical-lr-ltr.html 1127488-align-bottom-left-r
 == 1133945-1-vertical-align.html 1133945-1-vertical-align-ref.html
 skip-if(Android) == 1134744-radio-checkbox-baseline-1.html 1134744-radio-checkbox-baseline-1-ref.html # Disabled on Android until bug 1352238 is fixed.
 == 1134849-orthogonal-inline.html 1134849-orthogonal-inline-ref.html
-fails-if(styloVsGecko) == 1135361-ruby-justify-1.html 1135361-ruby-justify-1-ref.html # bug 1136067
+fails-if(styloVsGecko||stylo) == 1135361-ruby-justify-1.html 1135361-ruby-justify-1-ref.html # bug 1136067
 fuzzy-if(winWidget,255,163) fuzzy-if(skiaContent,159,111) == 1136557-1-nested-spans.html 1136557-1-nested-spans-ref.html
 fuzzy-if(winWidget,255,221) fuzzy-if(skiaContent,159,111) == 1136557-2-nested-spans.html 1136557-2-nested-spans-ref.html
 fuzzy-if(winWidget,255,236) == 1136557-3-nested-spans.html 1136557-3-nested-spans-ref.html