Backed out changeset e3687105be00 (bug 1334768)
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 31 Jan 2017 17:30:16 +0100
changeset 331833 5e6635624e35d51384d185c6dd48058ab48567e2
parent 331832 6d90154f7900707f500d36f50ba0309cde009315
child 331834 17074be2623163a700e69959654b052c33f0c8c2
push id86368
push userarchaeopteryx@coole-files.de
push dateTue, 31 Jan 2017 16:33:40 +0000
treeherdermozilla-inbound@65214bd89ad4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1334768
milestone54.0a1
backs oute3687105be00ff3532b62c26c5d38a92f795f441
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset e3687105be00 (bug 1334768)
dom/canvas/test/reftest/filters/reftest-stylo.list
dom/canvas/test/reftest/reftest-stylo.list
dom/smil/crashtests/crashtests.list
editor/reftests/reftest-stylo.list
layout/forms/crashtests/crashtests.list
layout/reftests/bidi/reftest-stylo.list
layout/reftests/bugs/reftest-stylo.list
layout/reftests/canvas/reftest-stylo.list
layout/reftests/css-animations/reftest-stylo.list
layout/reftests/css-grid/reftest-stylo.list
layout/reftests/forms/button/reftest-stylo.list
layout/reftests/forms/input/color/reftest-stylo.list
layout/reftests/forms/placeholder/reftest-stylo.list
layout/reftests/forms/progress/reftest-stylo.list
layout/reftests/scoped-style/reftest-stylo.list
layout/reftests/selection/reftest-stylo.list
layout/reftests/table-bordercollapse/reftest-stylo.list
layout/reftests/text-overflow/reftest-stylo.list
layout/reftests/web-animations/reftest-stylo.list
layout/reftests/writing-mode/reftest-stylo.list
layout/reftests/writing-mode/tables/reftest-stylo.list
layout/style/crashtests/crashtests.list
parser/htmlparser/tests/reftest/reftest-stylo.list
--- a/dom/canvas/test/reftest/filters/reftest-stylo.list
+++ b/dom/canvas/test/reftest/filters/reftest-stylo.list
@@ -1,31 +1,31 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 default-preferences pref(canvas.filters.enabled,true)
 
-fails asserts-if(stylo,2) == default-color.html default-color.html # bug 1324700
+fails == default-color.html default-color.html
 # == drop-shadow.html drop-shadow.html
-fails asserts-if(stylo,2) == drop-shadow-transformed.html drop-shadow-transformed.html # bug 1324700
-fails asserts-if(stylo,2) == global-alpha.html global-alpha.html # bug 1324700
-fails asserts-if(stylo,2) == global-composite-operation.html global-composite-operation.html # bug 1324700
-fails asserts-if(stylo,1) == liveness.html liveness.html # bug 1324700
-fails asserts-if(stylo,2) == multiple-drop-shadows.html multiple-drop-shadows.html # bug 1324700
-fails asserts-if(stylo,2) == shadow.html shadow.html # bug 1324700
-fails asserts-if(stylo,2) == subregion-fill-paint.html subregion-fill-paint.html # bug 1324700
-fails asserts-if(stylo,2) == subregion-stroke-paint.html subregion-stroke-paint.html # bug 1324700
-fails asserts-if(stylo,2) == svg-bbox.html svg-bbox.html # bug 1324700
-fails asserts-if(stylo,2) == svg-inline.html svg-inline.html # bug 1324700
-fails asserts-if(stylo,2) == svg-liveness.html svg-liveness.html # bug 1324700
-fails asserts-if(stylo,2) == svg-off-screen.html svg-off-screen.html # bug 1324700
-fails asserts-if(stylo,2) == units.html units.html # bug 1324700
-fails asserts-if(stylo,1) == units-em.html units-em.html # bug 1324700
-fails asserts-if(stylo,1) == units-ex.html units-ex.html # bug 1324700
-fails asserts-if(stylo,2) == units-off-screen.html units-off-screen.html # bug 1324700
-fails asserts-if(stylo,2) == fillText-with-filter-opacity-1.html fillText-with-filter-opacity-1.html # bug 1324700
-fails asserts-if(stylo,2) == fillText-with-filter-opacity-2.html fillText-with-filter-opacity-2.html # bug 1324700
-fails asserts-if(stylo,2) == strokeText-with-filter-grayscale-1.html strokeText-with-filter-grayscale-1.html # bug 1324700
-fails asserts-if(stylo,2) == strokeText-with-filter-grayscale-2.html strokeText-with-filter-grayscale-2.html # bug 1324700
-fails asserts-if(stylo,1) == fillText-with-shadow-1.html fillText-with-shadow-1.html # bug 1324700
-fails asserts-if(stylo,1) == fillText-with-shadow-2.html fillText-with-shadow-2.html # bug 1324700
-fails asserts-if(stylo,2) == fillText-with-filter-grayscale-1.html fillText-with-filter-grayscale-1.html # bug 1324700
-fails asserts-if(stylo,2) == fillText-with-filter-grayscale-2.html fillText-with-filter-grayscale-2.html # bug 1324700
-fails asserts-if(stylo,1) == strokeText-with-shadow-1.html strokeText-with-shadow-1.html # bug 1324700
-fails asserts-if(stylo,1) == strokeText-with-shadow-2.html strokeText-with-shadow-2.html # bug 1324700
+fails == drop-shadow-transformed.html drop-shadow-transformed.html
+fails == global-alpha.html global-alpha.html
+fails == global-composite-operation.html global-composite-operation.html
+fails == liveness.html liveness.html
+fails == multiple-drop-shadows.html multiple-drop-shadows.html
+fails == shadow.html shadow.html
+fails == subregion-fill-paint.html subregion-fill-paint.html
+fails == subregion-stroke-paint.html subregion-stroke-paint.html
+fails == svg-bbox.html svg-bbox.html
+fails == svg-inline.html svg-inline.html
+fails == svg-liveness.html svg-liveness.html
+fails == svg-off-screen.html svg-off-screen.html
+fails == units.html units.html
+fails == units-em.html units-em.html
+fails == units-ex.html units-ex.html
+fails == units-off-screen.html units-off-screen.html
+fails == fillText-with-filter-opacity-1.html fillText-with-filter-opacity-1.html
+fails == fillText-with-filter-opacity-2.html fillText-with-filter-opacity-2.html
+fails == strokeText-with-filter-grayscale-1.html strokeText-with-filter-grayscale-1.html
+fails == strokeText-with-filter-grayscale-2.html strokeText-with-filter-grayscale-2.html
+fails == fillText-with-shadow-1.html fillText-with-shadow-1.html
+fails == fillText-with-shadow-2.html fillText-with-shadow-2.html
+fails == fillText-with-filter-grayscale-1.html fillText-with-filter-grayscale-1.html
+fails == fillText-with-filter-grayscale-2.html fillText-with-filter-grayscale-2.html
+fails == strokeText-with-shadow-1.html strokeText-with-shadow-1.html
+fails == strokeText-with-shadow-2.html strokeText-with-shadow-2.html
--- a/dom/canvas/test/reftest/reftest-stylo.list
+++ b/dom/canvas/test/reftest/reftest-stylo.list
@@ -150,25 +150,25 @@ skip-if(!winWidget) pref(webgl.disable-a
 # Do we correctly handle multiple clip paths?
 == clip-multiple-paths.html clip-multiple-paths.html
 
 # Bug 1255062
 == clip-multiple-move-1.html clip-multiple-move-1.html
 == clip-multiple-move-2.html clip-multiple-move-2.html
 
 # Bug 815648
-fails asserts-if(stylo,1) == stroketext-shadow.html stroketext-shadow.html # bug 1324700
+fails == stroketext-shadow.html stroketext-shadow.html
 
 # focus rings
-pref(canvas.focusring.enabled,true) skip-if(cocoaWidget) skip-if(winWidget) asserts-if(stylo,6) needs-focus == drawFocusIfNeeded.html drawFocusIfNeeded.html # bug 1324671
-pref(canvas.customfocusring.enabled,true) skip-if(Android||cocoaWidget||winWidget) fuzzy-if(gtkWidget,64,410) asserts-if(stylo,6) needs-focus == drawCustomFocusRing.html drawCustomFocusRing.html # bug 1324671
+pref(canvas.focusring.enabled,true) skip-if(cocoaWidget) skip-if(winWidget) needs-focus == drawFocusIfNeeded.html drawFocusIfNeeded.html
+pref(canvas.customfocusring.enabled,true) skip-if(Android||cocoaWidget||winWidget) fuzzy-if(gtkWidget,64,410) needs-focus == drawCustomFocusRing.html drawCustomFocusRing.html
 
 # Check that captureStream() displays in a local video element
 == capturestream.html capturestream.html
 
-fails asserts-if(stylo,1) == 1177726-text-stroke-bounds.html 1177726-text-stroke-bounds.html # bug 1324700
+fails == 1177726-text-stroke-bounds.html 1177726-text-stroke-bounds.html
 
 # Canvas Filter Reftests
 include filters/reftest-stylo.list
 
 # Bug 1305963
 == mozCurrentTransform.html mozCurrentTransform.html
 == mozCurrentTransformInverse.html mozCurrentTransformInverse.html
--- a/dom/smil/crashtests/crashtests.list
+++ b/dom/smil/crashtests/crashtests.list
@@ -24,17 +24,17 @@ load 572938-4.svg
 load 588287-1.svg
 load 588287-2.svg
 load 590425-1.html
 load 592477-1.xhtml
 load 594653-1.svg
 load 596796-1.svg
 load 605345-1.svg
 load 606101-1.svg
-asserts-if(stylo,1) load 608295-1.html # bug 1324689
+asserts-if(stylo,2) load 608295-1.html # bug 1324689
 load 608549-1.svg
 load 611927-1.svg
 load 615002-1.svg
 load 615872-1.svg
 load 641388-1.html
 load 641388-2.html
 load 650732-1.svg
 load 665334-1.svg
--- a/editor/reftests/reftest-stylo.list
+++ b/editor/reftests/reftest-stylo.list
@@ -97,17 +97,17 @@ fails == 462758-grabbers-resizers.html 4
 fails == readwrite-non-editable.html readwrite-non-editable.html
 fails == readwrite-editable.html readwrite-editable.html
 fails == readonly-non-editable.html readonly-non-editable.html
 fails == readonly-editable.html readonly-editable.html
 fails == dynamic-overflow-change.html dynamic-overflow-change.html
 fails == 694880-1.html 694880-1.html
 fails == 694880-2.html 694880-2.html
 fails == 694880-3.html 694880-3.html
-fails asserts-if(stylo,1) == 388980-1.html 388980-1.html # bug 1324683
+fails == 388980-1.html 388980-1.html
 fails needs-focus == spellcheck-superscript-1.html spellcheck-superscript-1.html
 fails == spellcheck-superscript-2.html spellcheck-superscript-2.html
 == 824080-1.html 824080-1.html
 # == 824080-2.html 824080-2.html
 # == 824080-3.html 824080-3.html
 # needs-focus == 824080-2.html 824080-2.html
 # == 824080-4.html 824080-4.html
 # == 824080-5.html 824080-5.html
@@ -129,10 +129,10 @@ fails needs-focus pref(layout.accessible
 == spellcheck-contenteditable-property-dynamic.html spellcheck-contenteditable-property-dynamic.html
 # == spellcheck-contenteditable-property-dynamic-inherit.html spellcheck-contenteditable-property-dynamic-inherit.html
 # == spellcheck-contenteditable-attr-dynamic-override.html spellcheck-contenteditable-attr-dynamic-override.html
 == spellcheck-contenteditable-attr-dynamic-override-inherit.html spellcheck-contenteditable-attr-dynamic-override-inherit.html
 # == spellcheck-contenteditable-property-dynamic-override.html spellcheck-contenteditable-property-dynamic-override.html
 == spellcheck-contenteditable-property-dynamic-override-inherit.html spellcheck-contenteditable-property-dynamic-override-inherit.html
 # == 911201.html 911201.html
 fails needs-focus == 969773.html 969773.html
-fails asserts-if(stylo,2) == 997805.html 997805.html # bug 1324671
-fails asserts-if(stylo,1) == 1088158.html 1088158.html # bug 1324671
+fails == 997805.html 997805.html
+fails == 1088158.html 1088158.html
--- a/layout/forms/crashtests/crashtests.list
+++ b/layout/forms/crashtests/crashtests.list
@@ -58,12 +58,12 @@ load 865602.html
 asserts-if(stylo,6) load 893332-1.html # bug 1324671
 asserts-if(stylo,1) load 944198.html # bug 1324671
 skip-if(stylo) load 949891.xhtml # bug 1323693
 load 959311.html
 load 960277-2.html
 load 997709-1.html
 load 1102791.html
 skip-if(stylo) load 1140216.html # bug 1323693
-asserts-if(stylo,9) load 1182414.html # bug 1324687
+asserts-if(stylo,11) load 1182414.html # bug 1324687
 load 1212688.html
 load 1228670.xhtml
 asserts-if(stylo,4-5) load 1279354.html # bug 1324671
--- a/layout/reftests/bidi/reftest-stylo.list
+++ b/layout/reftests/bidi/reftest-stylo.list
@@ -75,18 +75,18 @@ fails == 263359-1a.html 263359-1a.html
 fails == 263359-1b.html 263359-1b.html
 fails == 263359-2.html 263359-2.html
 == 263359-3.html 263359-3.html
 fails == 263359-4.html 263359-4.html
 fails == 267459-1.html 267459-1.html
 fails == 267459-2.html 267459-2.html
 == 299065-1.html 299065-1.html
 == 305643-1.html 305643-1.html
-fails asserts-if(stylo,7) == 332655-1.html 332655-1.html # bug 1335314
-fails asserts-if(stylo,7) == 332655-2.html 332655-2.html # bug 1335314
+fails == 332655-1.html 332655-1.html
+fails == 332655-2.html 332655-2.html
 fails == 381279-1.html 381279-1.html
 fails == 386339.html 386339.html
 fails == 409375.html 409375.html
 == 413542-1.html 413542-1.html
 == 413542-2.html 413542-2.html
 fails == 413928-1.html 413928-1.html
 fails == 413928-2.html 413928-2.html
 == 425338-1a.html 425338-1a.html
--- a/layout/reftests/bugs/reftest-stylo.list
+++ b/layout/reftests/bugs/reftest-stylo.list
@@ -196,18 +196,18 @@ fails == 201293-1d.html 201293-1d.html
 fails == 206516-1.html 206516-1.html
 == 206631-1.html 206631-1.html
 == 206802.html 206802.html
 fails == 210094-1a.html 210094-1a.html
 fails == 210094-1b.html 210094-1b.html
 fails == 210094-1c.html 210094-1c.html
 fails == 210876-1.html 210876-1.html
 == 211931-1.html 211931-1.html
-fails asserts-if(stylo,1) == 212563-1.html 212563-1.html # bug 1324683
-asserts-if(stylo,1) == 212563-2.html 212563-2.html # bug 1324683
+fails == 212563-1.html 212563-1.html
+== 212563-2.html 212563-2.html
 fails == 213834-1.html 213834-1.html
 fails == 214077-1a.html 214077-1a.html
 fails == 214077-1b.html 214077-1b.html
 == 218473-1.html 218473-1.html
 fuzzy-if(skiaContent,1,4) == 220165-1.svg 220165-1.svg
 fails == 223809-1.html 223809-1.html
 == 228856-1.html 228856-1.html
 == 228856-2.html 228856-2.html
@@ -569,17 +569,17 @@ fails == 364066-1.html 364066-1.html
 == 364318-1.xhtml 364318-1.xhtml
 == 364861-1.html 364861-1.html
 fails == 364862-1.html 364862-1.html
 == 364968-1.xul 364968-1.xul
 fails == 364989-1.html 364989-1.html
 fails == 365173-1.html 365173-1.html
 == 366207-1.xul 366207-1.xul
 == 366616-1.xul 366616-1.xul
-fails asserts-if(stylo,30) == 367220-1.html 367220-1.html # bug 1324704
+fails == 367220-1.html 367220-1.html
 == 367247-s-visible.html 367247-s-visible.html
 == 367247-s-hidden.html 367247-s-hidden.html
 == 367247-s-auto.html 367247-s-auto.html
 == 367247-l-visible.html 367247-l-visible.html
 == 367247-l-hidden.html 367247-l-hidden.html
 fails == 367247-l-scroll.html 367247-l-scroll.html
 == 367332-1a.html 367332-1a.html
 == 367332-1b.html 367332-1b.html
@@ -600,29 +600,29 @@ fails == 367612-1c.html 367612-1c.html
 == 367612-1e.html 367612-1e.html
 fails == 367612-1f.html 367612-1f.html
 == 367612-1g.html 367612-1g.html
 fails == 368020-1.html 368020-1.html
 fails == 368020-2.html 368020-2.html
 fails == 368020-3.html 368020-3.html
 fails pref(layout.css.box-decoration-break.enabled,true) == 368020-5.html 368020-5.html
 == 368155-1.xhtml 368155-1.xhtml
-fails asserts(4-8) == 368155-negative-margins-1.html 368155-negative-margins-1.html
+fails asserts(4) == 368155-negative-margins-1.html 368155-negative-margins-1.html
 # we can't test this because there's antialiasing involved, and our comparison
 # is too exact
 # == 368247-1.html 368247-1.html
 == 368247-2.html 368247-2.html
 fails == 368504-1.html 368504-1.html
 fails == 368504-2.html 368504-2.html
 == 368504-3a.html 368504-3a.html
 == 368504-3b.html 368504-3b.html
 == 368504-4.html 368504-4.html
 == 368504-5.html 368504-5.html
 fails == 368504-6.html 368504-6.html
-fails asserts-if(stylo,2) == 368622-1.html 368622-1.html # bug 1324704
+fails == 368622-1.html 368622-1.html
 fails == 368651-1.html 368651-1.html
 == 369361-1.html 369361-1.html
 == 369361-2.html 369361-2.html
 == 369882.xul 369882.xul
 fails == 369975-1.html 369975-1.html
 == 370353-1.html 370353-1.html
 fails == 370422-1.html 370422-1.html
 # == 370525-1.html 370525-1.html
@@ -674,17 +674,17 @@ random-if(d2d) == 374719-1.xul 374719-1.
 fails == 375508-1.html 375508-1.html
 == 375716-1.html 375716-1.html
 == 375827-1.html 375827-1.html
 fails == 376375-1.html 376375-1.html
 == 376484-1.html 376484-1.html
 == 376532-1.html 376532-1.html
 == 376532-2.html 376532-2.html
 == 376532-3.html 376532-3.html
-fails asserts-if(stylo,2) == 377603-1.html 377603-1.html # bug 1324661
+fails == 377603-1.html 377603-1.html
 == 377918.html 377918.html
 == 378535-1.html 378535-1.html
 fails == 378933-1.html 378933-1.html
 fails == 378935-1.html 378935-1.html
 fails == 378937-1.html 378937-1.html
 == 379178-xhtml.xhtml 379178-xhtml.xhtml
 fails == 379178-html.html 379178-html.html
 == 379178-svg.svg 379178-svg.svg
@@ -766,17 +766,17 @@ fails == 386470-1b.html 386470-1b.html
 == 387876-1.html 387876-1.html
 == 387876-2.html 387876-2.html
 == 387876-3a.html 387876-3a.html
 == 387876-3b.html 387876-3b.html
 == 388026-1.html 388026-1.html
 fails == 389074-1.html 389074-1.html
 # == 389224-1.html 389224-1.html
 # == 389224-2.html 389224-2.html
-fails asserts-if(stylo,5) == 389468-1.html 389468-1.html # bug 1324661
+fails == 389468-1.html 389468-1.html
 == 389623-1.html 389623-1.html
 == 389636-1.html 389636-1.html
 # == 389924-1a.html 389924-1a.html
 == 389924-1b.html 389924-1b.html
 # == 389924-1a.html 389924-1a.html
 == 390318-1a.html 390318-1a.html
 == 390318-1b.html 390318-1b.html
 == 390318-1c.html 390318-1c.html
@@ -1009,17 +1009,17 @@ fails == 420790-1.xhtml 420790-1.xhtml
 == 421203-5.xul 421203-5.xul
 == 421203-6.xul 421203-6.xul
 == 421234-1.html 421234-1.html
 == 421239-1.html 421239-1.html
 == 421239-2.html 421239-2.html
 == 421419-1.html 421419-1.html
 == 421436-1a.html 421436-1a.html
 == 421436-1b.html 421436-1b.html
-fails asserts-if(stylo,4) == 421632-1.html 421632-1.html # bug 1335314
+fails == 421632-1.html 421632-1.html
 fails == 421710-1.html 421710-1.html
 fails-if(Android) fails-if(usesRepeatResampling) == 421885-1.xml 421885-1.xml
 == 421955-1.html 421955-1.html
 fails == 422249-1.html 422249-1.html
 fails == 422394-1.html 422394-1.html
 fails == 422678-1.html 422678-1.html
 == 423130-1.html 423130-1.html
 == 423385-1.html 423385-1.html
@@ -1044,17 +1044,17 @@ fails == 424236-11.html 424236-11.html
 fails == 424465-1.html 424465-1.html
 == 424631-1.html 424631-1.html
 == 424710-1.html 424710-1.html
 fails == 424766-1.html 424766-1.html
 # == 425972-1.html 425972-1.html
 fails == 425972-2.html 425972-2.html
 # == 425972-1.html 425972-1.html
 fails == 426629-1.html 426629-1.html
-asserts(3-6) == 427017-1.xhtml 427017-1.xhtml
+asserts(3) == 427017-1.xhtml 427017-1.xhtml
 == 427129-scrollframe.html 427129-scrollframe.html
 == 427129-table.html 427129-table.html
 == 427129-image.html 427129-image.html
 == 427129-table-caption.html 427129-table-caption.html
 == 427370-1.html 427370-1.html
 fails == 427730-1.html 427730-1.html
 == 428278.html 428278.html
 == 428423-1a.html 428423-1a.html
@@ -1155,37 +1155,37 @@ fails == 440149-1.html 440149-1.html
 == 441259-1.html 441259-1.html
 == 441259-2.html 441259-2.html
 fails == 442542-1.html 442542-1.html
 fails == 444015-1.html 444015-1.html
 == 444375-1.html 444375-1.html
 fails == 444928-1.html 444928-1.html
 fails == 444928-2.html 444928-2.html
 fails == 444928-3.html 444928-3.html
-fails random asserts-if(stylo,2) == 445004-1.html 445004-1.html # bug 1324683
+fails random == 445004-1.html 445004-1.html
 == 445142-1a.html 445142-1a.html
 == 445142-1b.html 445142-1b.html
 == 445142-1c.html 445142-1c.html
 == 445142-2a.html 445142-2a.html
 == 445142-2b.html 445142-2b.html
 fails-if(usesRepeatResampling) == 446100-1a.html 446100-1a.html
 fails-if(Android) fails-if(usesRepeatResampling) == 446100-1b.html 446100-1b.html
 fails-if(Android) fails-if(usesRepeatResampling) == 446100-1c.html 446100-1c.html
 fails-if(usesRepeatResampling) == 446100-1d.html 446100-1d.html
 fails-if(usesRepeatResampling) == 446100-1e.html 446100-1e.html
 == 446100-1f.html 446100-1f.html
 fails-if(usesRepeatResampling) fails-if(Android) == 446100-1g.html 446100-1g.html
 == 446100-1h.html 446100-1h.html
 fails == 447749-1.html 447749-1.html
 fuzzy(127,2) == 448193.html 448193.html
-fails asserts-if(stylo,8) == 449149-1a.html 449149-1a.html # bug 1324671
-fails asserts-if(stylo,8) == 449149-1b.html 449149-1b.html # bug 1324671
+fails == 449149-1a.html 449149-1a.html
+fails == 449149-1b.html 449149-1b.html
 # Retry the above with XBL scopes
-fails test-pref(dom.use_xbl_scopes_for_remote_xul,true) asserts-if(stylo,8) == 449149-1a.html 449149-1a.html # bug 1324671
-fails test-pref(dom.use_xbl_scopes_for_remote_xul,true) asserts-if(stylo,8) == 449149-1b.html 449149-1b.html # bug 1324671
+fails test-pref(dom.use_xbl_scopes_for_remote_xul,true) == 449149-1a.html 449149-1a.html
+fails test-pref(dom.use_xbl_scopes_for_remote_xul,true) == 449149-1b.html 449149-1b.html
 == 449149-2.html 449149-2.html
 == 449171-1.html 449171-1.html
 fails == 449362-1.html 449362-1.html
 == 449519-1.html 449519-1.html
 == 450670-1.html 450670-1.html
 fails == 451168-1.html 451168-1.html
 == 451876-1.html 451876-1.html
 == 451876-2.html 451876-2.html
@@ -1322,18 +1322,18 @@ fails-if(Android) == 481024-1c.html 4810
 fails == 481948-1.html 481948-1.html
 == 481948-2.html 481948-2.html
 fails-if(Android) random-if(winWidget) fails-if(gtkWidget) == 481948-3.html 481948-3.html
 == 482398-1.html 482398-1.html
 fails == 482592-1a.xhtml 482592-1a.xhtml
 fails == 482592-1b.xhtml 482592-1b.xhtml
 == 482659-1a.html 482659-1a.html
 == 482659-1b.html 482659-1b.html
-asserts-if(stylo,1) == 482659-1c.html 482659-1c.html # bug 1324683
-asserts-if(stylo,1) == 482659-1d.html 482659-1d.html # bug 1324683
+== 482659-1c.html 482659-1c.html
+== 482659-1d.html 482659-1d.html
 == 483565.xul 483565.xul
 == 484256-1.html 484256-1.html
 == 484256-2.html 484256-2.html
 == 485012-1.html 485012-1.html
 fails == 485275-1.html 485275-1.html
 fails == 485275-1.svg 485275-1.svg
 == 486052-1.html 486052-1.html
 == 486052-2a.html 486052-2a.html
@@ -1357,17 +1357,17 @@ fails == 490173-2.html 490173-2.html
 == 490177-1.svg 490177-1.svg
 fails == 490182-1a.html 490182-1a.html
 fails == 490182-1b.html 490182-1b.html
 pref(browser.display.focus_ring_width,1) == 491180-1.html 491180-1.html
 pref(browser.display.focus_ring_width,1) == 491180-2.html 491180-2.html
 == 491323-1.xul 491323-1.xul
 == 492239-1.xul 492239-1.xul
 == 492661-1.html 492661-1.html
-asserts-if(stylo,1) == 493968-1.html 493968-1.html # bug 1324702
+== 493968-1.html 493968-1.html
 == 494667-1.html 494667-1.html
 == 494667-2.html 494667-2.html
 == 495274-1.html 495274-1.html
 fails == 495354-1a.xhtml 495354-1a.xhtml
 fails == 495354-1b.xhtml 495354-1b.xhtml
 == 495385-1a.html 495385-1a.html
 == 495385-1b.html 495385-1b.html
 == 495385-1c.html 495385-1c.html
@@ -1398,17 +1398,17 @@ fails == 501627-1.html 501627-1.html
 fails == 502447-1.html 502447-1.html
 fails == 502795-1.html 502795-1.html
 == 502942-1.html 502942-1.html
 == 503364-1a.html 503364-1a.html
 == 503364-1b.html 503364-1b.html
 # Reftest for bug 503531 marked as failing; should be re-enabled when
 # bug 607548 gets resolved.
 # needs-focus fails == 503531-1.html 503531-1.html
-asserts-if(stylo,1) == 504032-1.html 504032-1.html # bug 1324702
+== 504032-1.html 504032-1.html
 == 505743-1.html 505743-1.html
 fails == 506481-1.html 506481-1.html
 fails == 507187-1.html 507187-1.html
 == 507487-1.html 507487-1.html
 == 507487-2.xhtml 507487-2.xhtml
 == 507762-1.html 507762-1.html
 == 507762-2.html 507762-2.html
 == 507762-3.html 507762-3.html
@@ -1618,17 +1618,17 @@ fails == 602200-4.html 602200-4.html
 == 603423-1.html 603423-1.html
 fails == 604737.html 604737.html
 fails == 605138-1.html 605138-1.html
 fails == 605157-1.xhtml 605157-1.xhtml
 == 607267-1.html 607267-1.html
 fails == 608636-1.html 608636-1.html
 == 608756-1a.html 608756-1a.html
 == 608756-1b.html 608756-1b.html
-asserts-if(stylo,4) == 608756-2.html 608756-2.html # bug 1324633
+== 608756-2.html 608756-2.html
 == 609272-1.html 609272-1.html
 # == 613433-1.html 613433-1.html
 # == 613433-1.html 613433-1.html
 # == 613433-1.html 613433-1.html
 # == 613433-2.html 613433-2.html
 # == 613433-2.html 613433-2.html
 # == 613433-2.html 613433-2.html
 # == 613433-3.html 613433-3.html
@@ -1762,17 +1762,17 @@ fails == 825999.html 825999.html
 == 827577-1a.html 827577-1a.html
 == 827577-1b.html 827577-1b.html
 fails == 827799-1.html 827799-1.html
 == 829958.html 829958.html
 == 836844-1.html 836844-1.html
 == 841192-1.html 841192-1.html
 fails == 844178.html 844178.html
 == 846144-1.html 846144-1.html
-asserts-if(stylo,1) == 847850-1.html 847850-1.html # bug 1324671
+== 847850-1.html 847850-1.html
 fails == 848421-1.html 848421-1.html
 fails == 849407-1.html 849407-1.html
 == 849996-1.html 849996-1.html
 == 858803-1.html 858803-1.html
 == 860242-1.html 860242-1.html
 fails == 860370.html 860370.html
 == 871338-1.html 871338-1.html
 == 875060-1.html 875060-1.html
@@ -1803,17 +1803,17 @@ fails == 942672-1.html 942672-1.html
 fuzzy-if(skiaContent,1,5) == 956513-1.svg 956513-1.svg
 fails == 944291-1.html 944291-1.html
 fails == 950436-1.html 950436-1.html
 == 957770-1.svg 957770-1.svg
 fails == 960277-1.html 960277-1.html
 == 961887-1.html 961887-1.html
 == 961887-2.html 961887-2.html
 == 961887-3.html 961887-3.html
-fails asserts-if(stylo,1) == 966992-1.html 966992-1.html # bug 1324671
+fails == 966992-1.html 966992-1.html
 fails == 966510-1.html 966510-1.html
 fails == 966510-2.html 966510-2.html
 fuzzy-if(skiaContent,1,123) == 978911-1.svg 978911-1.svg
 == 983084-1.html 983084-1.html
 # == 983084-2.html 983084-2.html
 # == 983084-3.html 983084-3.html
 fails == 983691-1.html 983691-1.html
 HTTP(..) == 983985-1.html 983985-1.html
--- a/layout/reftests/canvas/reftest-stylo.list
+++ b/layout/reftests/canvas/reftest-stylo.list
@@ -4,70 +4,70 @@ fails == size-1.html size-1.html
 
 == empty-transaction-1.html empty-transaction-1.html
 
 fails == image-rendering-test.html image-rendering-test.html
 == image-shadow.html image-shadow.html
 
 fails == size-change-1.html size-change-1.html
 
-asserts-if(stylo,1) == subpixel-1.html subpixel-1.html # bug 1324700
+== subpixel-1.html subpixel-1.html
 
-asserts-if(stylo,1) == text-ltr-left.html text-ltr-left.html # bug 1324700
-asserts-if(stylo,1) == text-ltr-right.html text-ltr-right.html # bug 1324700
-asserts-if(stylo,1) == text-rtl-left.html text-rtl-left.html # bug 1324700
-asserts-if(stylo,1) == text-rtl-right.html text-rtl-right.html # bug 1324700
+== text-ltr-left.html text-ltr-left.html
+== text-ltr-right.html text-ltr-right.html
+== text-rtl-left.html text-rtl-left.html
+== text-rtl-right.html text-rtl-right.html
 
-asserts-if(stylo,1) == text-ltr-start.html text-ltr-start.html # bug 1324700
-asserts-if(stylo,1) == text-ltr-end.html text-ltr-end.html # bug 1324700
-asserts-if(stylo,1) == text-ltr-left.html text-ltr-left.html # bug 1324700
-asserts-if(stylo,1) == text-rtl-start.html text-rtl-start.html # bug 1324700
-asserts-if(stylo,1) == text-rtl-end.html text-rtl-end.html # bug 1324700
-asserts-if(stylo,1) == text-rtl-left.html text-rtl-left.html # bug 1324700
+== text-ltr-start.html text-ltr-start.html
+== text-ltr-end.html text-ltr-end.html
+== text-ltr-left.html text-ltr-left.html
+== text-rtl-start.html text-rtl-start.html
+== text-rtl-end.html text-rtl-end.html
+== text-rtl-left.html text-rtl-left.html
 
-asserts-if(stylo,1) == text-ltr-left.html text-ltr-left.html # bug 1324700
+== text-ltr-left.html text-ltr-left.html
 
-fails asserts-if(stylo,1) == text-ltr-alignment-test.html text-ltr-alignment-test.html # bug 1324700
-fails asserts-if(stylo,1) == text-rtl-alignment-test.html text-rtl-alignment-test.html # bug 1324700
+fails == text-ltr-alignment-test.html text-ltr-alignment-test.html
+fails == text-rtl-alignment-test.html text-rtl-alignment-test.html
 
-asserts-if(stylo,1) == text-horzline-with-bottom.html text-horzline-with-bottom.html # bug 1324700
-fails-if(azureSkia&&OSX>=1008) asserts-if(stylo,1) == text-horzline-with-top.html text-horzline-with-top.html # bug 1324700
+== text-horzline-with-bottom.html text-horzline-with-bottom.html
+fails-if(azureSkia&&OSX>=1008) == text-horzline-with-top.html text-horzline-with-top.html
 
 # == text-big-stroke.html text-big-stroke.html
 # == text-big-stroke.html text-big-stroke.html
 
-fails asserts-if(stylo,1) == text-context-state-test.html text-context-state-test.html # bug 1324700
-fails asserts-if(stylo,1) == text-font-inherit.html text-font-inherit.html # bug 1324700
-fails asserts-if(stylo,1) == text-space-replace-test.html text-space-replace-test.html # bug 1324700
+fails == text-context-state-test.html text-context-state-test.html
+fails == text-font-inherit.html text-font-inherit.html
+fails == text-space-replace-test.html text-space-replace-test.html
 
-fails asserts-if(stylo,1) == text-no-frame-test.html text-no-frame-test.html # bug 1324700
-fails asserts-if(stylo,1) == text-no-frame-2-test.html text-no-frame-2-test.html # bug 1324700
-fails asserts-if(stylo,1) == text-not-in-doc-test.html text-not-in-doc-test.html # bug 1324700
+fails == text-no-frame-test.html text-no-frame-test.html
+fails == text-no-frame-2-test.html text-no-frame-2-test.html
+fails == text-not-in-doc-test.html text-not-in-doc-test.html
 
 # == text-bidi-ltr-test.html text-bidi-ltr-test.html
 # == text-bidi-ltr-test.html text-bidi-ltr-test.html
-fails asserts-if(stylo,1) == text-bidi-rtl-test.html text-bidi-rtl-test.html # bug 1324700
+fails == text-bidi-rtl-test.html text-bidi-rtl-test.html
 
-fails asserts-if(stylo,4) == text-font-lang.html text-font-lang.html # bug 1324700
+fails == text-font-lang.html text-font-lang.html
 
-fails asserts-if(stylo,1) == text-measure.html text-measure.html # bug 1324700
-fails asserts-if(stylo,1) == text-small-caps-1.html text-small-caps-1.html # bug 1324700
+fails == text-measure.html text-measure.html
+fails == text-small-caps-1.html text-small-caps-1.html
 
-fails asserts-if(stylo,1) == text-subpixel-1.html text-subpixel-1.html # bug 1324700
+fails == text-subpixel-1.html text-subpixel-1.html
 
-fails asserts-if(stylo,1) == strokeText-path.html strokeText-path.html # bug 1324700
+fails == strokeText-path.html strokeText-path.html
 
 # check that emoji character renders as something non-blank (for Apple Color Emoji font, bug 715798)
 # apparently fails on some 10.7 systems for unknown reasons, bug 804522.
 ## Currently fails most places due to partial backout of bug 808288, see bug 837461.
 ## (Marking "random" rather than "fails" because it would pass for people
 ## if they have an Emoji font installed when running the tests.)
 ## WAS: random-if(OSX==1007) == text-emoji.html text-emoji.html
 # With Skia canvas on OS X (bug 932958) it fails even on 10.8 and 10.10.
-random-if(cocoaWidget&&azureSkia) random-if(!cocoaWidget||OSX==1006||OSX==1007) asserts-if(stylo,1) == text-emoji.html text-emoji.html # bug 1324700
+random-if(cocoaWidget&&azureSkia) random-if(!cocoaWidget||OSX==1006||OSX==1007) == text-emoji.html text-emoji.html
 
 # azure quartz uses CGDrawLinearGradient instead of DrawShading
 # so we have less control over degenerate behaviour as tested by this
 # test
 # fails-if((azureSkia&&!azureSkiaGL)||azureQuartz||(azureSkiaGL&&Android)) == linear-gradient-1a.html linear-gradient-1a.html
 
 # this passes with cairo on 10.7 and 10.8 but not with azure for reasons unknown
 # fails-if((azureSkia&&!azureSkiaGL)||azureQuartz||(azureSkiaGL&&Android)) == linear-gradient-1b.html linear-gradient-1b.html
@@ -82,33 +82,33 @@ random-if(cocoaWidget&&azureSkia) random
 
 == ctm-sanity.html ctm-sanity.html
 == ctm-singular-sanity.html ctm-singular-sanity.html
 == ctm-1.html ctm-1.html
 
 fails-if(azureQuartz&&OSX==1006) == 672646-alpha-radial-gradient.html 672646-alpha-radial-gradient.html
 fails == 674003-alpha-radial-gradient-superlum.html 674003-alpha-radial-gradient-superlum.html
 
-fails asserts-if(stylo,1) == 693610-1.html 693610-1.html # bug 1324700
+fails == 693610-1.html 693610-1.html
 
 == 726951-shadow-clips.html 726951-shadow-clips.html
 
 == transformed-clip.html transformed-clip.html
 fuzzy-if(azureSkia,1,15) fuzzy-if(skiaContent,1,20) == transformed-gradient.html transformed-gradient.html
 == transformed-path.html transformed-path.html
 
 == 749467-1.html 749467-1.html
 
 # You get a little bit of rounding fuzz on OSX from transforming the paths between user space and device space
 == 784573-1.html 784573-1.html
 
-fails asserts-if(stylo,1) == 802658-1.html 802658-1.html # bug 1324700
+fails == 802658-1.html 802658-1.html
 == 1074733-1.html 1074733-1.html
-fails asserts-if(stylo,1) == 1107096-invisibles.html 1107096-invisibles.html # bug 1324700
+fails == 1107096-invisibles.html 1107096-invisibles.html
 == 1151821-1.html 1151821-1.html
 == 1201272-1.html 1201272-1.html
 == 1224976-1.html 1224976-1.html
 == 1238795-1.html 1238795-1.html
 == 1303534-1.html 1303534-1.html
 
-fails asserts-if(stylo,1) == 1304353-text-global-alpha-1.html 1304353-text-global-alpha-1.html # bug 1324700
-fails asserts-if(stylo,1) == 1304353-text-global-alpha-2.html 1304353-text-global-alpha-2.html # bug 1324700
-fails asserts-if(stylo,1) == 1304353-text-global-composite-op-1.html 1304353-text-global-composite-op-1.html # bug 1324700
+fails == 1304353-text-global-alpha-1.html 1304353-text-global-alpha-1.html
+fails == 1304353-text-global-alpha-2.html 1304353-text-global-alpha-2.html
+fails == 1304353-text-global-composite-op-1.html 1304353-text-global-composite-op-1.html
--- a/layout/reftests/css-animations/reftest-stylo.list
+++ b/layout/reftests/css-animations/reftest-stylo.list
@@ -10,19 +10,19 @@ fails == animate-preserves3d.html animat
 # == partially-out-of-view-animation.html partially-out-of-view-animation.html
 # == animate-display-table-opacity.html animate-display-table-opacity.html
 # We need to run 100% opacity test case when OMTA is disabled to check that the animation creates a stacking context even if the animation is not running on the compositor
 # test-pref(layers.offmainthreadcomposition.async-animations,false) == stacking-context-opacity-1-animation.html stacking-context-opacity-1-animation.html
 # We need to run transform:none test case when OMTA is disabled to check that the animation creates a stacking context even if the animation is not running on the compositor
 # test-pref(layers.offmainthreadcomposition.async-animations,false) == stacking-context-transform-none-animation.html stacking-context-transform-none-animation.html
 # == no-stacking-context-opacity-removing-animation-in-delay.html no-stacking-context-opacity-removing-animation-in-delay.html
 == no-stacking-context-transform-removing-animation-in-delay.html no-stacking-context-transform-removing-animation-in-delay.html
-# == stacking-context-lose-opacity-1.html stacking-context-lose-opacity-1.html
+== stacking-context-lose-opacity-1.html stacking-context-lose-opacity-1.html
 fails == stacking-context-lose-transform-none.html stacking-context-lose-transform-none.html
-# == stacking-context-opacity-win-in-delay.html stacking-context-opacity-win-in-delay.html
+== stacking-context-opacity-win-in-delay.html stacking-context-opacity-win-in-delay.html
 == stacking-context-opacity-win-in-delay-on-main-thread.html stacking-context-opacity-win-in-delay-on-main-thread.html
 == stacking-context-opacity-wins-over-transition.html stacking-context-opacity-wins-over-transition.html
 fails == stacking-context-transform-win-in-delay.html stacking-context-transform-win-in-delay.html
 fails == stacking-context-transform-win-in-delay-on-main-thread.html stacking-context-transform-win-in-delay-on-main-thread.html
 fails == stacking-context-transform-wins-over-transition.html stacking-context-transform-wins-over-transition.html
 # == stacking-context-opacity-1-animation.html stacking-context-opacity-1-animation.html
 == stacking-context-opacity-1-with-fill-backwards.html stacking-context-opacity-1-with-fill-backwards.html
 == stacking-context-opacity-1-with-fill-forwards.html stacking-context-opacity-1-with-fill-forwards.html
--- a/layout/reftests/css-grid/reftest-stylo.list
+++ b/layout/reftests/css-grid/reftest-stylo.list
@@ -170,17 +170,17 @@ fails == grid-repeat-auto-fill-fit-003.h
 fails == grid-repeat-auto-fill-fit-004.html grid-repeat-auto-fill-fit-004.html
 fails == grid-repeat-auto-fill-fit-005.html grid-repeat-auto-fill-fit-005.html
 fails == grid-repeat-auto-fill-fit-006.html grid-repeat-auto-fill-fit-006.html
 fails == grid-repeat-auto-fill-fit-007.html grid-repeat-auto-fill-fit-007.html
 fails == grid-repeat-auto-fill-fit-008.html grid-repeat-auto-fill-fit-008.html
 fails == grid-repeat-auto-fill-fit-009.html grid-repeat-auto-fill-fit-009.html
 fails == grid-repeat-auto-fill-fit-010.html grid-repeat-auto-fill-fit-010.html
 fails == grid-repeat-auto-fill-fit-011.html grid-repeat-auto-fill-fit-011.html
-fails asserts-if(stylo,144) == grid-item-blockifying-001.html grid-item-blockifying-001.html # bug 1335339
+fails == grid-item-blockifying-001.html grid-item-blockifying-001.html
 fails == grid-fragmentation-001.html grid-fragmentation-001.html
 fails == grid-fragmentation-002.html grid-fragmentation-002.html
 fails == grid-fragmentation-003.html grid-fragmentation-003.html
 fails == grid-fragmentation-004.html grid-fragmentation-004.html
 fails == grid-fragmentation-005.html grid-fragmentation-005.html
 fails == grid-fragmentation-006.html grid-fragmentation-006.html
 fails == grid-fragmentation-007.html grid-fragmentation-007.html
 fails == grid-fragmentation-008.html grid-fragmentation-008.html
@@ -191,17 +191,17 @@ fails == grid-fragmentation-012.html gri
 fails == grid-fragmentation-013.html grid-fragmentation-013.html
 fails == grid-fragmentation-014.html grid-fragmentation-014.html
 fails asserts(0-10) == grid-fragmentation-015.html grid-fragmentation-015.html
 fails == grid-fragmentation-016.html grid-fragmentation-016.html
 fails == grid-fragmentation-017.html grid-fragmentation-017.html
 fails == grid-fragmentation-018.html grid-fragmentation-018.html
 fails == grid-fragmentation-019.html grid-fragmentation-019.html
 fails == grid-fragmentation-020.html grid-fragmentation-020.html
-fails asserts-if(stylo,93) == grid-fragmentation-021.html grid-fragmentation-021.html # bug 1324704
+fails == grid-fragmentation-021.html grid-fragmentation-021.html
 fails == grid-fragmentation-022.html grid-fragmentation-022.html
 fails == grid-fragmentation-023.html grid-fragmentation-023.html
 fails == grid-fragmentation-024.html grid-fragmentation-024.html
 fails == grid-fragmentation-025.html grid-fragmentation-025.html
 fails == grid-fragmentation-026.html grid-fragmentation-026.html
 fails == grid-fragmentation-027.html grid-fragmentation-027.html
 fails == grid-fragmentation-028.html grid-fragmentation-028.html
 fails == grid-fragmentation-029.html grid-fragmentation-029.html
--- a/layout/reftests/forms/button/reftest-stylo.list
+++ b/layout/reftests/forms/button/reftest-stylo.list
@@ -34,9 +34,9 @@ fails == disabled-6.html disabled-6.html
 
 # == width-auto-size-em-ltr.html width-auto-size-em-ltr.html
 # == width-auto-size-ltr.html width-auto-size-ltr.html
 # == width-exact-fit-ltr.html width-exact-fit-ltr.html
 # == width-auto-size-em-rtl.html width-auto-size-em-rtl.html
 # == width-auto-size-rtl.html width-auto-size-rtl.html
 # == width-exact-fit-rtl.html width-exact-fit-rtl.html
 fails == display-grid-flex-columnset.html display-grid-flex-columnset.html
-asserts-if(stylo,1) == 1317351.html 1317351.html # bug 1324671
+== 1317351.html 1317351.html
--- a/layout/reftests/forms/input/color/reftest-stylo.list
+++ b/layout/reftests/forms/input/color/reftest-stylo.list
@@ -1,15 +1,15 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 # Simple test. Should fail on platforms where input type color isn't activated
 # yet. The missing platform is Android (bug 875750).
-fails asserts-if(stylo,4) == input-color-1.html input-color-1.html # bug 1324671
+fails == input-color-1.html input-color-1.html
 
 default-preferences pref(dom.forms.color,true)
 
 # Despite the "default-preferences" line above, Android is still
 # excluded from some style in forms.css, which makes the following tests fail.
-fails asserts-if(stylo,16) == margin-padding-1.html margin-padding-1.html # bug 1324671
-fails asserts-if(stylo,1) == block-invalidate-1.html block-invalidate-1.html # bug 1324671
-fails asserts-if(stylo,1) == block-invalidate-2.html block-invalidate-2.html # bug 1324671
-fails asserts-if(stylo,14) == transformations-1.html transformations-1.html # bug 1324671
-fails asserts-if(stylo,1) == custom-style-1.html custom-style-1.html # bug 1324671
-fails asserts-if(stylo,1) == custom-style-2.html custom-style-2.html # bug 1324671
+fails == margin-padding-1.html margin-padding-1.html
+fails == block-invalidate-1.html block-invalidate-1.html
+fails == block-invalidate-2.html block-invalidate-2.html
+fails == transformations-1.html transformations-1.html
+fails == custom-style-1.html custom-style-1.html
+fails == custom-style-2.html custom-style-2.html
--- a/layout/reftests/forms/placeholder/reftest-stylo.list
+++ b/layout/reftests/forms/placeholder/reftest-stylo.list
@@ -4,33 +4,33 @@
 # text colour without changing the caret which means that the tested page has
 # a black caret with a grey text and the reference has a grey caret with grey
 # text. The only thing that is doable is to make the caret grey in the tested
 # page but that would make the test moot because a failure wouldn't be seen.
 # A real way to fix this would be to be able to style the caret or to implement
 # ::value (bug 648643), depending of the ::value behaviour (it could change the
 # caret colour and the text colour or just the text colour).
 
-fails asserts-if(stylo,1) == placeholder-1-text.html placeholder-1-text.html # bug 1324671
-fails asserts-if(stylo,1) == placeholder-1-password.html placeholder-1-password.html # bug 1324671
-fails asserts-if(stylo,1) == placeholder-1-textarea.html placeholder-1-textarea.html # bug 1324671
+fails == placeholder-1-text.html placeholder-1-text.html
+fails == placeholder-1-password.html placeholder-1-password.html
+fails == placeholder-1-textarea.html placeholder-1-textarea.html
 fails == placeholder-2.html placeholder-2.html
 fails == placeholder-2-textarea.html placeholder-2-textarea.html
-fails asserts-if(stylo,1) == placeholder-3.html placeholder-3.html # bug 1324671
-fails asserts-if(stylo,1) == placeholder-4.html placeholder-4.html # bug 1324671
-fails asserts-if(stylo,1) == placeholder-5.html placeholder-5.html # bug 1324671
-fails asserts-if(stylo,1) == placeholder-6.html placeholder-6.html # bug 1324671
-fails asserts-if(stylo,1) == placeholder-6-textarea.html placeholder-6-textarea.html # bug 1324671
+fails == placeholder-3.html placeholder-3.html
+fails == placeholder-4.html placeholder-4.html
+fails == placeholder-5.html placeholder-5.html
+fails == placeholder-6.html placeholder-6.html
+fails == placeholder-6-textarea.html placeholder-6-textarea.html
 # needs-focus == placeholder-7.html placeholder-7.html
 # needs-focus == placeholder-8.html placeholder-8.html
 # needs-focus == placeholder-9.html placeholder-9.html
-fails needs-focus asserts-if(stylo,1) == placeholder-10.html placeholder-10.html # bug 1324671
-fails asserts-if(stylo,1) == placeholder-11.html placeholder-11.html # bug 1324671
-fails asserts-if(stylo,1) == placeholder-12.html placeholder-12.html # bug 1324671
+fails needs-focus == placeholder-10.html placeholder-10.html
+fails == placeholder-11.html placeholder-11.html
+fails == placeholder-12.html placeholder-12.html
 fails == placeholder-13.html placeholder-13.html
 fails == placeholder-14.html placeholder-14.html
-fails asserts-if(stylo,1) == placeholder-18.html placeholder-18.html # bug 1324671
+fails == placeholder-18.html placeholder-18.html
 random-if(winWidget) == placeholder-19.xul placeholder-19.xul
 # needs-focus == placeholder-20.html placeholder-20.html
 # needs-focus == placeholder-21.html placeholder-21.html
-fails asserts-if(stylo,1) needs-focus == placeholder-22.html placeholder-22.html # bug 1324671
+fails needs-focus == placeholder-22.html placeholder-22.html
 # == placeholder-rtl.html placeholder-rtl.html
-fails pref(dom.placeholder.show_on_focus,false) asserts-if(stylo,1) needs-focus == placeholder-focus-pref.html placeholder-focus-pref.html # bug 1324671
+fails pref(dom.placeholder.show_on_focus,false) needs-focus == placeholder-focus-pref.html placeholder-focus-pref.html
--- a/layout/reftests/forms/progress/reftest-stylo.list
+++ b/layout/reftests/forms/progress/reftest-stylo.list
@@ -23,17 +23,17 @@
 
 # Tests for bugs:
 # == block-invalidate.html block-invalidate.html
 # == in-cells.html in-cells.html
 # == max-height.html max-height.html
 
 # Tests for block and inline orientation in combination with writing-mode
 # == progress-orient-horizontal.html progress-orient-horizontal.html
-fails-if(!cocoaWidget||OSX==1010) asserts-if(stylo,1) == progress-orient-vertical.html progress-orient-vertical.html # bug 1324671
+fails-if(!cocoaWidget||OSX==1010) == progress-orient-vertical.html progress-orient-vertical.html
 # == progress-orient-block.html progress-orient-block.html
 # == progress-orient-inline.html progress-orient-inline.html
 # == progress-vlr.html progress-vlr.html
 # == progress-vlr-orient-block.html progress-vlr-orient-block.html
 # == progress-vlr-orient-inline.html progress-vlr-orient-inline.html
 # == progress-vlr-orient-horizontal.html progress-vlr-orient-horizontal.html
 # == progress-vlr-orient-vertical.html progress-vlr-orient-vertical.html
 # == progress-vrl.html progress-vrl.html
--- a/layout/reftests/scoped-style/reftest-stylo.list
+++ b/layout/reftests/scoped-style/reftest-stylo.list
@@ -29,22 +29,22 @@ fails == scoped-style-important-002.html
 == scoped-style-important-004.html scoped-style-important-004.html
 == scoped-style-important-005.html scoped-style-important-005.html
 == scoped-style-important-006.html scoped-style-important-006.html
 == scoped-style-important-007.html scoped-style-important-007.html
 fails == scoped-style-dynamic-001.html scoped-style-dynamic-001.html
 fails == scoped-style-dynamic-002.html scoped-style-dynamic-002.html
 fails == scoped-style-dynamic-003.html scoped-style-dynamic-003.html
 fails == scoped-style-dynamic-004.html scoped-style-dynamic-004.html
-asserts-if(stylo,1) == scoped-style-dynamic-005.html scoped-style-dynamic-005.html # bug 1335340
-fails asserts-if(stylo,1) == scoped-style-dynamic-006.html scoped-style-dynamic-006.html # bug 1335340
+== scoped-style-dynamic-005.html scoped-style-dynamic-005.html
+fails == scoped-style-dynamic-006.html scoped-style-dynamic-006.html
 fails == scoped-style-dynamic-007.html scoped-style-dynamic-007.html
 fails == scoped-style-dynamic-008.html scoped-style-dynamic-008.html
-fails asserts-if(stylo,1) == scoped-style-dynamic-009.html scoped-style-dynamic-009.html # bug 1335340
-asserts-if(stylo,1) == scoped-style-dynamic-010.html scoped-style-dynamic-010.html # bug 1335340
+fails == scoped-style-dynamic-009.html scoped-style-dynamic-009.html
+== scoped-style-dynamic-010.html scoped-style-dynamic-010.html
 fails == scoped-style-dynamic-011.html scoped-style-dynamic-011.html
 == scoped-style-dynamic-012.svg scoped-style-dynamic-012.svg
 == scoped-style-dynamic-013.svg scoped-style-dynamic-013.svg
 == scoped-style-dynamic-014.svg scoped-style-dynamic-014.svg
 == scoped-style-dynamic-015.svg scoped-style-dynamic-015.svg
 fails == scoped-style-import.html scoped-style-import.html
 fails == scoped-style-media.html scoped-style-media.html
 fails == scoped-style-namespace.html scoped-style-namespace.html
--- a/layout/reftests/selection/reftest-stylo.list
+++ b/layout/reftests/selection/reftest-stylo.list
@@ -28,11 +28,11 @@ fuzzy-if(skiaContent,1,700) == extend-3i
 # these 3 random-if(Android) are a difference of Native & Xul, see bug 739714
 fails == pseudo-element-of-native-anonymous.html pseudo-element-of-native-anonymous.html
 # These tests uses Highlight and HighlightText color keywords, they are not same as text selection color on Mac.
 fails == non-themed-widget.html non-themed-widget.html
 fails == themed-widget.html themed-widget.html
 == addrange-1.html addrange-1.html
 == addrange-2.html addrange-2.html
 fails == splitText-normalize.html splitText-normalize.html
-fails asserts-if(stylo,13) == modify-range.html modify-range.html # bug 1324683
+fails == modify-range.html modify-range.html
 fails == dom-mutations.html dom-mutations.html
 == trailing-space-1.html trailing-space-1.html
--- a/layout/reftests/table-bordercollapse/reftest-stylo.list
+++ b/layout/reftests/table-bordercollapse/reftest-stylo.list
@@ -11,19 +11,19 @@
 == bc_dyn_rg2.html bc_dyn_rg2.html
 == bc_dyn_rg3.html bc_dyn_rg3.html
 == bc_dyn_col1.html bc_dyn_col1.html
 == bc_dyn_col2.html bc_dyn_col2.html
 == bc_dyn_col3.html bc_dyn_col3.html
 == bc_dyn_cg1.html bc_dyn_cg1.html
 == bc_dyn_cg2.html bc_dyn_cg2.html
 == bc_dyn_cg3.html bc_dyn_cg3.html
-fails asserts-if(stylo,2) == bc_dyn_table1.html bc_dyn_table1.html # bug 1324661
-fails asserts-if(stylo,2) == bc_dyn_table2.html bc_dyn_table2.html # bug 1324661
-fails asserts-if(stylo,2) == bc_dyn_table3.html bc_dyn_table3.html # bug 1324661
+fails == bc_dyn_table1.html bc_dyn_table1.html
+fails == bc_dyn_table2.html bc_dyn_table2.html
+fails == bc_dyn_table3.html bc_dyn_table3.html
 == bc_borderoffset1.html bc_borderoffset1.html
 == bc_borderoffset2.html bc_borderoffset2.html
 == frame_above_rules_all.html frame_above_rules_all.html
 == frame_above_rules_cols.html frame_above_rules_cols.html
 == frame_above_rules_groups.html frame_above_rules_groups.html
 == frame_above_rules_none.html frame_above_rules_none.html
 == frame_above_rules_rows.html frame_above_rules_rows.html
 == frame_below_rules_all.html frame_below_rules_all.html
--- a/layout/reftests/text-overflow/reftest-stylo.list
+++ b/layout/reftests/text-overflow/reftest-stylo.list
@@ -1,17 +1,17 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 fails == ellipsis-font-fallback.html ellipsis-font-fallback.html
 fails == line-clipping.html line-clipping.html
 fails == marker-basic.html marker-basic.html
 fails HTTP(..) == marker-string.html marker-string.html
 # == bidi-simple.html bidi-simple.html
 fails == bidi-simple-scrolled.html bidi-simple-scrolled.html
 fails == scroll-rounding.html scroll-rounding.html
-fuzzy(2,453) fuzzy-if(skiaContent,9,2100) fails-if(gtkWidget) asserts-if(stylo,4) HTTP(..) == anonymous-block.html anonymous-block.html # bug 1324671
+fuzzy(2,453) fuzzy-if(skiaContent,9,2100) fails-if(gtkWidget) HTTP(..) == anonymous-block.html anonymous-block.html
 fails HTTP(..) == false-marker-overlap.html false-marker-overlap.html
 fails HTTP(..) == visibility-hidden.html visibility-hidden.html
 # == block-padding.html block-padding.html
 fails HTTP(..) == quirks-decorations.html quirks-decorations.html
 fails HTTP(..) == quirks-line-height.html quirks-line-height.html
 fails HTTP(..) == standards-decorations.html standards-decorations.html
 fails HTTP(..) == standards-line-height.html standards-line-height.html
 fails == selection.html selection.html
--- a/layout/reftests/web-animations/reftest-stylo.list
+++ b/layout/reftests/web-animations/reftest-stylo.list
@@ -1,12 +1,12 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 test-pref(dom.animations-api.core.enabled,true) == 1246046-1.html 1246046-1.html
 test-pref(dom.animations-api.core.enabled,true) == 1267937-1.html 1267937-1.html
-fails test-pref(dom.animations-api.core.enabled,true) asserts-if(stylo,8) == 1298742-1.html 1298742-1.html # bug 1335342
+fails test-pref(dom.animations-api.core.enabled,true) == 1298742-1.html 1298742-1.html
 fails test-pref(dom.animations-api.core.enabled,true) == stacking-context-transform-none-animation-before-appending-element.html stacking-context-transform-none-animation-before-appending-element.html
 # test-pref(dom.animations-api.core.enabled,true) == stacking-context-opacity-changing-keyframe.html stacking-context-opacity-changing-keyframe.html
 # test-pref(dom.animations-api.core.enabled,true) == stacking-context-opacity-changing-keyframe-in-delay.html stacking-context-opacity-changing-keyframe-in-delay.html
 # test-pref(dom.animations-api.core.enabled,true) == stacking-context-opacity-changing-target.html stacking-context-opacity-changing-target.html
 # test-pref(dom.animations-api.core.enabled,true) == stacking-context-opacity-changing-target-in-delay.html stacking-context-opacity-changing-target-in-delay.html
 # test-pref(dom.animations-api.core.enabled,true) == stacking-context-opacity-changing-effect.html stacking-context-opacity-changing-effect.html
 # test-pref(dom.animations-api.core.enabled,true) == stacking-context-opacity-losing-css-animation-in-delay.html stacking-context-opacity-losing-css-animation-in-delay.html
 # test-pref(dom.animations-api.core.enabled,true) == stacking-context-transform-changing-keyframe.html stacking-context-transform-changing-keyframe.html
--- a/layout/reftests/writing-mode/reftest-stylo.list
+++ b/layout/reftests/writing-mode/reftest-stylo.list
@@ -11,18 +11,18 @@ fails == 1083848-3-inline-background-rep
 == 1086883-1a.html 1086883-1a.html
 == 1086883-1b.html 1086883-1b.html
 # == 1088025-1.html 1088025-1.html
 # == 1089388-1.html 1089388-1.html
 # == 1089388-2.html 1089388-2.html
 # == 1090159-1.html 1090159-1.html
 # == 1090168-1.html 1090168-1.html
 # == 1090168-1.html 1090168-1.html
-fails asserts-if(stylo,1) == 1090168-2.html 1090168-2.html # bug 1324700
-fails asserts-if(stylo,1) == 1090168-3.html 1090168-3.html # bug 1324700
+fails == 1090168-2.html 1090168-2.html
+fails == 1090168-3.html 1090168-3.html
 # == 1091058-1.html 1091058-1.html
 fails == 1094434-1.html 1094434-1.html
 fails == 1094434-2.html 1094434-2.html
 == 1094914-1a.html 1094914-1a.html
 == 1094914-1b.html 1094914-1b.html
 == 1096224-1a.html 1096224-1a.html
 == 1096224-1b.html 1096224-1b.html
 # == 1102175-1a.html 1102175-1a.html
@@ -64,17 +64,17 @@ fails == ua-style-sheet-size-2.html ua-s
 
 # == ua-style-sheet-fieldset-1.html ua-style-sheet-fieldset-1.html
 # == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1.html
 # == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1.html
 # == ua-style-sheet-textarea-1.html ua-style-sheet-textarea-1.html
 # == ua-style-sheet-checkbox-radio-1.html ua-style-sheet-checkbox-radio-1.html
 # == ua-style-sheet-button-1.html ua-style-sheet-button-1.html
 # == ua-style-sheet-button-1.html ua-style-sheet-button-1.html
-fails asserts-if(stylo,6) == ua-style-sheet-input-color-1.html ua-style-sheet-input-color-1.html # bug 1324671
+fails == ua-style-sheet-input-color-1.html ua-style-sheet-input-color-1.html
 # fuzzy-if(gtkWidget,1,15) == ua-style-sheet-input-number-1.html ua-style-sheet-input-number-1.html
 
 # HTTP(..) == 1127488-align-default-horizontal-tb-ltr.html 1127488-align-default-horizontal-tb-ltr.html
 # HTTP(..) == 1127488-align-start-horizontal-tb-ltr.html 1127488-align-start-horizontal-tb-ltr.html
 # HTTP(..) == 1127488-align-end-horizontal-tb-ltr.html 1127488-align-end-horizontal-tb-ltr.html
 # HTTP(..) == 1127488-align-left-horizontal-tb-ltr.html 1127488-align-left-horizontal-tb-ltr.html
 # HTTP(..) == 1127488-align-right-horizontal-tb-ltr.html 1127488-align-right-horizontal-tb-ltr.html
 # HTTP(..) == 1127488-align-default-horizontal-tb-rtl.html 1127488-align-default-horizontal-tb-rtl.html
--- a/layout/reftests/writing-mode/tables/reftest-stylo.list
+++ b/layout/reftests/writing-mode/tables/reftest-stylo.list
@@ -3,17 +3,17 @@
 == vertical-table-1b.html vertical-table-1b.html
 == vertical-table-2a.html vertical-table-2a.html
 == vertical-table-2b.html vertical-table-2b.html
 == vertical-table-rowspan-1.html vertical-table-rowspan-1.html
 == vertical-table-rowspan-2.html vertical-table-rowspan-2.html
 == vertical-table-colspan-1.html vertical-table-colspan-1.html
 == vertical-table-colspan-2.html vertical-table-colspan-2.html
 == vertical-table-specified-width-1.html vertical-table-specified-width-1.html
-asserts(1-2) == vertical-table-specified-width-2.html vertical-table-specified-width-2.html
+asserts(1) == vertical-table-specified-width-2.html vertical-table-specified-width-2.html
 == vertical-border-collapse-1.html vertical-border-collapse-1.html
 == vertical-border-collapse-2.html vertical-border-collapse-2.html
 
 # == fixed-table-layout-002-vlr.html fixed-table-layout-002-vlr.html
 # == fixed-table-layout-003-vlr.html fixed-table-layout-003-vlr.html
 # == fixed-table-layout-004-vlr.html fixed-table-layout-004-vlr.html
 # == fixed-table-layout-005-vlr.html fixed-table-layout-005-vlr.html
 # == fixed-table-layout-006-vlr.html fixed-table-layout-006-vlr.html
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -71,25 +71,25 @@ load 592698-1.html
 load 601437-1.html
 load 601439-1.html
 load 605689-1.html
 load 611922-1.html
 load 621596-1.html
 load 622314-1.xhtml
 load 637242.xhtml
 load 645142.html
-fails-if(stylo) == 645951-1.html 645951-1-ref.html
+fails-if(stylo) asserts-if(stylo,3-4) == 645951-1.html 645951-1-ref.html # bug 1324621
 load 652976-1.svg
 load 665209-1.html
 load 671799-1.html
 load 671799-2.html
 skip-if(stylo) load 690990-1.html # bug 1323708
 load 696188-1.html
 load 696869-1.html
-asserts-if(stylo,2) load 700116.html # bug 1324635
+asserts-if(stylo,4) load 700116.html # bug 1324635
 load 729126-1.html
 load 729126-2.html
 load 786108-1.html
 load 786108-2.html
 load 788836.html
 load 806310-1.html
 load 812824.html
 load 822766-1.html
@@ -150,22 +150,22 @@ load large_border_image_width.html
 load long-url-list-stack-overflow.html
 pref(layout.css.background-clip-text.enabled,true) load 1264949.html
 pref(layout.css.background-clip-text.enabled,true) load 1270795.html
 pref(layout.css.background-clip-text.enabled,true) load 1275026.html
 load 1278463-1.html
 skip-if(stylo) pref(dom.animations-api.core.enabled,true) load 1277908-1.html # bug 1323652
 skip-if(stylo) load 1277908-2.html # bug 1323652
 load 1282076-1.html
-pref(dom.animations-api.core.enabled,true) load 1282076-2.html
+asserts-if(stylo,2) pref(dom.animations-api.core.enabled,true) load 1282076-2.html # bug 1324686
 pref(dom.animations-api.core.enabled,true) load 1290994-1.html
 pref(dom.animations-api.core.enabled,true) load 1290994-2.html
 pref(dom.animations-api.core.enabled,true) load 1290994-3.html
 load 1290994-4.html
 load 1314531.html
 load 1315889-1.html
 load 1315894-1.html
 skip-if(stylo) load 1319072-1.html # bug 1323733
 HTTP load 1320423-1.html
 load 1321357-1.html
 load 1328535-1.html
 load 1331272.html
-asserts-if(stylo,1) HTTP load 1333001-1.html # bug 1324702
+asserts-if(stylo,4) HTTP load 1333001-1.html
--- a/parser/htmlparser/tests/reftest/reftest-stylo.list
+++ b/parser/htmlparser/tests/reftest/reftest-stylo.list
@@ -1,27 +1,27 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 == bug535530-1.html bug535530-1.html
-fails asserts-if(stylo,15) == view-source:bug535530-2.html view-source:bug535530-2.html # bug 1335312
+fails == view-source:bug535530-2.html view-source:bug535530-2.html
 == bug566280-1.html bug566280-1.html
 == bug569229-1.xml bug569229-1.xml
 fails == bug577418-1.html bug577418-1.html
 == bug582788-1.html bug582788-1.html
 fails == bug582940-1.html bug582940-1.html
 == bug592656-1.html bug592656-1.html
 fails == bug599320-1.html bug599320-1.html
-asserts-if(stylo,1) == bug608373-1.html bug608373-1.html # bug 1324683
-fails asserts-if(stylo,25) == view-source:bug482921-1.html view-source:bug482921-1.html # bug 1324704
-fails asserts-if(stylo,26) == view-source:bug482921-2.xhtml view-source:bug482921-2.xhtml # bug 1324704
+== bug608373-1.html bug608373-1.html
+fails == view-source:bug482921-1.html view-source:bug482921-1.html
+fails == view-source:bug482921-2.xhtml view-source:bug482921-2.xhtml
 == bug659763-1.html bug659763-1.html
 == bug659763-2.html bug659763-2.html
 == bug659763-3.html bug659763-3.html
 == bug659763-4.html bug659763-4.html
 == bug659763-5.html bug659763-5.html
 == bug659763-6.html bug659763-6.html
-fails asserts-if(stylo,10) == view-source:bug673094-1.html view-source:bug673094-1.html # bug 1324704
+fails == view-source:bug673094-1.html view-source:bug673094-1.html
 == bug696651-1.html bug696651-1.html
 == bug696651-2.html bug696651-2.html
-fails asserts-if(stylo,4) == view-source:bug700260-1.html view-source:bug700260-1.html # bug 1324704
-fails asserts-if(stylo,2) == view-source:bug704667-1.html view-source:bug704667-1.html # bug 1324704
-fails asserts-if(stylo,28) == view-source:bug731234-1.html view-source:bug731234-1.html # bug 1324704
+fails == view-source:bug700260-1.html view-source:bug700260-1.html
+fails == view-source:bug704667-1.html view-source:bug704667-1.html
+fails == view-source:bug731234-1.html view-source:bug731234-1.html
 == bug820508-1.html bug820508-1.html
-fails asserts-if(stylo,2) == view-source:bug910588-1.html view-source:bug910588-1.html # bug 1324704
+fails == view-source:bug910588-1.html view-source:bug910588-1.html