diff --git a/dom/xul/crashtests/crashtests.list b/dom/xul/crashtests/crashtests.list index 62e2dde9d4b3..b71f617e1b99 100644 --- a/dom/xul/crashtests/crashtests.list +++ b/dom/xul/crashtests/crashtests.list @@ -13,7 +13,7 @@ load 336096-1.xhtml load 344215-1.xul load 354611-1.html load 360078-1.xhtml -asserts-if(stylo,11-16) load 363791-1.xul # bug 1397644 +load 363791-1.xul load 384740-1.xul load 384877-1.html load 386914-1.html diff --git a/image/test/mochitest/test_xultree_animation.xhtml b/image/test/mochitest/test_xultree_animation.xhtml index 4eeb47f1e743..d37f6252eed6 100644 --- a/image/test/mochitest/test_xultree_animation.xhtml +++ b/image/test/mochitest/test_xultree_animation.xhtml @@ -50,11 +50,6 @@ Mozilla Bug 666446: lots of animated gifs swamp us with paint events /** Test for Bug 666446 nsSVGFEImageElement/RasterImage**/ -if (SpecialPowers.DOMWindowUtils.isStyledByServo) { - // Stylo currently asserts for any XUL bits. - SimpleTest.expectAssertions(7, 7); -} - const FAILURE_TIMEOUT = 5000; // Fail early after 120 seconds (2 minutes) function main() { diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list index 69e0a55b50db..b78e906b87f1 100644 --- a/layout/base/crashtests/crashtests.list +++ b/layout/base/crashtests/crashtests.list @@ -70,8 +70,8 @@ load 317934-1.html load 320459-1.html load 321058-1.xul load 321058-2.xul -asserts-if(stylo,3) load 321077-1.xul # bug 1397644 -asserts-if(stylo,3) load 321077-2.xul # bug 1397644 +load 321077-1.xul +load 321077-2.xul load 322436-1.html load 325967-1.html load 325984-1.xhtml diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list index 2bf9b2227a0a..242716fb1a0a 100644 --- a/layout/reftests/bidi/reftest.list +++ b/layout/reftests/bidi/reftest.list @@ -143,7 +143,7 @@ fuzzy-if(skiaContent,1,3) == 698291-1.html 698291-1-ref.html == 817406-3.html 817406-1-ref.html == 817406-4.html 817406-4-ref.html == 847242-1.html 847242-1-ref.html -fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) fails-if(stylo||styloVsGecko) asserts-if(stylo,24-26) == 869833-1.xul 869833-1-ref.xul # stylo: bug 1397644 +fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == 869833-1.xul 869833-1-ref.xul == 922530-1.html 922530-1-ref.html == 922550-1.html 922550-1-ref.html == 1067268-1.html 1067268-1-ref.html diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 5ceb5fafc639..c0cf6cfca98a 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -317,7 +317,7 @@ random-if(d2d) fuzzy-if(Android,8,1439) skip-if(styloVsGecko) HTTP == 289480.htm == 299136-1.html 299136-1-ref.html == 299837-1.html 299837-1-ref.html fails-if(styloVsGecko) == 299837-2.xul 299837-2-ref.xul # bug 1408235 -random-if(d2d) asserts-if(stylo,24-128) asserts-if(styloVsGecko,12-64) == 299837-3.xul 299837-3-ref.xul # bug 587631, stylo: bug 1397644 +random-if(d2d) == 299837-3.xul 299837-3-ref.xul # bug 587631 == 300691-1a.html 300691-1-ref.html == 300691-1b.html 300691-1-ref.html == 300691-1c.html 300691-1-ref.html @@ -1289,7 +1289,7 @@ fuzzy-if(skiaContent,1,5) skip-if((stylo||styloVsGecko)&&isDebugBuild&&winWidget == 476598-1b.html 476598-1-ref2.html != 476598-1-ref.html about:blank == 476856-1.html 476856-1-ref.html -random-if(d2d) fails-if(styloVsGecko) asserts-if(stylo,16-18) == 478377-1.xul 478377-1-ref.xul # bug 1397644 +random-if(d2d) == 478377-1.xul 478377-1-ref.xul == 478614-1.html 478614-1-ref.html == 478614-2.html 478614-1-ref.html == 478614-3.html 478614-3-ref.html @@ -1688,11 +1688,11 @@ fuzzy-if(skiaContent,1,4500) == 654950-1.html 654950-1-ref.html # Quartz alpha b != 656875.html about:blank == 658952.html 658952-ref.html fuzzy-if(skiaContent,7,3500) == 660682-1.html 660682-1-ref.html -fuzzy-if(d2d,1,256) skip-if(Android) fuzzy-if(skiaContent,1,68000) fails-if(styloVsGecko) asserts-if(stylo,16-18) == 664127-1.xul 664127-1-ref.xul # Android: Intermittent failures - bug 1019131, stylo: bug 1397644 +fuzzy-if(d2d,1,256) skip-if(Android) fuzzy-if(skiaContent,1,68000) == 664127-1.xul 664127-1-ref.xul # Android: Intermittent failures - bug 1019131 == 665597-1.html 665597-1-ref.html == 665597-2.html 665597-2-ref.html == 667079-1.html 667079-1-ref.html -fails-if(stylo||styloVsGecko) asserts-if(stylo,8-9) == 668319-1.xul about:blank # bug 1397644 +== 668319-1.xul about:blank fails-if(stylo||styloVsGecko) != 669015-1.xul 669015-1-notref.xul # bug 1408235 skip-if(azureSkiaGL) == 670442-1.html 670442-1-ref.html == 670467-1.html 670467-1-ref.html diff --git a/layout/reftests/xul/reftest.list b/layout/reftests/xul/reftest.list index c622428726e0..f2ae18fee182 100644 --- a/layout/reftests/xul/reftest.list +++ b/layout/reftests/xul/reftest.list @@ -7,9 +7,9 @@ random-if(Android) fails-if(winWidget||stylo||styloVsGecko) == menulist-shrinkwr fails-if(styloVsGecko) == textbox-overflow-1.xul textbox-overflow-1-ref.xul # for bug 749658, stylo: bug 1408235 # accesskeys are not normally displayed on Mac, so skip this test skip-if(cocoaWidget) fails-if(styloVsGecko) == accesskey.xul accesskey-ref.xul # stylo: bug 1408811 -fails-if(cocoaWidget&&!stylo) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) asserts-if(stylo,13-26) fails-if(styloVsGecko) == tree-row-outline-1.xul tree-row-outline-1-ref.xul # win8: bug 1254832, stylo: bug 1397644 +fails-if(cocoaWidget) fuzzy-if(xulRuntime.widgetToolkit=="gtk3",1,11) == tree-row-outline-1.xul tree-row-outline-1-ref.xul # win8: bug 1254832 skip-if(!cocoaWidget) == mac-tab-toolbar.xul mac-tab-toolbar-ref.xul -asserts-if(stylo,13-26) fails-if(stylo||styloVsGecko) != tree-row-outline-1.xul tree-row-outline-1-notref.xul # stylo: bug 1397644 +!= tree-row-outline-1.xul tree-row-outline-1-notref.xul == text-crop.xul text-crop-ref.xul fails-if(stylo||styloVsGecko) == text-small-caps-1.xul text-small-caps-1-ref.xul # stylo: bug 1408235 fuzzy-if(skiaContent,1,60) fuzzy-if(cocoaWidget&&browserIsRemote&&!skiaContent,1,31) fuzzy-if(winWidget&&browserIsRemote&&layersGPUAccelerated,1,50) == inactive-fixed-bg-bug1205630.xul inactive-fixed-bg-bug1205630-ref.html @@ -72,4 +72,4 @@ fails-if(styloVsGecko) == stack-sizing-2.xul stack-sizing-2-ref.xul # bug 140823 skip == treecell-image-svg-1a.xul treecell-image-svg-1-ref.xul # bug 1218954 skip == treecell-image-svg-1b.xul treecell-image-svg-1-ref.xul # bug 1218954 -asserts-if(stylo,16-18) fails-if(styloVsGecko) == treechildren-padding-percent-1.xul treechildren-padding-percent-1-ref.xul # bug 1397644 +== treechildren-padding-percent-1.xul treechildren-padding-percent-1-ref.xul diff --git a/layout/xul/crashtests/crashtests.list b/layout/xul/crashtests/crashtests.list index 332facdbfd0f..d5d43e7e54cf 100644 --- a/layout/xul/crashtests/crashtests.list +++ b/layout/xul/crashtests/crashtests.list @@ -1,12 +1,12 @@ load 131008-1.xul load 137216-1.xul -asserts-if(stylo,3) load 140218-1.xml # bug 1397644 +load 140218-1.xml load 151826-1.xul load 168724-1.xul load 189814-1.xul load 237787-1.xul load 265161-1.xul -asserts-if(stylo,3) load 289410-1.xul # bug 1397644 +load 289410-1.xul load 290743.html load 291702-1.xul load 291702-2.xul @@ -24,12 +24,12 @@ load 329327-1.xul load 329407-1.xml load 329477-1.xhtml load 336962-1.xul -asserts-if(stylo,3) load 344228-1.xul # bug 1397644 +load 344228-1.xul load 346083-1.xul load 346281-1.xul load 350460.xul load 360642-1.xul -asserts-if(stylo,3-4) load 365151.xul # bug 1397644 +load 365151.xul load 366112-1.xul asserts(0-50) load 366203-1.xul # bug 1217984 load 367185-1.xhtml @@ -90,7 +90,7 @@ load 508927-1.xul load 508927-2.xul load 514300-1.xul load 536931-1.xhtml -asserts-if(stylo,4) load 538308-1.xul # bug 1397644 +load 538308-1.xul load 557174-1.xml load 564705-1.xul load 583957-1.html diff --git a/layout/xul/tree/crashtests/crashtests.list b/layout/xul/tree/crashtests/crashtests.list index 5e3de4cc975d..d462e95505e7 100644 --- a/layout/xul/tree/crashtests/crashtests.list +++ b/layout/xul/tree/crashtests/crashtests.list @@ -1,25 +1,24 @@ -# All stylo assertions below are bug 1397644 -asserts-if(stylo,3-4) load 307298-1.xul -asserts-if(stylo,8) load 309732-1.xul -asserts-if(stylo,8) load 309732-2.xul -asserts-if(stylo,13-23) load 366583-1.xul -asserts-if(stylo,6) load 380217-1.xul +load 307298-1.xul +load 309732-1.xul +load 309732-2.xul +load 366583-1.xul +load 380217-1.xul load 382444-1.html load 391178-1.xhtml load 391178-2.xul load 393665-1.xul -asserts-if(stylo,12) load 399227-1.xul -asserts-if(stylo,13) load 399227-2.xul -asserts-if(stylo,3) load 399692-1.xhtml +load 399227-1.xul +load 399227-2.xul +load 399692-1.xhtml load 399715-1.xhtml -asserts-if(stylo,3) load 409807-1.xul -asserts-if(stylo,3) load 414170-1.xul +load 409807-1.xul +load 414170-1.xul load 430394-1.xul -asserts-if(stylo,12) load 454186-1.xul -asserts-if(stylo,3) load 479931-1.xhtml -asserts-if(stylo,3) load 509602-1.xul -asserts-if(stylo,27-34) load 585815.html +load 454186-1.xul +load 479931-1.xhtml +load 509602-1.xul +load 585815.html load 601427.html -asserts-if(stylo,3) load 730441-1.xul -asserts-if(stylo,3) load 730441-2.xul -asserts-if(stylo,3) load 730441-3.xul +load 730441-1.xul +load 730441-2.xul +load 730441-3.xul diff --git a/view/crashtests/crashtests.list b/view/crashtests/crashtests.list index f29b9412b470..2156501ce0d2 100644 --- a/view/crashtests/crashtests.list +++ b/view/crashtests/crashtests.list @@ -2,7 +2,7 @@ load 38589-1.xul load 64049-1.html load 281743-1.html load 323497-1.html -asserts-if(stylo,3) load 382756-1.xul # bug 1397644 +load 382756-1.xul load 387745-1.svg load 399852.html load 429315-1.html