--- 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 asserts-if(stylo,2) == drop-shadow.html drop-shadow.html # bug 1324700
-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
+== default-color.html default-color.html
+== drop-shadow.html drop-shadow.html
+== drop-shadow-transformed.html drop-shadow-transformed.html
+== global-alpha.html global-alpha.html
+== global-composite-operation.html global-composite-operation.html
+== liveness.html liveness.html
+== multiple-drop-shadows.html multiple-drop-shadows.html
+== shadow.html shadow.html
+== subregion-fill-paint.html subregion-fill-paint.html
+== subregion-stroke-paint.html subregion-stroke-paint.html
+== svg-bbox.html svg-bbox.html
+== svg-inline.html svg-inline.html
+== svg-liveness.html svg-liveness.html
+== svg-off-screen.html svg-off-screen.html
+== units.html units.html
+== units-em.html units-em.html
+== units-ex.html units-ex.html
+== units-off-screen.html units-off-screen.html
+== fillText-with-filter-opacity-1.html fillText-with-filter-opacity-1.html
+== fillText-with-filter-opacity-2.html fillText-with-filter-opacity-2.html
+== strokeText-with-filter-grayscale-1.html strokeText-with-filter-grayscale-1.html
+== strokeText-with-filter-grayscale-2.html strokeText-with-filter-grayscale-2.html
+== fillText-with-shadow-1.html fillText-with-shadow-1.html
+== fillText-with-shadow-2.html fillText-with-shadow-2.html
+== fillText-with-filter-grayscale-1.html fillText-with-filter-grayscale-1.html
+== fillText-with-filter-grayscale-2.html fillText-with-filter-grayscale-2.html
+== strokeText-with-shadow-1.html strokeText-with-shadow-1.html
+== 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
+== stroketext-shadow.html stroketext-shadow.html
 
 # focus rings
 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
+== 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/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
 
 == 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
+== text-ltr-alignment-test.html text-ltr-alignment-test.html
+== 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
 
-fails asserts-if(stylo,1) == text-big-stroke.html text-big-stroke.html # Bug 1324700
-fails asserts-if(stylo,1) == text-big-stroke.html text-big-stroke.html # Bug 1324700
+== 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
+== text-context-state-test.html text-context-state-test.html
+== text-font-inherit.html text-font-inherit.html
+== 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
+== text-no-frame-test.html text-no-frame-test.html
+== text-no-frame-2-test.html text-no-frame-2-test.html
+== text-not-in-doc-test.html text-not-in-doc-test.html
 
-fails asserts-if(stylo,1) == text-bidi-ltr-test.html text-bidi-ltr-test.html # Bug 1324700
-fails asserts-if(stylo,1) == text-bidi-ltr-test.html text-bidi-ltr-test.html # Bug 1324700
-fails asserts-if(stylo,1) == text-bidi-rtl-test.html text-bidi-rtl-test.html # bug 1324700
+== text-bidi-ltr-test.html text-bidi-ltr-test.html
+== text-bidi-ltr-test.html text-bidi-ltr-test.html
+== 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
+== 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
+== text-measure.html text-measure.html
+== 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
+== text-subpixel-1.html text-subpixel-1.html
 
-fails asserts-if(stylo,1) == strokeText-path.html strokeText-path.html # bug 1324700
+== 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)||(azureSkiaGL&&Android)) skip-if(stylo) == linear-gradient-1a.html linear-gradient-1a.html # Too random.
 
 # this passes with cairo on 10.7 and 10.8 but not with azure for reasons unknown
 fails-if((azureSkia&&!azureSkiaGL)||(azureSkiaGL&&Android)) skip-if(stylo) == linear-gradient-1b.html linear-gradient-1b.html # Too random.
@@ -82,36 +82,36 @@ fails-if((azureSkia&&!azureSkiaGL)||(azu
 
 == ctm-sanity.html ctm-sanity.html
 == ctm-singular-sanity.html ctm-singular-sanity.html
 == ctm-1.html ctm-1.html
 
 == 672646-alpha-radial-gradient.html 672646-alpha-radial-gradient.html
 == 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
+== 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
+== 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
+== 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
+== 1304353-text-global-alpha-1.html 1304353-text-global-alpha-1.html
+== 1304353-text-global-alpha-2.html 1304353-text-global-alpha-2.html
+== 1304353-text-global-composite-op-1.html 1304353-text-global-composite-op-1.html
 
 skip-if(stylo) == text-indent-1a.html text-indent-1a.html # Bug 1347410
 == text-indent-1b.html text-indent-1b.html

--- a/layout/reftests/image-element/reftest-stylo.list
+++ b/layout/reftests/image-element/reftest-stylo.list
@@ -1,17 +1,17 @@
 # DO NOT EDIT! This is a auto-generated temporary list for Stylo testing
 random == bug-364968.html bug-364968.html
 == bug-463204.html bug-463204.html
 == canvas-outside-document.html canvas-outside-document.html
 == mozsetimageelement-01.html mozsetimageelement-01.html
 == mozsetimageelement-02.html mozsetimageelement-02.html
 == image-outside-document-invalidate.html image-outside-document-invalidate.html
 == canvas-outside-document-invalidate-01.html canvas-outside-document-invalidate-01.html
-skip-if(stylo) == canvas-outside-document-invalidate-02.html canvas-outside-document-invalidate-02.html # Bug 1324700
+skip-if(stylo) == canvas-outside-document-invalidate-02.html canvas-outside-document-invalidate-02.html # Bug 1341761
 #fails with Skia due to Skia bug http://code.google.com/p/skia/issues/detail?id=568
 == element-paint-simple.html element-paint-simple.html # Bug 1341761
 == element-paint-repeated.html element-paint-repeated.html
 == element-paint-recursion.html element-paint-recursion.html
 HTTP(..) == element-paint-continuation.html element-paint-continuation.html
 fails == element-paint-transform-01.html element-paint-transform-01.html
 fails == element-paint-transform-02.html element-paint-transform-02.html
 == element-paint-background-size-01.html element-paint-background-size-01.html

--- a/layout/reftests/writing-mode/reftest-stylo.list
+++ b/layout/reftests/writing-mode/reftest-stylo.list
@@ -9,20 +9,20 @@ HTTP(..) == 1083848-2-inline-background.
 == 1083848-3-inline-background-repeat.html 1083848-3-inline-background-repeat.html
 == 1083892-1.html 1083892-1.html
 == 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
-fails asserts-if(stylo,1) == 1090168-1.html 1090168-1.html
-fails asserts-if(stylo,1) == 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
+== 1090168-1.html 1090168-1.html
+== 1090168-1.html 1090168-1.html
+== 1090168-2.html 1090168-2.html
+== 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