Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
author: Daniel Baumann <daniel.baumann@progress-linux.org> 2024-04-19 01:13:33 +0000
committer: Daniel Baumann <daniel.baumann@progress-linux.org> 2024-04-19 01:13:33 +0000
commit: 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch)
tree: a4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /layout/reftests
parent: Adding debian version 124.0.1-1. (diff)
download: firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz
firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.zip
183 files changed, 603 insertions, 4938 deletions
diff --git a/layout/reftests/abs-pos/reftest.list b/layout/reftests/abs-pos/reftest.list
index 3e5b85de9b..c595d14368 100644
--- a/layout/reftests/abs-pos/reftest.list
+++ b/layout/reftests/abs-pos/reftest.list
@@ -51,7 +51,7 @@ pref(layout.display-list.improve-fragmentation,true) == table-cell-8.html table-
 == continuation-positioned-inline-1.html continuation-positioned-inline-ref.html
 == continuation-positioned-inline-2.html continuation-positioned-inline-ref.html
 == scrollframe-1.html scrollframe-1-ref.html
-fuzzy-if(gtkWidget,0-1,0-1) fuzzy-if(Android,0-9,0-185) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-140,0-144) == scrollframe-2.html scrollframe-2-ref.html #bug 756530
+fuzzy-if(gtkWidget,0-1,0-1) fuzzy-if(Android,0-9,0-185) == scrollframe-2.html scrollframe-2-ref.html #bug 756530
 fuzzy-if(gtkWidget,0-1,0-8) fuzzy-if(Android,0-4,0-2) == select-1.html select-1-ref.html
 fuzzy-if(gtkWidget,0-1,0-8) fuzzy-if(Android,0-4,0-2) == select-1-dynamic.html select-1-ref.html
 == select-2.html select-2-ref.html
diff --git a/layout/reftests/async-scrolling/reftest.list b/layout/reftests/async-scrolling/reftest.list
index 2602ed541b..d74a1544b2 100644
--- a/layout/reftests/async-scrolling/reftest.list
+++ b/layout/reftests/async-scrolling/reftest.list
@@ -1,86 +1,86 @@
-skip-if(!asyncPan) == bg-fixed-1.html bg-fixed-1-ref.html
-skip-if(!asyncPan) == bg-fixed-cover-1.html bg-fixed-cover-1-ref.html
-skip-if(!asyncPan) == bg-fixed-cover-2.html bg-fixed-cover-2-ref.html
-skip-if(!asyncPan) == bg-fixed-cover-3.html bg-fixed-cover-3-ref.html
-skip-if(!asyncPan) == bg-fixed-child.html bg-fixed-child-ref.html
-skip-if(!asyncPan) == bg-fixed-child-clip-1.html bg-fixed-child-clip-ref.html
-skip-if(!asyncPan) == bg-fixed-child-clip-2.html bg-fixed-child-clip-ref.html
-skip-if(!asyncPan) fuzzy(0-1,0-87) == bg-fixed-child-mask.html bg-fixed-child-mask-ref.html
-skip-if(!asyncPan) == bg-fixed-in-opacity.html bg-fixed-in-opacity-ref.html
+skip-if(useDrawSnapshot) == bg-fixed-1.html bg-fixed-1-ref.html
+skip-if(useDrawSnapshot) == bg-fixed-cover-1.html bg-fixed-cover-1-ref.html
+skip-if(useDrawSnapshot) == bg-fixed-cover-2.html bg-fixed-cover-2-ref.html
+skip-if(useDrawSnapshot) == bg-fixed-cover-3.html bg-fixed-cover-3-ref.html
+skip-if(useDrawSnapshot) == bg-fixed-child.html bg-fixed-child-ref.html
+skip-if(useDrawSnapshot) == bg-fixed-child-clip-1.html bg-fixed-child-clip-ref.html
+skip-if(useDrawSnapshot) == bg-fixed-child-clip-2.html bg-fixed-child-clip-ref.html
+skip-if(useDrawSnapshot) fuzzy(0-1,0-87) == bg-fixed-child-mask.html bg-fixed-child-mask-ref.html
+skip-if(useDrawSnapshot) == bg-fixed-in-opacity.html bg-fixed-in-opacity-ref.html
 # Passing the test below without WebRender would require implementing CSS filters in the Gecko compositor.
-skip-if(!asyncPan) fuzzy-if(gtkWidget,0-1,0-87) fuzzy-if(!gtkWidget,0-1,0-3951) == bg-fixed-in-css-filter.html bg-fixed-in-css-filter-ref.html # bug 1454794 for webrender fuzziness
-skip-if(!asyncPan) == bg-fixed-child-no-culling-1.html bg-fixed-child-no-culling-1-ref.html
-skip-if(!asyncPan) == bg-fixed-child-no-culling-2.html bg-fixed-child-no-culling-2-ref.html
-skip-if(!asyncPan) == bg-fixed-child-no-culling-3.html bg-fixed-child-no-culling-3-ref.html
-fuzzy-if(Android,0-2,0-4000) fuzzy-if(browserIsRemote&&cocoaWidget,0-2,0-179524) fuzzy-if(browserIsRemote&&winWidget,0-1,0-74590) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-1,0-3528) skip-if(!asyncPan) fuzzy-if(geckoview,0-1,0-74590) == bg-fixed-transformed-image.html bg-fixed-transformed-image-ref.html
-skip-if(!asyncPan) == contain-paint-scrollable-frame-1.html contain-paint-scrollable-frame-1-ref.html
-skip-if(!asyncPan) == element-1.html element-1-ref.html
-pref(layers.force-active,true) skip-if(!asyncPan) == iframe-1.html iframe-1-ref.html
-skip-if(!asyncPan) == nested-1.html nested-1-ref.html
-skip-if(!asyncPan) == nested-2.html nested-2-ref.html
-skip-if(!asyncPan) == position-fixed-1.html position-fixed-1-ref.html
-skip-if(!asyncPan) == position-fixed-2.html position-fixed-2-ref.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-3120) skip-if(!asyncPan) == position-fixed-body.html position-fixed-body-ref.html
-skip-if(!asyncPan) == position-fixed-cover-1.html position-fixed-cover-1-ref.html
-skip-if(!asyncPan) == position-fixed-cover-2.html position-fixed-cover-2-ref.html
-skip-if(!asyncPan) == position-fixed-cover-3.html position-fixed-cover-3-ref.html
-fuzzy-if(Android,0-15,0-11) fuzzy-if(gtkWidget,20-33,14-32) fuzzy-if(cocoaWidget,9-21,20-44) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html # Bug 1604338
-skip-if(!asyncPan) == split-layers-1.html split-layers-1-ref.html
-skip-if(!asyncPan) == split-layers-multi-scrolling-1.html split-layers-multi-scrolling-1-ref.html
-fuzzy(0-2,0-240000) skip-if(!asyncPan) == split-opacity-layers-1.html split-opacity-layers-1-ref.html
-skip-if(!asyncPan) fuzzy-if(appleSilicon,0-1,0-8) == sticky-pos-scrollable-1.html sticky-pos-scrollable-1-ref.html
-skip-if(!asyncPan) == sticky-pos-scrollable-2.html sticky-pos-scrollable-2-ref.html
-skip-if(!asyncPan) == sticky-pos-scrollable-3.html sticky-pos-scrollable-3-ref.html
-skip-if(!asyncPan) == sticky-pos-scrollable-4.html sticky-pos-scrollable-4-ref.html
-skip-if(!asyncPan) == sticky-pos-scrollable-5.html sticky-pos-scrollable-5-ref.html
-skip-if(!asyncPan) == sticky-pos-scrollable-6.html sticky-pos-scrollable-6-ref.html
-skip-if(!asyncPan) fuzzy-if(appleSilicon,0-1,0-8) == sticky-pos-scrollable-7.html sticky-pos-scrollable-7-ref.html
-skip-if(!asyncPan) fuzzy(0-2,0-2) fuzzy-if(gtkWidget,0-1,0-4) fuzzy-if(winWidget,0-1,0-51) fuzzy-if(appleSilicon,0-1,0-8) == fixed-pos-scrollable-1.html fixed-pos-scrollable-1-ref.html
-skip-if(!asyncPan) == culling-1.html culling-1-ref.html
-skip-if(!asyncPan) == position-fixed-iframe-1.html position-fixed-iframe-1-ref.html
-skip-if(!asyncPan) == position-fixed-iframe-2.html position-fixed-iframe-2-ref.html
-fuzzy(0-1,0-11300) skip-if(!asyncPan) == position-fixed-in-scroll-container.html position-fixed-in-scroll-container-ref.html
-fuzzy(0-1,0-400) skip-if(!asyncPan) == position-fixed-inside-clip-path.html position-fixed-inside-clip-path-ref.html
-skip-if(!asyncPan) == position-fixed-inside-sticky-1.html position-fixed-inside-sticky-1-ref.html
-skip-if(!asyncPan) == position-fixed-inside-sticky-2.html position-fixed-inside-sticky-2-ref.html
-skip-if(!asyncPan) == position-fixed-inside-sticky-3.html position-fixed-inside-sticky-3-ref.html
-skip-if(!asyncPan) == sticky-inside-fixed-1.html sticky-inside-fixed-1-ref.html
-skip-if(!asyncPan) == sticky-inside-transform-1.html sticky-inside-transform-1-ref.html
-fuzzy(0-1,0-60000) skip-if(!asyncPan) == group-opacity-surface-size-1.html group-opacity-surface-size-1-ref.html
-fuzzy(0-55,0-295) skip-if(!asyncPan) == position-sticky-transformed.html position-sticky-transformed-ref.html
-skip-if(!asyncPan) fuzzy-if(cocoaWidget,0-1,0-396) fuzzy-if(winWidget,0-1,0-396) == offscreen-prerendered-active-opacity.html offscreen-prerendered-active-opacity-ref.html
-fuzzy-if(Android,0-43,0-40) fuzzy-if(!Android,0-1,0-34) fuzzy-if(gtkWidget,22-74,20-32) fuzzy-if(cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html # Bug 1604338
-fuzzy-if(Android,0-43,0-40) fuzzy-if(gtkWidget,22-74,20-32) fuzzy-if(cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html # Bug 1604338
+skip-if(useDrawSnapshot) fuzzy-if(gtkWidget,0-1,0-87) fuzzy-if(!gtkWidget,0-1,0-3951) == bg-fixed-in-css-filter.html bg-fixed-in-css-filter-ref.html # bug 1454794 for webrender fuzziness
+skip-if(useDrawSnapshot) == bg-fixed-child-no-culling-1.html bg-fixed-child-no-culling-1-ref.html
+skip-if(useDrawSnapshot) == bg-fixed-child-no-culling-2.html bg-fixed-child-no-culling-2-ref.html
+skip-if(useDrawSnapshot) == bg-fixed-child-no-culling-3.html bg-fixed-child-no-culling-3-ref.html
+fuzzy-if(Android,0-2,0-4000) fuzzy-if(cocoaWidget,0-2,0-179524) fuzzy-if(winWidget,0-1,0-74590) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-1,0-3528) skip-if(useDrawSnapshot) fuzzy-if(geckoview,0-1,0-74590) == bg-fixed-transformed-image.html bg-fixed-transformed-image-ref.html
+skip-if(useDrawSnapshot) == contain-paint-scrollable-frame-1.html contain-paint-scrollable-frame-1-ref.html
+skip-if(useDrawSnapshot) == element-1.html element-1-ref.html
+pref(layers.force-active,true) skip-if(useDrawSnapshot) == iframe-1.html iframe-1-ref.html
+skip-if(useDrawSnapshot) == nested-1.html nested-1-ref.html
+skip-if(useDrawSnapshot) == nested-2.html nested-2-ref.html
+skip-if(useDrawSnapshot) == position-fixed-1.html position-fixed-1-ref.html
+skip-if(useDrawSnapshot) == position-fixed-2.html position-fixed-2-ref.html
+fuzzy-if(winWidget,0-1,0-3120) skip-if(useDrawSnapshot) == position-fixed-body.html position-fixed-body-ref.html
+skip-if(useDrawSnapshot) == position-fixed-cover-1.html position-fixed-cover-1-ref.html
+skip-if(useDrawSnapshot) == position-fixed-cover-2.html position-fixed-cover-2-ref.html
+skip-if(useDrawSnapshot) == position-fixed-cover-3.html position-fixed-cover-3-ref.html
+fuzzy-if(Android,0-15,0-11) fuzzy-if(gtkWidget,20-33,14-32) fuzzy-if(cocoaWidget,9-21,20-44) skip-if(useDrawSnapshot) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html # Bug 1604338
+skip-if(useDrawSnapshot) == split-layers-1.html split-layers-1-ref.html
+skip-if(useDrawSnapshot) == split-layers-multi-scrolling-1.html split-layers-multi-scrolling-1-ref.html
+fuzzy(0-2,0-240000) skip-if(useDrawSnapshot) == split-opacity-layers-1.html split-opacity-layers-1-ref.html
+skip-if(useDrawSnapshot) fuzzy-if(appleSilicon,0-1,0-8) == sticky-pos-scrollable-1.html sticky-pos-scrollable-1-ref.html
+skip-if(useDrawSnapshot) == sticky-pos-scrollable-2.html sticky-pos-scrollable-2-ref.html
+skip-if(useDrawSnapshot) == sticky-pos-scrollable-3.html sticky-pos-scrollable-3-ref.html
+skip-if(useDrawSnapshot) == sticky-pos-scrollable-4.html sticky-pos-scrollable-4-ref.html
+skip-if(useDrawSnapshot) == sticky-pos-scrollable-5.html sticky-pos-scrollable-5-ref.html
+skip-if(useDrawSnapshot) == sticky-pos-scrollable-6.html sticky-pos-scrollable-6-ref.html
+skip-if(useDrawSnapshot) fuzzy-if(appleSilicon,0-1,0-8) == sticky-pos-scrollable-7.html sticky-pos-scrollable-7-ref.html
+skip-if(useDrawSnapshot) fuzzy(0-2,0-2) fuzzy-if(gtkWidget,0-1,0-4) fuzzy-if(winWidget,0-1,0-51) fuzzy-if(appleSilicon,0-1,0-8) == fixed-pos-scrollable-1.html fixed-pos-scrollable-1-ref.html
+skip-if(useDrawSnapshot) == culling-1.html culling-1-ref.html
+skip-if(useDrawSnapshot) == position-fixed-iframe-1.html position-fixed-iframe-1-ref.html
+skip-if(useDrawSnapshot) == position-fixed-iframe-2.html position-fixed-iframe-2-ref.html
+fuzzy(0-1,0-11300) skip-if(useDrawSnapshot) == position-fixed-in-scroll-container.html position-fixed-in-scroll-container-ref.html
+fuzzy(0-1,0-400) skip-if(useDrawSnapshot) == position-fixed-inside-clip-path.html position-fixed-inside-clip-path-ref.html
+skip-if(useDrawSnapshot) == position-fixed-inside-sticky-1.html position-fixed-inside-sticky-1-ref.html
+skip-if(useDrawSnapshot) == position-fixed-inside-sticky-2.html position-fixed-inside-sticky-2-ref.html
+skip-if(useDrawSnapshot) == position-fixed-inside-sticky-3.html position-fixed-inside-sticky-3-ref.html
+skip-if(useDrawSnapshot) == sticky-inside-fixed-1.html sticky-inside-fixed-1-ref.html
+skip-if(useDrawSnapshot) == sticky-inside-transform-1.html sticky-inside-transform-1-ref.html
+fuzzy(0-1,0-60000) skip-if(useDrawSnapshot) == group-opacity-surface-size-1.html group-opacity-surface-size-1-ref.html
+fuzzy(0-55,0-295) skip-if(useDrawSnapshot) == position-sticky-transformed.html position-sticky-transformed-ref.html
+skip-if(useDrawSnapshot) fuzzy-if(cocoaWidget,0-1,0-396) fuzzy-if(winWidget,0-1,0-396) == offscreen-prerendered-active-opacity.html offscreen-prerendered-active-opacity-ref.html
+fuzzy-if(Android,0-43,0-40) fuzzy-if(!Android,0-1,0-34) fuzzy-if(gtkWidget,22-74,20-32) fuzzy-if(cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(useDrawSnapshot) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html # Bug 1604338
+fuzzy-if(Android,0-43,0-40) fuzzy-if(gtkWidget,22-74,20-32) fuzzy-if(cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(useDrawSnapshot) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html # Bug 1604338
 fuzzy-if(Android,0-43,0-40) skip == offscreen-clipped-blendmode-3.html offscreen-clipped-blendmode-ref.html # bug 1251588 - wrong AGR on mix-blend-mode item
-fuzzy-if(Android,0-43,0-40) fuzzy-if(gtkWidget,22-74,20-32) fuzzy-if(cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html # Bug 1604338
-fuzzy-if(Android,0-7,0-1680) fuzzy-if(gtkWidget,1-1,2-20) fuzzy-if(cocoaWidget,1-2,10-18) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-2,0-18) skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1-ref.html # Bug 1604338
-fuzzy-if(Android,0-7,0-4) skip-if(!asyncPan) == perspective-scrolling-2.html perspective-scrolling-2-ref.html
-fuzzy-if(Android,0-19,0-10) fuzzy-if(gtkWidget,8-13,12-32) fuzzy-if(cocoaWidget,10-13,20-44) skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3-ref.html # Bug 1604338
-fuzzy-if(Android,0-14,0-11) fuzzy-if(gtkWidget,18-30,14-32) fuzzy-if(cocoaWidget,16-20,20-44) skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4-ref.html # Bug 1604338
-skip-if(!asyncPan) == perspective-scrolling-5.html perspective-scrolling-5-ref.html
-pref(apz.disable_for_scroll_linked_effects,true) skip-if(!asyncPan) == disable-apz-for-sle-pages.html disable-apz-for-sle-pages-ref.html
-fuzzy-if(browserIsRemote&&d2d,0-1,0-22) skip-if(!asyncPan) fuzzy-if(swgl,0-255,0-11) == background-blend-mode-1.html background-blend-mode-1-ref.html
-skip-if(Android||!asyncPan) != opaque-fractional-displayport-1.html about:blank
-skip-if(Android||!asyncPan) != opaque-fractional-displayport-2.html about:blank
-fuzzy-if(Android,0-19,0-10) fuzzy-if(gtkWidget,12-19,12-32) fuzzy-if(cocoaWidget,17-21,20-44) skip-if(!asyncPan) == fixed-pos-scrolled-clip-1.html fixed-pos-scrolled-clip-1-ref.html # Bug 1604338
-fuzzy-if(Android,0-44,0-136) fuzzy-if(gtkWidget,16-26,26-64) fuzzy-if(cocoaWidget,10-13,38-82) fuzzy-if(winWidget,0-4,0-36) skip-if(!asyncPan) == fixed-pos-scrolled-clip-2.html fixed-pos-scrolled-clip-2-ref.html # Bug 1604338
-fuzzy-if(Android,0-13,0-465) fuzzy-if(gtkWidget,17-28,24-60) fuzzy-if(cocoaWidget,15-19,40-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-3.html fixed-pos-scrolled-clip-3-ref.html # Bug 1604338
-fuzzy-if(Android,0-13,0-465) fuzzy-if(gtkWidget,17-29,24-60) fuzzy-if(cocoaWidget,15-19,40-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-4.html fixed-pos-scrolled-clip-4-ref.html # Bug 1604338
-skip-if(!asyncPan) == fixed-pos-scrolled-clip-5.html fixed-pos-scrolled-clip-5-ref.html
-skip-if(!asyncPan) == position-sticky-bug1434250.html position-sticky-bug1434250-ref.html
-fuzzy-if(Android,0-12,0-11) fuzzy-if(gtkWidget,16-25,12-32) fuzzy-if(cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-scrolled-clip-1.html position-sticky-scrolled-clip-1-ref.html # Bug 1604338
+fuzzy-if(Android,0-43,0-40) fuzzy-if(gtkWidget,22-74,20-32) fuzzy-if(cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(useDrawSnapshot) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html # Bug 1604338
+fuzzy-if(Android,0-7,0-1680) fuzzy-if(gtkWidget,1-1,2-20) fuzzy-if(cocoaWidget,1-2,10-18) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-2,0-18) skip-if(useDrawSnapshot) == perspective-scrolling-1.html perspective-scrolling-1-ref.html # Bug 1604338
+fuzzy-if(Android,0-7,0-4) skip-if(useDrawSnapshot) == perspective-scrolling-2.html perspective-scrolling-2-ref.html
+fuzzy-if(Android,0-19,0-10) fuzzy-if(gtkWidget,8-13,12-32) fuzzy-if(cocoaWidget,10-13,20-44) skip-if(useDrawSnapshot) == perspective-scrolling-3.html perspective-scrolling-3-ref.html # Bug 1604338
+fuzzy-if(Android,0-14,0-11) fuzzy-if(gtkWidget,18-30,14-32) fuzzy-if(cocoaWidget,16-20,20-44) skip-if(useDrawSnapshot) == perspective-scrolling-4.html perspective-scrolling-4-ref.html # Bug 1604338
+skip-if(useDrawSnapshot) == perspective-scrolling-5.html perspective-scrolling-5-ref.html
+pref(apz.disable_for_scroll_linked_effects,true) skip-if(useDrawSnapshot) == disable-apz-for-sle-pages.html disable-apz-for-sle-pages-ref.html
+fuzzy-if(winWidget,0-1,0-22) skip-if(useDrawSnapshot) fuzzy-if(swgl,0-255,0-11) == background-blend-mode-1.html background-blend-mode-1-ref.html
+skip-if(Android||useDrawSnapshot) != opaque-fractional-displayport-1.html about:blank
+skip-if(Android||useDrawSnapshot) != opaque-fractional-displayport-2.html about:blank
+fuzzy-if(Android,0-19,0-10) fuzzy-if(gtkWidget,12-19,12-32) fuzzy-if(cocoaWidget,17-21,20-44) skip-if(useDrawSnapshot) == fixed-pos-scrolled-clip-1.html fixed-pos-scrolled-clip-1-ref.html # Bug 1604338
+fuzzy-if(Android,0-44,0-136) fuzzy-if(gtkWidget,16-26,26-64) fuzzy-if(cocoaWidget,10-13,38-82) fuzzy-if(winWidget,0-4,0-36) skip-if(useDrawSnapshot) == fixed-pos-scrolled-clip-2.html fixed-pos-scrolled-clip-2-ref.html # Bug 1604338
+fuzzy-if(Android,0-13,0-465) fuzzy-if(gtkWidget,17-28,24-60) fuzzy-if(cocoaWidget,15-19,40-75) skip-if(useDrawSnapshot) == fixed-pos-scrolled-clip-3.html fixed-pos-scrolled-clip-3-ref.html # Bug 1604338
+fuzzy-if(Android,0-13,0-465) fuzzy-if(gtkWidget,17-29,24-60) fuzzy-if(cocoaWidget,15-19,40-75) skip-if(useDrawSnapshot) == fixed-pos-scrolled-clip-4.html fixed-pos-scrolled-clip-4-ref.html # Bug 1604338
+skip-if(useDrawSnapshot) == fixed-pos-scrolled-clip-5.html fixed-pos-scrolled-clip-5-ref.html
+skip-if(useDrawSnapshot) == position-sticky-bug1434250.html position-sticky-bug1434250-ref.html
+fuzzy-if(Android,0-12,0-11) fuzzy-if(gtkWidget,16-25,12-32) fuzzy-if(cocoaWidget,13-16,20-44) skip-if(useDrawSnapshot) == position-sticky-scrolled-clip-1.html position-sticky-scrolled-clip-1-ref.html # Bug 1604338
 fuzzy-if(Android,0-6,0-4) skip == position-sticky-scrolled-clip-2.html position-sticky-scrolled-clip-2-ref.html # bug ?????? - incorrectly applying clip to sticky contents
-fuzzy-if(Android,0-8,0-27) fuzzy-if(cocoaWidget,9-11,20-44) skip-if(!asyncPan) == curtain-effect-1.html curtain-effect-1-ref.html
-fuzzy-if(Android,0-7,0-9) fuzzy-if(gtkWidget,10-15,12-32) fuzzy-if(cocoaWidget,5-9,20-42) skip-if(!asyncPan) == transformed-1.html transformed-1-ref.html # Bug 1604338
-fuzzy-if(Android,2-7,1-12) fuzzy-if(gtkWidget,3-5,12-28) fuzzy-if(cocoaWidget,5-6,18-38) skip-if(!asyncPan) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-6,0-38) == position-sticky-transformed-in-scrollframe-1.html position-sticky-transformed-in-scrollframe-1-ref.html # Bug 1604338
-fuzzy-if(Android,3-3,1-470) fuzzy-if(Android&&swgl&&isDebugBuild&&/^aarch64-gcc3/.test(xulRuntime.XPCOMABI),3-3,457-457) fuzzy-if(gtkWidget,13-20,12-32) fuzzy-if(cocoaWidget,12-16,20-44) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-2.html position-sticky-transformed-in-scrollframe-2-ref.html # Bug 1604338
-fuzzy-if(Android,12-13,4-31) fuzzy-if(gtkWidget,16-27,14-32) fuzzy-if(cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-1.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
-fuzzy-if(Android,12-13,4-31) fuzzy-if(gtkWidget,16-27,14-32) fuzzy-if(cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
+fuzzy-if(Android,0-8,0-27) fuzzy-if(cocoaWidget,9-11,20-44) skip-if(useDrawSnapshot) == curtain-effect-1.html curtain-effect-1-ref.html
+fuzzy-if(Android,0-7,0-9) fuzzy-if(gtkWidget,10-15,12-32) fuzzy-if(cocoaWidget,5-9,20-42) skip-if(useDrawSnapshot) == transformed-1.html transformed-1-ref.html # Bug 1604338
+fuzzy-if(Android,2-7,1-12) fuzzy-if(gtkWidget,3-5,12-28) fuzzy-if(cocoaWidget,5-6,18-38) skip-if(useDrawSnapshot) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-6,0-38) == position-sticky-transformed-in-scrollframe-1.html position-sticky-transformed-in-scrollframe-1-ref.html # Bug 1604338
+fuzzy-if(Android,3-3,1-470) fuzzy-if(Android&&swgl&&isDebugBuild&&/^aarch64-gcc3/.test(xulRuntime.XPCOMABI),3-3,457-457) fuzzy-if(gtkWidget,13-20,12-32) fuzzy-if(cocoaWidget,12-16,20-44) skip-if(useDrawSnapshot) == position-sticky-transformed-in-scrollframe-2.html position-sticky-transformed-in-scrollframe-2-ref.html # Bug 1604338
+fuzzy-if(Android,12-13,4-31) fuzzy-if(gtkWidget,16-27,14-32) fuzzy-if(cocoaWidget,13-16,20-44) skip-if(useDrawSnapshot) == position-sticky-in-transformed-scrollframe-1.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
+fuzzy-if(Android,12-13,4-31) fuzzy-if(gtkWidget,16-27,14-32) fuzzy-if(cocoaWidget,13-16,20-44) skip-if(useDrawSnapshot) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
 
-skip-if(!asyncPan) == checkerboard-1.html checkerboard-1-ref.html
-skip-if(!asyncPan) == checkerboard-2.html checkerboard-2-ref.html
-skip-if(!asyncPan) == checkerboard-3.html checkerboard-3-ref.html
-skip-if(!asyncPan) == position-sticky-in-checkerboard-land-1.html position-sticky-in-checkerboard-land-1-ref.html
+skip-if(useDrawSnapshot) == checkerboard-1.html checkerboard-1-ref.html
+skip-if(useDrawSnapshot) == checkerboard-2.html checkerboard-2-ref.html
+skip-if(useDrawSnapshot) == checkerboard-3.html checkerboard-3-ref.html
+skip-if(useDrawSnapshot) == position-sticky-in-checkerboard-land-1.html position-sticky-in-checkerboard-land-1-ref.html
 
 skip-if(!Android) pref(apz.allow_zooming,true) == position-fixed-async-zoom-1.html position-fixed-async-zoom-1-ref.html
 skip-if(!Android) pref(apz.allow_zooming,true) == position-fixed-async-zoom-2.html position-fixed-async-zoom-2-ref.html
@@ -92,16 +92,16 @@ skip-if(!Android) pref(apz.allow_zooming,true) == position-sticky-async-zoom-2.h
 pref(apz.allow_zooming,true) == async-scroll-and-zoom.html async-scroll-and-zoom-ref.html
 
 # on Android we have a different overscroll effect so this test is disabled
-skip-if(!asyncPan||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll.html overscroll-ref.html
-skip-if(!asyncPan||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-subframe.html overscroll-ref.html
-skip-if(!asyncPan||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-fixed.html no-overscroll-ref.html
-skip-if(!asyncPan||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-fixed-transform.html overscroll-ref.html
-skip-if(!asyncPan||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-fixed-iframe.html overscroll-ref.html
-skip-if(!asyncPan||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-fixed-iframe-overscroll.html no-overscroll-ref.html
+skip-if(useDrawSnapshot||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll.html overscroll-ref.html
+skip-if(useDrawSnapshot||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-subframe.html overscroll-ref.html
+skip-if(useDrawSnapshot||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-fixed.html no-overscroll-ref.html
+skip-if(useDrawSnapshot||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-fixed-transform.html overscroll-ref.html
+skip-if(useDrawSnapshot||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-fixed-iframe.html overscroll-ref.html
+skip-if(useDrawSnapshot||Android) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-fixed-iframe-overscroll.html no-overscroll-ref.html
 # This one needs to be fuzzed due to the fact that squishing a scrollbar
 # thumb on the compositor doesn't preserve its shape exactly.
-skip-if(!asyncPan||Android) fuzzy(0-56,0-33) fuzzy-if(winWidget,0-107,0-17) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-scrollbar.html overscroll-scrollbar-ref.html
-skip-if(!asyncPan||Android) pref(apz.overscroll.enabled,false) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-disabled.html no-overscroll-ref.html
+skip-if(useDrawSnapshot||Android) fuzzy(0-56,0-33) fuzzy-if(winWidget,0-107,0-17) pref(apz.overscroll.enabled,true) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-scrollbar.html overscroll-scrollbar-ref.html
+skip-if(useDrawSnapshot||Android) pref(apz.overscroll.enabled,false) pref(apz.overscroll.test_async_scroll_offset.enabled,true) == overscroll-disabled.html no-overscroll-ref.html
 
 # for this test, apz.allow_zooming is needed to ensure we take the containerless scrolling codepath that creates
 # an async zoom container (since we are testing a regression in that codepath)
diff --git a/layout/reftests/backgrounds/reftest.list b/layout/reftests/backgrounds/reftest.list
index 1be6e54d53..3370e98006 100644
--- a/layout/reftests/backgrounds/reftest.list
+++ b/layout/reftests/backgrounds/reftest.list
@@ -97,7 +97,7 @@ fails-if(useDrawSnapshot) == background-size-zoom-no-repeat.html background-size
 == background-size-contain-clip-padding-origin-border-padding.html background-size-contain-clip-padding-origin-border-padding-ref.html
 
 == background-layers-1a.html background-layers-1-ref.html
-fuzzy-if(OSX,0-1,0-324) == background-layers-1b.html background-layers-1-ref.html
+fuzzy-if(cocoaWidget,0-1,0-324) == background-layers-1b.html background-layers-1-ref.html
 
 # box-decoration-break's effect on backgrounds is touchy and hard to test due to stretching
 # artifacts and the difficulty of covering exact lines, so just make sure
diff --git a/layout/reftests/bidi/dirAuto/1103348-1-ref.html b/layout/reftests/bidi/dirAuto/1103348-1-ref.html
deleted file mode 100644
index 50fba8c41d..0000000000
--- a/layout/reftests/bidi/dirAuto/1103348-1-ref.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Dynamic changes and dir=auto</title>
-  </head>
-  <body>
-    <div>Test for elements with dir="auto" whose content changes between directional and neutral</div>
-    <div dir="auto">xyz</div>
-    <div dir="auto">ابج</div>
-    <div dir="auto">456</div>
-    <div dir="auto">xyz</div>
-    <div dir="auto">ابج</div>
-    <div dir="auto">456</div>
-    <div dir="auto">xyz</div>
-    <div dir="auto">ابج</div>
-    <div dir="auto">456</div>
-  </body>
-</html>
diff --git a/layout/reftests/bidi/dirAuto/1103348-1.html b/layout/reftests/bidi/dirAuto/1103348-1.html
deleted file mode 100644
index 4092f27f87..0000000000
--- a/layout/reftests/bidi/dirAuto/1103348-1.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-  <head>
-    <meta charset="utf-8">
-    <title>Dynamic changes and dir=auto</title>
-  </head>
-  <body>
-    <div>Test for elements with dir="auto" whose content changes between directional and neutral</div>
-    <div dir="auto" id="from_ltr_to_ltr">abc</div>
-    <div dir="auto" id="from_ltr_to_rtl">abc</div>
-    <div dir="auto" id="from_ltr_to_neutral">abc</div>
-    <div dir="auto" id="from_rtl_to_ltr">אבג</div>
-    <div dir="auto" id="from_rtl_to_rtl">אבג</div>
-    <div dir="auto" id="from_rtl_to_neutral">אבג</div>
-    <div dir="auto" id="from_neutral_to_ltr">123</div>
-    <div dir="auto" id="from_neutral_to_rtl">123</div>
-    <div dir="auto" id="from_neutral_to_neutral">123</div>
-    <script type="text/javascript">
-function changeContent()
-{
-  var directionalTexts = {ltr:"xyz", rtl:"ابج", neutral:"456"};
-
-  for (var dirFrom in directionalTexts) {
-    for (var dirTo in directionalTexts) {
-      var element = document.getElementById("from_" + dirFrom +
-                                            "_to_" + dirTo);
-      element.textContent = directionalTexts[dirTo];
-    }
-  }
-  document.documentElement.removeAttribute("class");
-}
-
-document.addEventListener("MozReftestInvalidate", changeContent);
-    </script>
-  </body>
-</html>
diff --git a/layout/reftests/bidi/dirAuto/reftest.list b/layout/reftests/bidi/dirAuto/reftest.list
index 14ce0aa670..f47c635124 100644
--- a/layout/reftests/bidi/dirAuto/reftest.list
+++ b/layout/reftests/bidi/dirAuto/reftest.list
@@ -112,7 +112,6 @@ fuzzy-if(Android,0-3,0-2) == dynamicDirAuto-DeleteText-LTR3.html dynamicDirAuto-
 == 839886-1.html 839886-1-ref.html
 == 859093-1.html 859093-1-ref.html
 == 889742-1.html 889742-1-ref.html
-== 1103348-1.html 1103348-1-ref.html
 == 1169267-delete-add-1a.html 1169267-delete-add-1-ref.html
 == 1169267-delete-add-1b.html 1169267-delete-add-1-ref.html
 == 1169267-delete-add-2a.html 1169267-delete-add-2-ref.html
diff --git a/layout/reftests/bidi/numeral/reftest.list b/layout/reftests/bidi/numeral/reftest.list
index c32d92c866..5e0b101eba 100644
--- a/layout/reftests/bidi/numeral/reftest.list
+++ b/layout/reftests/bidi/numeral/reftest.list
@@ -34,9 +34,9 @@ pref(bidi.numeral,2) == bug441782-2.html bug441782-2-ref.html
 pref(bidi.numeral,3) == bug441782-2.html bug441782-2-ref.html
 pref(bidi.numeral,4) == bug441782-2.html bug441782-2-ref.html
 pref(bidi.numeral,0) != bug441782-3.html bug441782-3-ref.html
-fuzzy-if(winWidget&&!d2d&&d3d11,0-13,0-1) pref(bidi.numeral,1) == bug441782-3.html bug441782-3-ref.html
-fuzzy-if(winWidget&&!d2d&&d3d11,0-13,0-1) pref(bidi.numeral,2) == bug441782-3.html bug441782-3-ref.html
-fuzzy-if(winWidget&&!d2d&&d3d11,0-13,0-1) pref(bidi.numeral,3) == bug441782-3.html bug441782-3-ref.html
+pref(bidi.numeral,1) == bug441782-3.html bug441782-3-ref.html
+pref(bidi.numeral,2) == bug441782-3.html bug441782-3-ref.html
+pref(bidi.numeral,3) == bug441782-3.html bug441782-3-ref.html
 pref(bidi.numeral,4) == bug441782-3.html bug441782-3-ref.html
 pref(bidi.numeral,0) != bug441782-4.html bug441782-4-ref.html
 pref(bidi.numeral,1) == bug441782-4.html bug441782-4-ref.html
diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list
index 4916028c89..c9e77cd88a 100644
--- a/layout/reftests/bidi/reftest.list
+++ b/layout/reftests/bidi/reftest.list
@@ -18,8 +18,8 @@ fuzzy-if(Android,0-253,0-77) == bidiSVG-03.svg bidiSVG-03-ref.svg
 fuzzy(0-1,0-1) fuzzy-if(winWidget,0-1,0-2) == bidiSVG-04.svg bidiSVG-04-ref.svg
 == bidiSVG-05.svg bidiSVG-05-ref.svg
 == bidiMirroring.svg bidiMirroring-ref.svg # Bug 1392106
-fuzzy-if(Android,0-9,0-134) random-if(layersGPUAccelerated) == visualmarquee.html marquee-ref.html
-fuzzy-if(Android,0-9,0-134) random-if(layersGPUAccelerated) == logicalmarquee.html marquee-ref.html
+fuzzy-if(Android,0-9,0-134) random == visualmarquee.html marquee-ref.html
+fuzzy-if(Android,0-9,0-134) random == logicalmarquee.html marquee-ref.html
 == visualmarquee.html logicalmarquee.html
 # test for glyph mirroring in right-to-left text
 == mirroring-01.html mirroring-01-ref.html
@@ -144,7 +144,7 @@ fuzzy(0-1,0-3) == 698291-1.html 698291-1-ref.html
 == 847242-1.html 847242-1-ref.html
 
 # Skip on Android because this is a <tree> test and we don't have the requisite XUL on Android.
-skip-if(Android) fuzzy(0-92,0-350) fuzzy-if(xulRuntime.widgetToolkit=="gtk",0-1,0-11) == chrome://reftest/content/bidi/869833-1.xhtml chrome://reftest/content/bidi/869833-1-ref.xhtml
+skip-if(Android) fuzzy(0-92,0-350) fuzzy-if(gtkWidget,0-1,0-11) == chrome://reftest/content/bidi/869833-1.xhtml chrome://reftest/content/bidi/869833-1-ref.xhtml
 
 == 922530-1.html 922530-1-ref.html
 == 922550-1.html 922550-1-ref.html # Bug 1392106
diff --git a/layout/reftests/border-image/reftest.list b/layout/reftests/border-image/reftest.list
index 677d7c65ec..6938d9717c 100644
--- a/layout/reftests/border-image/reftest.list
+++ b/layout/reftests/border-image/reftest.list
@@ -36,7 +36,7 @@ fuzzy-if(useDrawSnapshot,35-35,5220-5220) == center-scaling-3.html center-scalin
 == border-image-outset-1c.html border-image-outset-1-ref.html
 == border-image-nofill-1.html border-image-nofill-1-ref.html
 == border-image-outset-resize-1.html border-image-outset-resize-1-ref.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,0-140,0-514) fuzzy-if(winWidget,0-144,0-448) == border-image-outset-move-1.html border-image-outset-move-1-ref.html
+fuzzy-if(winWidget,0-144,0-448) == border-image-outset-move-1.html border-image-outset-move-1-ref.html
 == border-image-style-none.html border-image-style-none-ref.html
 == border-image-style-none-length.html border-image-style-none-length-ref.html
 == border-image-style-none-auto.html border-image-style-none-auto-ref.html
@@ -48,12 +48,12 @@ fuzzy(1-150,1-2650) fails-if(useDrawSnapshot) == border-image-repeat-space-8z.ht
 # border images with gradients
 fuzzy-if(!useDrawSnapshot&&!geckoview,1-3,300-1804) == border-image-linear-gradient.html border-image-linear-gradient-ref.html
 fuzzy(0-1,0-350) fuzzy-if(!geckoview,1-3,179-37537) == border-image-linear-gradient-slice-1.html border-image-linear-gradient-slice-1-ref.html
-fuzzy(0-1,0-515) fuzzy-if(OSX,0-1,0-10595) fuzzy-if(!geckoview,1-3,272-25136) == border-image-linear-gradient-slice-2.html border-image-linear-gradient-slice-2-ref.html
+fuzzy(0-1,0-515) fuzzy-if(cocoaWidget,0-1,0-10595) fuzzy-if(!geckoview,1-3,272-25136) == border-image-linear-gradient-slice-2.html border-image-linear-gradient-slice-2-ref.html
 fuzzy(0-1,0-2500) fuzzy-if(!geckoview,1-3,200-86037) == border-image-linear-gradient-slice-fill-1.html border-image-linear-gradient-slice-fill-1-ref.html
-fuzzy(0-1,0-649) fuzzy-if(OSX,0-1,0-25771) fuzzy-if(!Android,0-1,0-546) fuzzy-if(Android,0-1,0-6093) fuzzy-if(!geckoview,1-3,477-57480) == border-image-linear-gradient-slice-fill-2.html border-image-linear-gradient-slice-fill-2-ref.html
-fuzzy(0-1,0-134) fuzzy-if(OSX,0-5,0-1676) fuzzy-if(!geckoview,1-1,0-4537) == border-image-linear-gradient-width.html border-image-linear-gradient-width-ref.html
-fuzzy(0-2,0-60590) fuzzy-if(Android,0-4,0-18022) fuzzy-if(OSX,0-1,0-15000) fuzzy-if(!useDrawSnapshot&&!geckoview,1-2,3900-60581) == border-image-linear-gradient-slice-width.html border-image-linear-gradient-slice-width-ref.html
-fuzzy(0-2,0-26758) fuzzy-if(OSX,0-1,0-6000) fuzzy-if(!geckoview,1-3,2400-26758) == border-image-linear-gradient-outset.html border-image-linear-gradient-outset-ref.html
+fuzzy(0-1,0-649) fuzzy-if(cocoaWidget,0-1,0-25771) fuzzy-if(!Android,0-1,0-546) fuzzy-if(Android,0-1,0-6093) fuzzy-if(!geckoview,1-3,477-57480) == border-image-linear-gradient-slice-fill-2.html border-image-linear-gradient-slice-fill-2-ref.html
+fuzzy(0-1,0-134) fuzzy-if(cocoaWidget,0-5,0-1676) fuzzy-if(!geckoview,1-1,0-4537) == border-image-linear-gradient-width.html border-image-linear-gradient-width-ref.html
+fuzzy(0-2,0-60590) fuzzy-if(Android,0-4,0-18022) fuzzy-if(cocoaWidget,0-1,0-15000) fuzzy-if(!useDrawSnapshot&&!geckoview,1-2,3900-60581) == border-image-linear-gradient-slice-width.html border-image-linear-gradient-slice-width-ref.html
+fuzzy(0-2,0-26758) fuzzy-if(cocoaWidget,0-1,0-6000) fuzzy-if(!geckoview,1-3,2400-26758) == border-image-linear-gradient-outset.html border-image-linear-gradient-outset-ref.html
 fuzzy(0-1,0-400) fuzzy-if(!geckoview,1-3,200-26872) == border-image-linear-gradient-repeat-repeat-1.html border-image-linear-gradient-repeat-repeat-1-ref.html
 fuzzy(0-1,0-300) fuzzy-if(!geckoview,1-3,200-27131) == border-image-linear-gradient-repeat-round-1.html border-image-linear-gradient-repeat-round-1-ref.html
 fuzzy-if(Android,0-1,0-1894) fuzzy-if(!useDrawSnapshot&&!geckoview,1-2,2400-67805) == border-image-linear-gradient-repeat-repeat-2.html border-image-linear-gradient-repeat-repeat-2-ref.html
@@ -71,18 +71,18 @@ fuzzy(0-3,0-66698) == border-image-radial-gradient-slice-width.html border-image
 
 # OS X failures tracked in bug 957025
 fuzzy-if(!useDrawSnapshot&&!geckoview,1-4,455-2000) == border-image-repeating-linear-gradient.html border-image-repeating-linear-gradient-ref.html
-fails-if(OSX) fuzzy(0-3,0-95449) == border-image-repeating-linear-gradient-slice-fill-2.html border-image-repeating-linear-gradient-slice-fill-2-ref.html
-fails-if(OSX) fuzzy(0-3,0-20000) fuzzy-if(!geckoview,1-4,800-14000) == border-image-repeating-linear-gradient-repeat-round-2.html border-image-repeating-linear-gradient-repeat-round-2-ref.html
+fails-if(cocoaWidget) fuzzy(0-3,0-95449) == border-image-repeating-linear-gradient-slice-fill-2.html border-image-repeating-linear-gradient-slice-fill-2-ref.html
+fails-if(cocoaWidget) fuzzy(0-3,0-20000) fuzzy-if(!geckoview,1-4,800-14000) == border-image-repeating-linear-gradient-repeat-round-2.html border-image-repeating-linear-gradient-repeat-round-2-ref.html
 
 fuzzy(0-3,0-3008) == border-image-repeating-radial-gradient.html border-image-repeating-radial-gradient-ref.html
 fuzzy(0-3,0-62078) == border-image-repeating-radial-gradient-slice-1.html border-image-repeating-radial-gradient-slice-1-ref.html
 fuzzy(0-3,0-40536) == border-image-repeating-radial-gradient-slice-2.html border-image-repeating-radial-gradient-slice-2-ref.html
 fuzzy(0-3,0-1794) fuzzy-if(!geckoview,1-3,30-12194) == border-image-repeating-radial-gradient-slice-fill-1.html border-image-repeating-radial-gradient-slice-fill-1-ref.html
-fails-if(OSX) fuzzy(0-3,0-1435) fuzzy-if(!geckoview,1-2,20-8000) == border-image-repeating-radial-gradient-slice-fill-2.html border-image-repeating-radial-gradient-slice-fill-2-ref.html
+fails-if(cocoaWidget) fuzzy(0-3,0-1435) fuzzy-if(!geckoview,1-2,20-8000) == border-image-repeating-radial-gradient-slice-fill-2.html border-image-repeating-radial-gradient-slice-fill-2-ref.html
 fuzzy(0-3,0-7441) == border-image-repeating-radial-gradient-width.html border-image-repeating-radial-gradient-width-ref.html
-fails-if(OSX) fuzzy(0-8,0-99728) == border-image-repeating-radial-gradient-slice-width.html border-image-repeating-radial-gradient-slice-width-ref.html
+fails-if(cocoaWidget) fuzzy(0-8,0-99728) == border-image-repeating-radial-gradient-slice-width.html border-image-repeating-radial-gradient-slice-width-ref.html
 fuzzy(0-3,0-117768) == border-image-repeating-radial-gradient-repeat-repeat-2.html border-image-repeating-radial-gradient-repeat-repeat-2-ref.html
-fails-if(OSX) fuzzy(0-3,0-116185) == border-image-repeating-radial-gradient-repeat-round-2.html border-image-repeating-radial-gradient-repeat-round-2-ref.html
+fails-if(cocoaWidget) fuzzy(0-3,0-116185) == border-image-repeating-radial-gradient-repeat-round-2.html border-image-repeating-radial-gradient-repeat-round-2-ref.html
 
 # border-image-source (-moz-)element
 fuzzy(0-125,0-5903) == border-image-element.html border-image-element-ref.html
diff --git a/layout/reftests/border-radius/reftest.list b/layout/reftests/border-radius/reftest.list
index b548c11b33..831d8f05db 100644
--- a/layout/reftests/border-radius/reftest.list
+++ b/layout/reftests/border-radius/reftest.list
@@ -47,14 +47,14 @@ skip-if(Android&&emulator) fuzzy(0-8,0-20) fuzzy-if(useDrawSnapshot,1-1,172-172)
 fuzzy(0-1,0-172) == clipping-4-image.html clipping-4-ref.html
 fuzzy(0-1,0-77) == clipping-4-overflow-hidden.html clipping-4-ref.html
 skip-if(Android&&emulator) == clipping-5-canvas.html clipping-5-refc.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-5) == clipping-5-image.html clipping-5-refi.html
+fuzzy-if(winWidget,0-1,0-5) == clipping-5-image.html clipping-5-refi.html
 fuzzy(0-1,0-77) == clipping-5-overflow-hidden.html clipping-5-ref.html
 fuzzy(0-1,0-97) == clipping-5-refi.html clipping-5-ref.html
 skip-if(Android&&emulator) fuzzy(0-1,0-77) fuzzy-if(useDrawSnapshot,1-1,97-97) == clipping-5-refc.html clipping-5-ref.html # bug 732535
 fuzzy(0-21,0-76) fuzzy-if(winWidget,0-144,0-335) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical
 fuzzy(0-28,0-97) == clipping-7.html clipping-7-ref.html # ColorLayer and MaskLayer with transforms that aren't identical. Reference image rendered without using layers (which causes fuzzy failures).
 == clipping-and-zindex-1.html clipping-and-zindex-1-ref.html
-skip-if(Android&&emulator) fuzzy-if(cocoaWidget,0-1,0-4) fuzzy-if(d2d,0-59,0-342) == intersecting-clipping-1-canvas.html intersecting-clipping-1-refc.html
+skip-if(Android&&emulator) fuzzy-if(cocoaWidget,0-1,0-4) fuzzy-if(winWidget,0-59,0-342) == intersecting-clipping-1-canvas.html intersecting-clipping-1-refc.html
 == intersecting-clipping-1-image.html intersecting-clipping-1-refi.html
 == intersecting-clipping-1-overflow-hidden.html intersecting-clipping-1-ref.html
 fuzzy(0-1,0-300) == intersecting-clipping-1-refi.html intersecting-clipping-1-ref.html
@@ -73,7 +73,7 @@ fuzzy(0-1,0-116) == invalidate-1a.html invalidate-1-ref.html
 fuzzy(0-1,0-117) == invalidate-1b.html invalidate-1-ref.html
 
 # test that border-radius is reduced for scrollbars
-fails-if(Android) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-12,0-12) fuzzy-if(!Android,0-1,0-50) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-12,0-12) == scrollbar-clamping-1.html scrollbar-clamping-1-ref.html
+fails-if(Android) fuzzy-if(!Android,0-1,0-50) fuzzy-if(gtkWidget,0-12,0-12) == scrollbar-clamping-1.html scrollbar-clamping-1-ref.html
 fails-if(Android) == scrollbar-clamping-2.html scrollbar-clamping-2-ref.html
 
 # Test for bad corner joins.
@@ -82,7 +82,7 @@ random-if(winWidget) fuzzy(0-255,0-610) == corner-joins-2.xhtml corner-joins-2-r
 
 fuzzy(0-59,0-146) == scroll-1.html scroll-1-ref.html # see bug 732535 #Bug 959166
 
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-35,0-194) fuzzy-if(swgl,0-1,0-2) == transforms-1.html transforms-1-ref.html # bug 1507152
+fuzzy-if(winWidget,0-35,0-194) fuzzy-if(swgl,0-1,0-2) == transforms-1.html transforms-1-ref.html # bug 1507152
 
 == zero-radius-clip-1.html zero-radius-clip-ref.html
 
diff --git a/layout/reftests/box-shadow/reftest.list b/layout/reftests/box-shadow/reftest.list
index ed6baf7946..f8f302b1cc 100644
--- a/layout/reftests/box-shadow/reftest.list
+++ b/layout/reftests/box-shadow/reftest.list
@@ -15,21 +15,21 @@ fuzzy(0-14,0-179) fuzzy-if(swgl&&!Android,0-1,0-952) fuzzy-if(useDrawSnapshot&&s
 
 == boxshadow-fileupload.html boxshadow-fileupload-ref.html
 fuzzy(13-19,28-51) == boxshadow-inner-basic.html boxshadow-inner-basic-ref.svg
-fuzzy(0-1,0-18) random-if(layersGPUAccelerated) == boxshadow-mixed.html boxshadow-mixed-ref.html
+fuzzy(0-1,0-18) random == boxshadow-mixed.html boxshadow-mixed-ref.html
 fuzzy(0-1,0-17) == boxshadow-mixed-2.html boxshadow-mixed-2-ref.html
-random-if(d2d) fuzzy(0-127,0-3528) == boxshadow-rounded-spread.html boxshadow-rounded-spread-ref.html
+random-if(winWidget) fuzzy(0-127,0-3528) == boxshadow-rounded-spread.html boxshadow-rounded-spread-ref.html
 fuzzy(0-1,0-50) == chrome://reftest/content/box-shadow/boxshadow-dynamic.xhtml chrome://reftest/content/box-shadow/boxshadow-dynamic-ref.xhtml
-random-if(d2d) fuzzy(0-1,0-14) == boxshadow-onecorner.html boxshadow-onecorner-ref.html
-random-if(d2d) fuzzy(0-1,0-22) == boxshadow-twocorners.html boxshadow-twocorners-ref.html
-random-if(d2d) fuzzy(0-1,0-36) == boxshadow-threecorners.html boxshadow-threecorners-ref.html
+random-if(winWidget) fuzzy(0-1,0-14) == boxshadow-onecorner.html boxshadow-onecorner-ref.html
+random-if(winWidget) fuzzy(0-1,0-22) == boxshadow-twocorners.html boxshadow-twocorners-ref.html
+random-if(winWidget) fuzzy(0-1,0-36) == boxshadow-threecorners.html boxshadow-threecorners-ref.html
 fuzzy(0-2,0-440) == boxshadow-skiprect.html boxshadow-skiprect-ref.html
 fuzzy-if(useDrawSnapshot,1-1,1197-2400) == boxshadow-opacity.html boxshadow-opacity-ref.html
 == boxshadow-color-rounding.html boxshadow-color-rounding-ref.html
 == boxshadow-color-rounding-middle.html boxshadow-color-rounding-middle-ref.html
-fuzzy(0-3,0-500) fuzzy-if(d2d,0-2,0-1080) == boxshadow-border-radius-int.html boxshadow-border-radius-int-ref.html
+fuzzy(0-3,0-500) fuzzy-if(winWidget,0-2,0-1080) == boxshadow-border-radius-int.html boxshadow-border-radius-int-ref.html
 == boxshadow-inset-neg-spread.html about:blank
 == boxshadow-inset-neg-spread2.html boxshadow-inset-neg-spread2-ref.html
-fuzzy(0-26,0-3610) fuzzy-if(d2d,0-26,0-5910) fuzzy-if(!(swgl&&Android),0-6,378-4500) == boxshadow-rotated.html boxshadow-rotated-ref.html # Bug 1211264
+fuzzy(0-26,0-3610) fuzzy-if(winWidget,0-26,0-5910) fuzzy-if(!(swgl&&Android),0-6,378-4500) == boxshadow-rotated.html boxshadow-rotated-ref.html # Bug 1211264
 == boxshadow-inset-large-border-radius.html boxshadow-inset-large-border-radius-ref.html
 
 # fuzzy due to blur going inside, but as long as it's essentially black instead of a light gray its ok.
@@ -39,7 +39,7 @@ fuzzy(12-15,9400-13267) == boxshadow-inset-large-offset.html boxshadow-inset-lar
 == overflow-not-scrollable-1.html overflow-not-scrollable-1-ref2.html
 == overflow-not-scrollable-2.html overflow-not-scrollable-2-ref.html
 fuzzy(0-1,0-655) == 611574-1.html 611574-1-ref.html
-fuzzy(0-4,0-144) fuzzy-if(d2d,0-1,0-36) == 611574-2.html 611574-2-ref.html
+fuzzy(0-4,0-144) fuzzy-if(winWidget,0-1,0-36) == 611574-2.html 611574-2-ref.html
 fuzzy(0-16,0-10) == fieldset.html fieldset-ref.html # minor anti-aliasing problem on Windows
 fuzzy(0-16,0-10) == fieldset-inset.html fieldset-inset-ref.html # minor anti-aliasing problem on Windows
 == 1178575.html 1178575-ref.html
diff --git a/layout/reftests/bugs/1553571-1.html b/layout/reftests/bugs/1553571-1.html
index abb2c6ae5b..ee9e4782ab 100644
--- a/layout/reftests/bugs/1553571-1.html
+++ b/layout/reftests/bugs/1553571-1.html
@@ -2,6 +2,8 @@
 <html class='reftest-wait'>
 <head>
 <script>
+let num = 0;
+let numMs = 50;
 var changesLeft = 10;
 function go() {
 	window.setTimeout(changeit, 0);
@@ -11,16 +13,26 @@ function changeit() {
 	var a = document.getElementById("a");
 	a.style.transform = 'scale(' + (256.1 + Math.random()*0.01) + ')';
 
+	num++;
+
 	if (changesLeft > 0) {
 		--changesLeft;
-		window.setTimeout(changeit, 50);
+		window.setTimeout(changeit, numMs);
 	}
 	if (changesLeft == 0) {
 		// 75-100ms is the timeout for expirty from the active layer tracker.
 		// Increase the time between transform tweaks to 74ms to give the reftest the best
 		// chance of running the mozafterpaint handler and checking that there are no more
 		// paints pending so it can finish.
-		window.setTimeout(changeit, 74);
+		numMs = 74;
+		if (num >= 100 && navigator.appVersion.includes("Android")) {
+			// That's not enough time on Android, so give it a bit more time. This still
+			// reproduces the original bug with the original patch backed out, even though
+			// one would think anything over 100ms would not reproduce, I'm not sure why.
+			// It's better to run the this with this timeout then have the test disabled.
+			numMs = 200;
+		}
+		window.setTimeout(changeit, numMs);
 		document.documentElement.classList.remove("reftest-wait");
 	}
 }
diff --git a/layout/reftests/bugs/1553571-2.html b/layout/reftests/bugs/1553571-2.html
index 0b844745c0..ab064ca391 100644
--- a/layout/reftests/bugs/1553571-2.html
+++ b/layout/reftests/bugs/1553571-2.html
@@ -2,6 +2,8 @@
 <html class='reftest-wait'>
 <head>
 <script>
+let num = 0;
+let numMs = 50;
 var changesLeft = 10;
 function go() {
 	window.setTimeout(changeit, 0);
@@ -11,16 +13,26 @@ function changeit() {
 	var a = document.getElementById("a");
 	a.style.transform = 'scale(' + (256.1 + Math.random()*0.01) + ') rotate(1deg)';
 
+	num++;
+
 	if (changesLeft > 0) {
 		--changesLeft;
-		window.setTimeout(changeit, 50);
+		window.setTimeout(changeit, numMs);
 	}
 	if (changesLeft == 0) {
 		// 75-100ms is the timeout for expirty from the active layer tracker.
 		// Increase the time between transform tweaks to 74ms to give the reftest the best
 		// chance of running the mozafterpaint handler and checking that there are no more
 		// paints pending so it can finish.
-		window.setTimeout(changeit, 74);
+		numMs = 74;
+		if (num >= 100 && navigator.appVersion.includes("Android")) {
+			// That's not enough time on Android, so give it a bit more time. This still
+			// reproduces the original bug with the original patch backed out, even though
+			// one would think anything over 100ms would not reproduce, I'm not sure why.
+			// It's better to run the this with this timeout then have the test disabled.
+			numMs = 200;
+		}
+		window.setTimeout(changeit, numMs);
 		document.documentElement.classList.remove("reftest-wait");
 	}
 }
diff --git a/layout/reftests/bugs/1878294-1-ref.html b/layout/reftests/bugs/1878294-1-ref.html
new file mode 100644
index 0000000000..11a6029794
--- /dev/null
+++ b/layout/reftests/bugs/1878294-1-ref.html
@@ -0,0 +1,8 @@
+<html>
+<svg width="400" height="400">
+  <g id="g">
+    <circle cx="300" cy="300" r="40" style="fill: red;" transform="translate(-108213.2,-108213.2) scale(399)"></circle>
+  </g>
+</svg>
+
+</html>
diff --git a/layout/reftests/bugs/1878294-1.html b/layout/reftests/bugs/1878294-1.html
new file mode 100644
index 0000000000..ee91c38290
--- /dev/null
+++ b/layout/reftests/bugs/1878294-1.html
@@ -0,0 +1,41 @@
+<html class="reftest-wait">
+<svg width="400" height="400">
+  <g id="g">
+    <circle cx="300" cy="300" r="40" style="fill: red;"></circle>
+  </g>
+</svg>
+
+<script>
+const g = document.getElementById("g")
+
+let tx = -108213.2;
+let ty = -108213.2;
+let k = 399;
+
+let stepSize = 1;
+
+let num = 0;
+let numMs = 100;
+
+const move = () => {
+  stepSize = -1 * stepSize;
+  tx += 0.0001 * stepSize;
+  ty += 0.0001 * stepSize;
+  g.setAttribute("transform", `translate(${tx},${ty}) scale(${k})`)
+  window.setTimeout(move, numMs);
+  num++;
+  if (num == 5) {
+  	document.documentElement.className = "";
+  }
+  if (num == 100 && navigator.appVersion.includes("Android")) {
+    // Android doesn't get a chance to paint and finish the reftest if another
+    // paint gets queued if we tweak the transfer, so if its taking a long time
+    // increase the timeout, this timeout value still reproduced the bug when
+    // test was landed.
+    numMs = 200;
+  }
+}
+
+move();
+</script>
+</html>
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 902e7e63f0..d85d5e7310 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -67,9 +67,9 @@ skip-if(isDebugBuild) == 256180-5.html 256180-5-ref.html
 == 25888-2r-block.html 25888-2r-ref.html
 == 25888-3l-block.html 25888-3l-ref.html
 == 25888-3r-block.html 25888-3r-ref.html
-fuzzy-if(winWidget||gtkWidget,0-1,0-4) == 28811-1a.html 28811-1-ref.html
+fuzzy-if(gtkWidget||winWidget,0-1,0-4) == 28811-1a.html 28811-1-ref.html
 fuzzy-if(gtkWidget,0-6,0-26200) == 28811-1b.html 28811-1-ref.html  # Bug 1128229
-fuzzy-if(winWidget||gtkWidget,0-1,0-4) == 28811-2a.html 28811-2-ref.html
+fuzzy-if(gtkWidget||winWidget,0-1,0-4) == 28811-2a.html 28811-2-ref.html
 fuzzy-if(gtkWidget,0-6,0-26200) == 28811-2b.html 28811-2-ref.html  # Bug 1128229
 == 40596-1a.html 40596-1-ref.html
 != 40596-1b.html 40596-1-ref.html
@@ -185,18 +185,18 @@ test-pref(font.minimum-size.x-western,32) == 1503662.html 1503662-ref.html
 == chrome://reftest/content/bugs/192767-27.xhtml chrome://reftest/content/bugs/192767-37.xhtml
 != chrome://reftest/content/bugs/192767-01.xhtml chrome://reftest/content/bugs/192767-21.xhtml
 != chrome://reftest/content/bugs/192767-02.xhtml chrome://reftest/content/bugs/192767-22.xhtml
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-03.xhtml chrome://reftest/content/bugs/192767-23.xhtml
+!= chrome://reftest/content/bugs/192767-03.xhtml chrome://reftest/content/bugs/192767-23.xhtml
 != chrome://reftest/content/bugs/192767-04.xhtml chrome://reftest/content/bugs/192767-24.xhtml
 != chrome://reftest/content/bugs/192767-05.xhtml chrome://reftest/content/bugs/192767-25.xhtml
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-06.xhtml chrome://reftest/content/bugs/192767-26.xhtml
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-07.xhtml chrome://reftest/content/bugs/192767-27.xhtml
+!= chrome://reftest/content/bugs/192767-06.xhtml chrome://reftest/content/bugs/192767-26.xhtml
+!= chrome://reftest/content/bugs/192767-07.xhtml chrome://reftest/content/bugs/192767-27.xhtml
 != chrome://reftest/content/bugs/192767-11.xhtml chrome://reftest/content/bugs/192767-31.xhtml
 != chrome://reftest/content/bugs/192767-12.xhtml chrome://reftest/content/bugs/192767-32.xhtml
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-13.xhtml chrome://reftest/content/bugs/192767-33.xhtml
+!= chrome://reftest/content/bugs/192767-13.xhtml chrome://reftest/content/bugs/192767-33.xhtml
 != chrome://reftest/content/bugs/192767-14.xhtml chrome://reftest/content/bugs/192767-34.xhtml
 != chrome://reftest/content/bugs/192767-15.xhtml chrome://reftest/content/bugs/192767-35.xhtml
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-16.xhtml chrome://reftest/content/bugs/192767-36.xhtml
-fails-if(Android&&!asyncPan) != chrome://reftest/content/bugs/192767-17.xhtml chrome://reftest/content/bugs/192767-37.xhtml
+!= chrome://reftest/content/bugs/192767-16.xhtml chrome://reftest/content/bugs/192767-36.xhtml
+!= chrome://reftest/content/bugs/192767-17.xhtml chrome://reftest/content/bugs/192767-37.xhtml
 != 200774-1.html about:blank
 == 201215-1.html 201215-1-ref.html
 == 201293-1a.html 201293-1-ref.html
@@ -258,7 +258,7 @@ fuzzy(0-4,0-2) == 236539-1.html 236539-1-ref.html
 skip-if(Android) == 240933-2.html 240933-2-ref.html
 == 243266-1.html 243266-1-ref.html
 == 243302-1.html 243302-1-ref.html
-skip-if(Android&&asyncPan) == 243519-1.html 243519-1-ref.html
+skip-if(Android) == 243519-1.html 243519-1-ref.html
 == 243519-2.html 243519-2-ref.html
 == 243519-3.html 243519-3-ref.html
 == 243519-4a.html 243519-4-ref.html
@@ -315,7 +315,7 @@ fuzzy(0-1,0-133) == 273681-1.html 273681-1-ref.html
 == 283686-2.html 283686-2-ref.html
 == 283686-3.html about:blank
 == 289384-1.xhtml 289384-ref.xhtml
-random-if(d2d) fuzzy(0-25,0-2148) fails-if(useDrawSnapshot) HTTP == 289480.html#top 289480-ref.html # basically-verbatim acid2 test, HTTP for a 404 page -- bug 578114 for the d2d failures
+random-if(winWidget) fuzzy(0-25,0-2148) fails-if(useDrawSnapshot) HTTP == 289480.html#top 289480-ref.html # basically-verbatim acid2 test, HTTP for a 404 page -- bug 578114 for the winWidget failures
 == 290129-1.html 290129-1-ref.html
 == 291078-1.html 291078-1-ref.html
 == 291078-2.html 291078-2-ref.html
@@ -326,7 +326,7 @@ random-if(d2d) fuzzy(0-25,0-2148) fails-if(useDrawSnapshot) HTTP == 289480.html#
 == 296904-1.html 296904-1-ref.html
 == 299136-1.html 299136-1-ref.html
 == 299837-1.html 299837-1-ref.html
-skip-if(Android) random-if(d2d) == chrome://reftest/content/bugs/299837-3.xhtml chrome://reftest/content/bugs/299837-3-ref.xhtml # bug 587631
+skip-if(Android) random-if(winWidget) == chrome://reftest/content/bugs/299837-3.xhtml chrome://reftest/content/bugs/299837-3-ref.xhtml # bug 587631
 == 300691-1a.html 300691-1-ref.html
 == 300691-1b.html 300691-1-ref.html
 == 300691-1c.html 300691-1-ref.html
@@ -554,9 +554,9 @@ fuzzy(0-4,0-11) == 363858-1.html 363858-1-ref.html
 == 363858-2.html 363858-2-ref.html
 fuzzy(0-1,0-4) == 363858-3.html 363858-3-ref.html
 == 363858-4.html 363858-4-ref.html
-# fuzzy-if(OSX,0-45,0-2) fuzzy-if(winWidget,0-116,0-1) == 363858-5a.html 363858-5-ref.html # bug 1452797
+# fuzzy-if(cocoaWidget,0-45,0-2) fuzzy-if(winWidget,0-116,0-1) == 363858-5a.html 363858-5-ref.html # bug 1452797
 fuzzy-if(Android,0-1,0-4) == 363858-5b.html 363858-5-ref.html
-# fuzzy-if(OSX,0-45,0-2) fuzzy-if(winWidget,0-116,0-1) == 363858-6a.html 363858-6-ref.html # bug 1452797
+# fuzzy-if(cocoaWidget,0-45,0-2) fuzzy-if(winWidget,0-116,0-1) == 363858-6a.html 363858-6-ref.html # bug 1452797
 == 363858-6b.html 363858-6-ref.html
 == 363874.html 363874-ref.html
 == 363874-max-width.html 363874-max-width-ref.html
@@ -574,7 +574,7 @@ fuzzy-if(Android,0-1,0-4) == 363858-5b.html 363858-5-ref.html
 == 367247-s-hidden.html 367247-s-auto.html
 fails-if(Android) != 367247-s-auto.html 367247-s-scroll.html
 != 367247-l-visible.html 367247-l-hidden.html
-fails-if(Android&&!asyncPan) != 367247-l-hidden.html 367247-l-scroll.html
+!= 367247-l-hidden.html 367247-l-scroll.html
 == 367247-l-scroll.html 367247-l-auto.html
 == 367332-1a.html 367332-1-ref.html
 == 367332-1b.html 367332-1-ref.html
@@ -595,7 +595,7 @@ fails-if(Android&&!asyncPan) != 367247-l-hidden.html 367247-l-scroll.html
 == 367612-1e.html 367612-1-ref.html
 == 367612-1f.html 367612-1-ref.html
 != 367612-1g.html 367612-1-ref.html
-fuzzy(0-32,0-33) fuzzy-if(d2d,0-5,0-2) == 368020-1.html 368020-1-ref.html
+fuzzy(0-32,0-33) fuzzy-if(winWidget,0-5,0-2) == 368020-1.html 368020-1-ref.html
 == 368020-2.html 368020-2-ref.html
 random-if(useDrawSnapshot) == 368020-3.html 368020-3-ref.html # Bug 1715408
 random-if(useDrawSnapshot) == 368020-5.html 368020-5-ref.html # Bug 1715408
@@ -638,7 +638,7 @@ fuzzy(0-1,0-4) == 370422-1.html 370422-1-ref.html
 == 371043-1.html 371043-1-ref.html
 == 371354-1.html 371354-1-ref.html
 == 371483-1.html about:blank # assertion test
-fails-if(Android&&!asyncPan) == 371561-1.html 371561-1-ref.html
+== 371561-1.html 371561-1-ref.html
 != 371681-1.xhtml about:blank
 == 371925-1a.html 371925-1-ref.html
 == 371925-1b.html 371925-1-ref.html
@@ -652,7 +652,7 @@ fuzzy-if(winWidget,46-92,1-2) == 373295-1.html 373295-1-ref.html
 == 373298-1.html 373298-1-ref.html
 == 373381-1.html 373381-1-ref.html
 fuzzy-if(!Android,0-2,0-40) == 373381-2.html 373381-2-ref.html
-random-if(d2d) == 373381-3.html 373381-3-ref.html
+random-if(winWidget) == 373381-3.html 373381-3-ref.html
 == 373381-4.html 373381-4-ref.html
 == 373383-1.html 373383-1-ref.html
 == 373433-1.html 373433-1-ref.html
@@ -693,7 +693,7 @@ fuzzy-if(Android,0-2,0-140) == 379349-3b.xhtml 379349-3-ref.xhtml
 == 379461-1.xhtml 379461-1.html
 == 379461-2.xhtml 379461-2.html
 == 379461-3-container-xhtml.html 379461-3-container-html.html
-fails-if(Android&&!asyncPan) != 379461-3-container-xhtml.html 379461-3-container-blank.html # there is a scrollbar
+!= 379461-3-container-xhtml.html 379461-3-container-blank.html # there is a scrollbar
 fuzzy(0-1,0-5) == 380004-1.html 380004-1-ref.html
 fuzzy(0-2,0-5) == 380227-1.html 380227-1-ref.html
 == 380825-1.html 380825-1-ref.html
@@ -990,7 +990,7 @@ fuzzy(0-92,0-430) == chrome://reftest/content/bugs/421203-2.xhtml 421203-1-ref.h
 == 421436-1b.html 421436-1-ref.html
 fuzzy(0-1,0-40) == 421632-1.html 421632-1-ref.html
 != 421710-1.html about:blank
-fails-if(Android) fuzzy(63-65,1024-1024) fails-if(usesRepeatResampling&&!winWidget) == 421885-1.xml 421885-1-ref.xml
+fails-if(Android) fuzzy(63-65,1024-1024) == 421885-1.xml 421885-1-ref.xml
 == 421955-1.html 421955-1-ref.html
 == 422249-1.html 422249-1-ref.html
 == 422394-1.html 422394-1-ref.html
@@ -1140,13 +1140,13 @@ random == 445004-1.html 445004-1-ref.html # bug 472268
 == 445142-1c.html 445142-1-ref.html
 == 445142-2a.html 445142-2-ref.html
 == 445142-2b.html 445142-2-ref.html
-skip-if(winWidget&&isCoverageBuild) fails-if(usesRepeatResampling) fails-if(!winWidget) == 446100-1a.html about:blank
-fuzzy-if(winWidget,177-178,127-127) fails-if(usesRepeatResampling) fails-if(!winWidget) == 446100-1b.html about:blank
+skip-if(winWidget&&isCoverageBuild) fails == 446100-1a.html about:blank
+fuzzy-if(winWidget,177-178,127-127) fails == 446100-1b.html about:blank
 fuzzy-if(winWidget,171-172,192-192) fails-if(!winWidget) == 446100-1c.html about:blank
-fails-if(usesRepeatResampling) fails-if(!winWidget) == 446100-1d.html about:blank
-fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&!winWidget) == 446100-1e.html about:blank
+fails == 446100-1d.html about:blank
+fails-if(!useDrawSnapshot) == 446100-1e.html about:blank
 == 446100-1f.html about:blank
-fails-if(winWidget&&isCoverageBuild) fails-if(usesRepeatResampling) fails-if(Android) fails-if(!useDrawSnapshot&&!winWidget) == 446100-1g.html about:blank
+fails-if(!useDrawSnapshot) == 446100-1g.html about:blank
 == 446100-1h.html about:blank
 == 447749-1.html 447749-1-ref.html
 fuzzy(0-127,0-2) == 448193.html 448193-ref.html
@@ -1253,7 +1253,7 @@ fuzzy(0-1,0-5) == 474472-1.html 474472-1-ref.html
 == 476598-1b.html 476598-1-ref2.html
 != 476598-1-ref.html about:blank
 == 476856-1.html 476856-1-ref.html
-skip-if(Android) random-if(d2d) == chrome://reftest/content/bugs/478377-1.xhtml chrome://reftest/content/bugs/478377-1-ref.xhtml
+skip-if(Android) random-if(winWidget) == chrome://reftest/content/bugs/478377-1.xhtml chrome://reftest/content/bugs/478377-1-ref.xhtml
 == 478614-1.html 478614-1-ref.html
 == 478614-2.html 478614-1-ref.html
 == 478614-3.html 478614-3-ref.html
@@ -1282,8 +1282,8 @@ skip-if(Android) random-if(d2d) == chrome://reftest/content/bugs/478377-1.xhtml
 != 481948-2.html 481948-2-ref.html
 fails-if(Android||gtkWidget) random-if(winWidget||cocoaWidget) == 481948-3.html 481948-3-ref.html # questionable test, see bug 488364
 == 482398-1.html 482398-1-ref.html
-random-if(d2d) == 482592-1a-shadow.xhtml 482592-1-ref.html # bug 586771
-random-if(d2d) == 482592-1b-shadow.xhtml 482592-1-ref.html # bug 586771
+random-if(winWidget) == 482592-1a-shadow.xhtml 482592-1-ref.html # bug 586771
+random-if(winWidget) == 482592-1b-shadow.xhtml 482592-1-ref.html # bug 586771
 random-if(winWidget) fuzzy(0-1,0-5) == 482659-1a.html 482659-1-ref.html
 fuzzy(0-1,0-5) == 482659-1b.html 482659-1-ref.html
 fuzzy(0-1,0-5) == 482659-1c.html 482659-1-ref.html
@@ -1373,7 +1373,7 @@ fuzzy(0-1,0-4) == 513153-1b.html 513153-1-ref.html
 pref(widget.non-native-theme.webrender,true) == 513153-2a.html 513153-2-ref.html # appleSilicon: bug 1724583
 fuzzy-if(cocoaWidget,0-112,0-108) == 513153-2b.html 513153-2-ref.html # only fuzzy when widget.non-native-theme.webrender=false, snapping difference
 == chrome://reftest/content/bugs/513318-1.xhtml chrome://reftest/content/bugs/513318-1-ref.xhtml
-fails-if(Android&&(!asyncPan)) != chrome://reftest/content/bugs/513318-2.xhtml chrome://reftest/content/bugs/513318-2-ref.xhtml
+!= chrome://reftest/content/bugs/513318-2.xhtml chrome://reftest/content/bugs/513318-2-ref.xhtml
 == 514917-1.html 514917-1-ref.html
 == 518172-1a.html 518172-a-ref.html
 fuzzy-if(winWidget,0-73,0-133) fuzzy-if(cocoaWidget,0-103,0-133) == 518172-1b.html 518172-b-ref.html
@@ -1389,7 +1389,7 @@ fuzzy(0-1,0-3) == 521525-1.html 521525-1-ref.html
 == 521685-1.html 521685-1-ref.html
 == 522632-1.html 522632-1-ref.html
 == 523096-1.html 523096-1-ref.html
-random-if(d2d) == 523468-1.html 523468-1-ref.html
+random-if(winWidget) == 523468-1.html 523468-1-ref.html
 == 524175-1.html 524175-1-ref.html
 fuzzy(0-5,0-50) == 526463-1.html 526463-1-ref.html
 == 527464-1.html 527464-ref.html
@@ -1445,7 +1445,7 @@ fuzzy-if(Android,0-12,0-300) == 551463-1.html 551463-1-ref.html
 # Marked "random" rather than "fails" because it may (spuriously) appear to pass
 # on Android devices that completely lack any Sinhala font support.
 random != 553571-1.html 553571-1-notref.html # expect dotted circle in test, not in ref: "fails" under harfbuzz, which doesn't consider the sequence invalid
-random-if(d2d) skip-if(azureSkiaGL) fuzzy(0-32,0-219) == 555388-1.html 555388-1-ref.html
+random-if(winWidget) fuzzy(0-32,0-219) == 555388-1.html 555388-1-ref.html
 == 556661-1.html 556661-1-ref.html
 fuzzy(0-4,0-9) == 557087-1.html 557087-ref.html
 fuzzy(0-2,0-5) fuzzy-if(Android,0-1,0-9) == 557087-2.html 557087-ref.html
@@ -1461,7 +1461,7 @@ fuzzy(0-1,0-5) == 561981-5.html 561981-5-ref.html
 fuzzy(0-1,0-5) == 561981-7.html 561981-7-ref.html
 == 561981-8.html 561981-8-ref.html
 == 562835-1.html 562835-ref.html
-== 562835-2.html 562835-ref.html
+pref(layout.css.h1-in-section-ua-styles.enabled,true) == 562835-2.html 562835-ref.html
 fuzzy-if(Android,0-2,0-48) == 563584-1.html 563584-1-ref.html
 fuzzy-if(Android,0-2,0-48) == 563584-2.html 563584-2-ref.html
 fuzzy-if(Android,0-4,0-180) == 563584-3.html 563584-3-ref.html
@@ -1487,7 +1487,7 @@ fuzzy-if(Android,0-2,0-48) == 563584-11.html 563584-11-ref.html
 == 563884-1.html 563884-1-ref.html
 == 564002-1.html 564002-1-ref.html
 == 564054-1.html 564054-1-ref.html
-fails-if(Android) random-if(layersGPUAccelerated) fuzzy(0-1,0-1200) == 564991-1.html 564991-1-ref.html
+fails-if(Android) random fuzzy(0-1,0-1200) == 564991-1.html 564991-1-ref.html
 == 565819-1.html 565819-ref.html
 == 565819-2.html 565819-ref.html
 fuzzy-if(Android,0-1,0-1) needs-focus == 568441.html 568441-ref.html
@@ -1513,9 +1513,9 @@ random-if(!winWidget) != 574907-3.html 574907-3-notref.html
 == chrome://reftest/content/bugs/579323-1.html chrome://reftest/content/bugs/579323-1-ref.html
 == 579349-1.html 579349-1-ref.html
 == 579655-1.html 579655-1-ref.html
-fails-if(Android) random-if(layersGPUAccelerated) fuzzy(0-1,0-10000) == 579985-1.html 579985-1-ref.html # this bug was only for a regression in BasicLayers anyway
-fuzzy-if(asyncPan&&!layersGPUAccelerated,0-255,0-141) == 580863-1.html 580863-1-ref.html
-fails-if(Android) random-if(layersGPUAccelerated) fuzzy(0-1,0-6436) == 581317-1.html 581317-1-ref.html
+fails-if(Android) random fuzzy(0-1,0-10000) == 579985-1.html 579985-1-ref.html # this bug was only for a regression in BasicLayers anyway
+== 580863-1.html 580863-1-ref.html
+fails-if(Android) random fuzzy(0-1,0-6436) == 581317-1.html 581317-1-ref.html
 == 581579-1.html 581579-1-ref.html
 == 582037-1a.html 582037-1-ref.html
 == 582037-1b.html 582037-1-ref.html
@@ -1527,7 +1527,7 @@ asserts(1-2) == 582146-1.html about:blank
 == 584699-1.html 584699-1-ref.html
 fuzzy(0-2,0-48) fuzzy-if(winWidget,0-1,0-33) == 585598-2.xhtml 585598-2-ref.xhtml
 == 586400-1.html 586400-1-ref.html
-fuzzy-if(d2d,0-52,0-1051) == 586683-1.html 586683-1-ref.html
+fuzzy-if(winWidget,0-52,0-1051) == 586683-1.html 586683-1-ref.html
 == 589615-1a.xhtml 589615-1-ref.html
 == 589615-1b.html 589615-1-ref.html
 == 589672-1.html 589672-1-ref.html
@@ -1590,19 +1590,19 @@ fails-if(useDrawSnapshot) == 621253-2-externalFilter.html 621253-2-ref.html
 fails-if(useDrawSnapshot) == 621253-2-internalFilter.html 621253-2-ref.html
 random-if(winWidget) == 621918-1.svg 621918-1-ref.svg # 1-pixel diacritic positioning discrepancy in rotated text (may depend on platform fonts)
 random-if(winWidget) fuzzy-if(geckoview&&!emulator,0-255,0-22) == 621918-2.svg 621918-2-ref.svg # same 1px issue as above
-fuzzy-if(d2d,0-5,0-1) == 622585-1.html 622585-1-ref.html # bug 789402
+fuzzy-if(winWidget,0-5,0-1) == 622585-1.html 622585-1-ref.html # bug 789402
 fuzzy(0-1,0-40000) == 625409-1.html 625409-1-ref.html
 == 627393-1.html about:blank
 fuzzy(0-1,0-500) == 630835-1.html about:blank
 == 631352-1.html 631352-1-ref.html
 random-if(winWidget) == 632781-verybig.html 632781-ref.html
 == 632781-normalsize.html 632781-ref.html
-fuzzy-if(!isDebugBuild&&gtkWidget&&/^Linux\x20i686/.test(http.oscpu),0-102,0-140) == 633344-1.html 633344-1-ref.html # bug 1103623, Linux32 from GCC update
+== 633344-1.html 633344-1-ref.html # bug 1103623, Linux32 from GCC update
 fuzzy(0-1,0-500) == 634232-1.html 634232-1-ref.html
 skip-if(Android&&emulator) fuzzy(0-3,0-120000) == 635302-1.html 635302-1-ref.html
 fuzzy(0-1,0-68) fuzzy-if(gtkWidget,0-1,0-70) fuzzy-if(!Android,0-2,0-300) == 635373-1.html 635373-1-ref.html
-random-if(d2d) fuzzy-if(winWidget&&!d2d,0-20,0-118) fuzzy-if(!Android,0-2,0-550) == 635373-2.html 635373-2-ref.html
-random-if(d2d) fuzzy-if(winWidget&&!d2d,0-20,0-116) fuzzy-if(!Android,0-2,0-650) == 635373-3.html 635373-3-ref.html
+random-if(winWidget) fuzzy-if(!Android,0-2,0-550) == 635373-2.html 635373-2-ref.html
+random-if(winWidget) fuzzy-if(!Android,0-2,0-650) == 635373-3.html 635373-3-ref.html
 == 635639-1.html 635639-1-ref.html
 == 635639-2.html 635639-2-ref.html
 == 637597-1.html 637597-1-ref.html
@@ -1615,7 +1615,7 @@ fuzzy-if(Android,0-8,0-500) == 637852-3.html 637852-3-ref.html
 == 645647-1.html 645647-1-ref.html
 == 645647-2.html 645647-2-ref.html
 == 645768-1.html 645768-1-ref.html
-fails-if(layersGPUAccelerated&&cocoaWidget) fuzzy(0-57,0-11000) == 650228-1.html 650228-1-ref.html # Quartz alpha blending doesn't match GL alpha blending
+fails-if(cocoaWidget) fuzzy(0-57,0-11000) == 650228-1.html 650228-1-ref.html # Quartz alpha blending doesn't match GL alpha blending
 needs-focus == 652301-1a.html 652301-1-ref.html
 needs-focus == 652301-1b.html 652301-1-ref.html
 fuzzy(0-2,0-5) == 652775-1.html 652775-1-ref.html
@@ -1638,7 +1638,7 @@ skip-if(Android) fuzzy(0-1,0-68000) == chrome://reftest/content/bugs/664127-1.xh
 == 667079-1.html 667079-1-ref.html
 skip-if(Android) == chrome://reftest/content/bugs/668319-1.xhtml about:blank
 != chrome://reftest/content/bugs/669015-1.xhtml chrome://reftest/content/bugs/669015-1-notref.xhtml
-skip-if(azureSkiaGL) fuzzy-if(Android&&device,0-55,0-3742) == 670442-1.html 670442-1-ref.html
+fuzzy-if(Android&&device,0-55,0-3742) == 670442-1.html 670442-1-ref.html
 == 670467-1.html 670467-1-ref.html
 == 670467-2.html 670467-2-ref.html
 == 690164-1.html 690164-1-ref.html
@@ -1660,7 +1660,7 @@ fuzzy(0-1,0-3) needs-focus == 712130-2.html 712130-2-ref.html
 == 714519-1-q.html 714519-1-ref.html
 == 714519-2-as.html 714519-2-ref.html
 == 714519-2-q.html 714519-2-ref.html
-skip-if(Android&&emulator) fuzzy(0-1,0-21) fuzzy-if(d2d,0-77,0-173) fuzzy-if(cocoaWidget,0-1,0-170) fuzzy-if(useDrawSnapshot,1-1,163-163) == 718521.html 718521-ref.html # bug 773482
+skip-if(Android&&emulator) fuzzy(0-1,0-21) fuzzy-if(winWidget,0-77,0-173) fuzzy-if(cocoaWidget,0-1,0-170) fuzzy-if(useDrawSnapshot,1-1,163-163) == 718521.html 718521-ref.html # bug 773482
 == 720987.html 720987-ref.html
 == 722888-1.html 722888-1-ref.html
 fuzzy(0-2,0-40000) == 722923-1.html 722923-1-ref.html
@@ -1711,7 +1711,7 @@ fuzzy-if(Android,0-4,0-400) == 815593-1.html 815593-1-ref.html
 fuzzy(0-1,0-5) == 816948-1.html 816948-1-ref.html
 == 817019-1.html about:blank
 fuzzy(0-1,0-5) == 818276-1.html 818276-1-ref.html
-fuzzy-if(asyncPan,0-190,0-510) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-102,0-510) == 825999.html 825999-ref.html
+fuzzy-if(!useDrawSnapshot,0-190,0-510) == 825999.html 825999-ref.html
 == 827577-1a.html 827577-1-ref.html
 == 827577-1b.html 827577-1-ref.html
 == 827799-1.html about:blank
@@ -1751,7 +1751,7 @@ test-pref(font.minimum-size.x-western,32) fuzzy-if(Android,0-45,0-324) == 935056
 == 936670-1.svg 936670-1-ref.svg
 == 941940-1.html 941940-1-ref.html
 fails == 942017.html 942017-ref.html # bug 942017
-fuzzy(0-2,0-160000) fuzzy-if(winWidget&&isDebugBuild&&layersGPUAccelerated&&!is64Bit,1-1,12-175) == 942672-1.html 942672-1-ref.html
+fuzzy(0-2,0-160000) fuzzy-if(winWidget&&isDebugBuild&&!is64Bit,1-1,12-175) == 942672-1.html 942672-1-ref.html
 == 953334-win32-clipping.html 953334-win32-clipping-ref.html
 fuzzy(0-1,0-5) == 956513-1.svg 956513-1-ref.svg
 == 944291-1.html 944291-1-ref.html
@@ -1813,7 +1813,7 @@ fuzzy(15-65,100-500) fuzzy-if(useDrawSnapshot,33-33,218-218) == 1081185-1.html 1
 == 1097437-1.html 1097437-1-ref.html
 == 1103258-1.html 1103258-1-ref.html # assertion crash test with layers culling test
 == 1105137-1.html 1105137-1-ref.html
-fuzzy-if(d2d,0-36,0-304) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)&&d2d,0-139,0-701) == 1116480-1-fakeitalic-overflow.html 1116480-1-fakeitalic-overflow-ref.html
+fuzzy-if(winWidget,0-139,0-701) == 1116480-1-fakeitalic-overflow.html 1116480-1-fakeitalic-overflow-ref.html
 == 1111753-1.html about:blank
 == chrome://reftest/content/bugs/1114526-1.html 1114526-1-ref.html
 fuzzy(0-1,0-800000) == 1119117-1a.html 1119117-1-ref.html
@@ -1943,12 +1943,12 @@ fuzzy-if(Android,0-27,0-874) fuzzy-if(!Android,0-14,0-43) fuzzy-if(gtkWidget&&fi
 fuzzy(0-3,0-320000) fails-if(useDrawSnapshot) == 1315113-1.html 1315113-1-ref.html
 fuzzy(0-3,0-20000) == 1315113-2.html 1315113-2-ref.html
 == 1315632-1.html 1315632-1-ref.html
-fuzzy(0-3,0-40000) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-13,0-40000) == 1316719-1a.html 1316719-1-ref.html
-fuzzy(0-13,0-40000) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-13,0-40000) == 1316719-1b.html 1316719-1-ref.html
-fuzzy(0-13,0-40000) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-13,0-40000) == 1316719-1c.html 1316719-1-ref.html
+fuzzy(0-3,0-40000) fuzzy-if(winWidget,0-13,0-40000) == 1316719-1a.html 1316719-1-ref.html
+fuzzy(0-13,0-40000) fuzzy-if(winWidget,0-13,0-40000) == 1316719-1b.html 1316719-1-ref.html
+fuzzy(0-13,0-40000) fuzzy-if(winWidget,0-13,0-40000) == 1316719-1c.html 1316719-1-ref.html
 != 1318769-1.html 1318769-1-ref.html
 == 1322512-1.html 1322512-1-ref.html
-skip-if(isDebugBuild&&winWidget) == 1330051.svg 1330051-ref.svg
+skip-if(winWidget&&isDebugBuild) == 1330051.svg 1330051-ref.svg
 != 1336591-1.html 1336591-1-ref.html
 == 1348481-1.html 1348481-ref.html
 == 1348481-2.html 1348481-ref.html
@@ -2017,7 +2017,7 @@ skip-if(winWidget&&isCoverageBuild) == 1424177.html 1424177-ref.html
 == 1424680.html 1424680-ref.html
 == 1424798-1.html 1424798-ref.html
 fuzzy-if(swgl,0-1,0-31430) == 1425243-1.html 1425243-1-ref.html
-fuzzy-if(Android,0-66,0-574) fuzzy-if(d2d,0-89,0-777) fuzzy-if(!Android&&!d2d,0-1,0-31430) fuzzy-if(winWidget,1-1,31240-31430) == 1425243-2.html 1425243-2-ref.html
+fuzzy-if(Android,0-66,0-574) fuzzy-if(winWidget,1-1,31240-31430) fuzzy-if(!Android&&!winWidget,0-1,0-31430) == 1425243-2.html 1425243-2-ref.html
 == 1430869.html 1430869-ref.html
 == 1432541.html 1432541-ref.html
 == 1446470.html 1035091-ref.html
@@ -2046,7 +2046,7 @@ fuzzy(0-5,0-2300) == 1529992-1.html 1529992-1-ref.html
 fuzzy-if(Android,9-14,44-60) fails-if(!useDrawSnapshot) == 1529992-2.html 1529992-2-ref.html
 == 1535040-1.html 1535040-1-ref.html
 == 1545360-1.xhtml 1545360-1-ref.xhtml
-skip-if(!asyncPan) == 1544895.html 1544895-ref.html
+skip-if(useDrawSnapshot) == 1544895.html 1544895-ref.html
 random-if(useDrawSnapshot) == 1546856-1.html 1546856-ref.html
 == 1546856-2.html 1546856-ref.html
 == 1547759-1.html 1547759-1-ref.html
@@ -2054,8 +2054,8 @@ random-if(useDrawSnapshot) == 1546856-1.html 1546856-ref.html
 test-pref(layout.css.prefers-color-scheme.content-override,0) != 1551040.txt 1551040.txt
 test-pref(layout.css.prefers-color-scheme.content-override,0) == 1551040.html 1551040.html
 != 1552789-1.html 1552789-ref-1.html
-pref(image.downscale-during-decode.enabled,true) skip-if(((gtkWidget&&isDebugBuild)||(gtkWidget&&AddressSanitizer)||Android||ThreadSanitizer)||(Android&&isDebugBuild)) random-if(useDrawSnapshot) fuzzy(0-2,0-188) == 1553571-1.html 1553571-1-ref.html
-pref(image.downscale-during-decode.enabled,true) fuzzy(0-2,0-2004) skip-if(((gtkWidget&&isDebugBuild)||(gtkWidget&&AddressSanitizer)||Android||ThreadSanitizer)||(Android&&isDebugBuild)) random-if(useDrawSnapshot) == 1553571-2.html 1553571-2-ref.html
+pref(image.downscale-during-decode.enabled,true) skip-if(((gtkWidget&&isDebugBuild)||(gtkWidget&&AddressSanitizer)||ThreadSanitizer)||(Android&&isDebugBuild)) random-if(useDrawSnapshot) fuzzy(0-2,0-188) == 1553571-1.html 1553571-1-ref.html
+pref(image.downscale-during-decode.enabled,true) fuzzy(0-2,0-2004) skip-if(((gtkWidget&&isDebugBuild)||(gtkWidget&&AddressSanitizer)||ThreadSanitizer)||(Android&&isDebugBuild)) random-if(useDrawSnapshot) == 1553571-2.html 1553571-2-ref.html
 == 1558937-1.html 1558937-1-ref.html
 != 1563484.html 1563484-notref.html
 == 1563484.html 1563484-ref.html
@@ -2071,11 +2071,11 @@ asserts(1-2) == 1588954.html 1588954-ref.html # Bug 1588954
 != 1599841-2.html 1599841-2-notref.html
 == chrome://reftest/content/bugs/1606130.html chrome://reftest/content/bugs/1606130-ref.html
 == 1608124-1.html 1608124-1-ref.html
-skip-if(!OSX) != 1608124-2.html 1608124-2-notref.html
+skip-if(!cocoaWidget) != 1608124-2.html 1608124-2-notref.html
 == 1613380.html 1613380-ref.html
 fuzzy(0-145,0-48536) == 1614788-1.svg 1614788-1-ref.svg # large fuzz necesary to test bug: 239,202824 is how much it differs when bug exists
 == blob-fallback-clip.html blob-fallback-clip-ref.html
-fuzzy-if(OSX,0-42,0-4) fuzzy-if(winWidget,249-249,999-999) == 1617515-1.html 1617515-1-ref.html
+fuzzy-if(cocoaWidget,0-42,0-4) fuzzy-if(winWidget,249-249,999-999) == 1617515-1.html 1617515-1-ref.html
 == 1624118.html 1624118-ref.html
 fuzzy(0-2,0-21184) == 1626259-1.html 1626259-1-ref.html
 fuzzy(0-2,0-21184) == 1626259-2.html 1626259-2-ref.html
@@ -2091,9 +2091,9 @@ fuzzy(0-2,0-96600) == 1648282-1b.html 1648282-1-ref.html
 == 1673677-3.html 1673677-3-ref.html
 == 1686729-1.html 1686729-1-ref.html
 != chrome://reftest/content/bugs/1688004.xhtml about:blank
-pref(image.downscale-during-decode.enabled,true) fuzzy-if(OSX||winWidget,0-167,0-44310) fuzzy-if(gtkWidget,0-2,0-37220) == 1714763-1.html 1714763-1-ref.html
-pref(image.downscale-during-decode.enabled,true) fuzzy-if(OSX||winWidget,0-166,0-22530) fuzzy-if(gtkWidget,0-18,0-19006) fuzzy-if(Android,0-21,0-22260) == 1714763-2.html 1714763-2-ref.html
-pref(image.downscale-during-decode.enabled,true) fuzzy-if(OSX||winWidget,0-235,0-289) fuzzy-if(gtkWidget,0-186,0-240) fuzzy-if(Android,0-185,0-232) == 1714763-3.html 1714763-3-ref.html
+pref(image.downscale-during-decode.enabled,true) fuzzy-if(cocoaWidget||winWidget,0-167,0-44310) fuzzy-if(gtkWidget,0-2,0-37220) == 1714763-1.html 1714763-1-ref.html
+pref(image.downscale-during-decode.enabled,true) fuzzy-if(cocoaWidget||winWidget,0-166,0-22530) fuzzy-if(gtkWidget,0-18,0-19006) fuzzy-if(Android,0-21,0-22260) == 1714763-2.html 1714763-2-ref.html
+pref(image.downscale-during-decode.enabled,true) fuzzy-if(cocoaWidget||winWidget,0-235,0-289) fuzzy-if(gtkWidget,0-186,0-240) fuzzy-if(Android,0-185,0-232) == 1714763-3.html 1714763-3-ref.html
 skip-if(!appleSilicon) != 1721223-1.html 1721223-1-notref.html # Big Sur required for updated system font; OSX value is clamped to 10.15
 skip-if(Android) == 1727172-1.xhtml 1727172-1-ref.html
 == 1726663-1.html 1726663-1-ref.html
@@ -2134,8 +2134,8 @@ pref(layout.css.prefers-color-scheme.content-override,0) == 1787127.html 1787127
 pref(layout.css.prefers-color-scheme.content-override,1) == 1787127.html 1787127-ref.html
 pref(layout.css.prefers-color-scheme.content-override,2) == 1787127.html 1787127-ref.html
 == 1792643-1.html 1792643-1-ref.html
-skip-if(!/^Windows\x20NT\x2010\.0/.test(http.oscpu)) == 1798297-1.html 1798297-1-ref.html
-skip-if(!/^Windows\x20NT\x2010\.0/.test(http.oscpu)) != 1798297-1.html 1798297-1-notref.html
+skip-if(!winWidget) == 1798297-1.html 1798297-1-ref.html
+skip-if(!winWidget) != 1798297-1.html 1798297-1-notref.html
 == 1799425-1.html 1799425-1-ref.html
 fuzzy-if(winWidget,114-114,572-572) == 1800437-1.html 1800437-1-ref.html
 == 1803999-1.html 1803999-1-ref.html
@@ -2149,9 +2149,9 @@ pref(image.downscale-during-decode.enabled,true) == 1804872-3.html 1804872-3-ref
 == 1827009-1.html 1827009-1-ref.html
 pref(layout.testing.overlay-scrollbars.always-visible,true) pref(ui.useOverlayScrollbars,1) == 1827337-1.html 1827337-1-ref.html
 pref(layout.testing.overlay-scrollbars.always-visible,true) pref(ui.useOverlayScrollbars,1) fuzzy-if(winWidget,0-21,0-134) fuzzy-if(cocoaWidget,0-2,0-12) == 1828879-1.html 1828879-1-ref.html
-skip-if(!OSX) != 1834316-1.html 1834316-1-notref.html
-skip-if(!OSX) test-pref(layout.css.font-visibility.standard,1) ref-pref(layout.css.font-visibility.standard,3) == 1835271-1.html 1835271-1-ref.html
-skip-if(!OSX) != 1836024-1.html 1836024-1-notref.html
+skip-if(!cocoaWidget) != 1834316-1.html 1834316-1-notref.html
+skip-if(!cocoaWidget) test-pref(layout.css.font-visibility.standard,1) ref-pref(layout.css.font-visibility.standard,3) == 1835271-1.html 1835271-1-ref.html
+skip-if(!cocoaWidget) != 1836024-1.html 1836024-1-notref.html
 # The 1840511-* tests are reliably fuzzy on certain configurations, per bug
 # 1840511.  (It passes on macOS and Android. It also passes with software WR,
 # or when using drawSnapshot.)
@@ -2164,3 +2164,4 @@ fuzzy-if(!useDrawSnapshot,18-19,294-322) == 1840747-1.html about:blank
 # through, which is unexpected and is responsible for the 255-255 difference
 # here. That's tracked in bug 1840747.
 fuzzy-if(!useDrawSnapshot&&!swgl,254-255,110-121) fuzzy-if(useDrawSnapshot,18-18,93-93) fuzzy-if(swgl,19-19,58-58) == 1841355-1.html about:blank
+skip-if(((AddressSanitizer||ThreadSanitizer)&&gtkWidget)||(isDebugBuild&&Android)) fuzzy(0-123,0-1425) == 1878294-1.html 1878294-1-ref.html
diff --git a/layout/reftests/canvas/reftest.list b/layout/reftests/canvas/reftest.list
index a95705d633..66e84dd1d6 100644
--- a/layout/reftests/canvas/reftest.list
+++ b/layout/reftests/canvas/reftest.list
@@ -30,8 +30,8 @@ random-if(cocoaWidget) == subpixel-1.html about:blank # see bug 1192616, re-enab
 == text-ltr-alignment-test.html text-ltr-alignment-ref.html
 == text-rtl-alignment-test.html text-rtl-alignment-ref.html
 
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-256) == text-horzline-with-bottom.html text-horzline.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-256) fails-if(azureSkia&&OSX) == text-horzline-with-top.html text-horzline.html
+fuzzy-if(winWidget,0-1,0-256) == text-horzline-with-bottom.html text-horzline.html
+fuzzy-if(winWidget,0-1,0-256) fails-if(cocoaWidget) == text-horzline-with-top.html text-horzline.html
 
 != text-big-stroke.html text-blank.html
 != text-big-stroke.html text-big-fill.html
@@ -42,7 +42,7 @@ fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-256) fails-if(azureSki
 
 == text-no-frame-test.html text-no-frame-ref.html
 == text-no-frame-2-test.html text-not-in-doc-ref.html
-fuzzy-if(azureSkiaGL,0-10,0-400) == text-not-in-doc-test.html text-not-in-doc-ref.html
+== text-not-in-doc-test.html text-not-in-doc-ref.html
 
 == text-bidi-ltr-test.html text-bidi-ltr-ref.html
 != text-bidi-ltr-test.html text-bidi-ltr-notref.html # for bug 698185
@@ -53,7 +53,7 @@ fuzzy-if(azureSkiaGL,0-10,0-400) == text-not-in-doc-test.html text-not-in-doc-re
 == text-measure.html text-measure-ref.html
 == text-small-caps-1.html text-small-caps-1-ref.html
 
-random-if(!d2d) != text-subpixel-1.html text-subpixel-1-ref.html
+random-if(!winWidget) != text-subpixel-1.html text-subpixel-1-ref.html
 
 == strokeText-path.html strokeText-path-ref.html
 
@@ -79,7 +79,7 @@ fuzzy(0-9,0-470) random-if(Android) == dash-1.html dash-1-ref.svg # Bug 668412 (
 == ctm-singular-sanity.html data:text/html,<body>Pass
 
 == 672646-alpha-radial-gradient.html 672646-alpha-radial-gradient-ref.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-45) == 674003-alpha-radial-gradient-superlum.html 674003-alpha-radial-gradient-superlum-ref.html
+fuzzy-if(winWidget,0-1,0-45) == 674003-alpha-radial-gradient-superlum.html 674003-alpha-radial-gradient-superlum-ref.html
 
 != 693610-1.html 693610-1-notref.html # bug 693610: multiple glyph runs should not be overprinted
 
@@ -92,7 +92,7 @@ fuzzy(0-1,0-20) == transformed-gradient.html transformed-gradient-ref.html
 == 749467-1.html 749467-1-ref.html
 
 # You get a little bit of rounding fuzz on OSX from transforming the paths between user space and device space
-fuzzy(0-16,0-84) fuzzy-if(d2d&&/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-2,0-153) == 784573-1.html 784573-1-ref.html
+fuzzy(0-16,0-84) fuzzy-if(winWidget,0-2,0-153) == 784573-1.html 784573-1-ref.html
 
 == 802658-1.html 802658-1-ref.html
 == 1074733-1.html 1074733-1-ref.html
diff --git a/layout/reftests/columns/reftest.list b/layout/reftests/columns/reftest.list
index 916817f49f..9a6f694e2e 100644
--- a/layout/reftests/columns/reftest.list
+++ b/layout/reftests/columns/reftest.list
@@ -22,7 +22,7 @@ pref(layout.outline.include-overflow,true) == column-balancing-overflow-005.html
 == column-box-alignment-rtl-3.html column-box-alignment-rtl-3-ref.html
 == column-box-alignment-rtl-4.html column-box-alignment-rtl-4-ref.html
 == columnfill-balance.html columnfill-balance-ref.html
-fuzzy-if(OSX,0-32,0-1000) == columnfill-auto.html columnfill-auto-ref.html
+fuzzy-if(cocoaWidget,0-32,0-1000) == columnfill-auto.html columnfill-auto-ref.html
 == columnfill-auto-2.html columnfill-auto-2-ref.html
 == columnfill-auto-3.html columnfill-auto-2-ref.html
 == columnrule-basic.html columnrule-basic-ref.html
@@ -37,7 +37,7 @@ fuzzy-if(OSX,0-32,0-1000) == columnfill-auto.html columnfill-auto-ref.html
 == columnrule-overflow.html columnrule-overflow-ref.html
 == columns-table-caption-000.html columns-table-caption-000-ref.html
 == positioning-transforms-bug1112501.html positioning-transforms-bug1112501-ref.html
-fuzzy-if(browserIsRemote&&winWidget,0-142,0-276) == fieldset-columns-001.html fieldset-columns-001-ref.html
+fuzzy-if(winWidget,0-142,0-276) == fieldset-columns-001.html fieldset-columns-001-ref.html
 == fieldset-columns-002.html fieldset-columns-002-ref.html
 == fieldset-columns-003.html fieldset-columns-003-ref.html
 == fieldset-columns-004.html fieldset-columns-004-ref.html
diff --git a/layout/reftests/css-animations/reftest.list b/layout/reftests/css-animations/reftest.list
index ee84b01a30..11558a5c08 100644
--- a/layout/reftests/css-animations/reftest.list
+++ b/layout/reftests/css-animations/reftest.list
@@ -84,4 +84,4 @@ pref(layout.css.marker.restricted,false) == marker-reframe-and-animation-starts-
 == background-color-on-html.html background-color-on-html-ref.html
 skip-if(Android) == replace-with-new-positive-delay-animation.html replace-with-new-positive-delay-animation-ref.html # bug 1787682 for Android
 
-pref(layout.css.scroll-driven-animations.enabled,true) skip-if(!asyncPan) == scroll-timeline-in-delay-omta.html scroll-timeline-in-delay-omta-ref.html
+pref(layout.css.scroll-driven-animations.enabled,true) skip-if(useDrawSnapshot) == scroll-timeline-in-delay-omta.html scroll-timeline-in-delay-omta-ref.html
diff --git a/layout/reftests/css-blending/reftest.list b/layout/reftests/css-blending/reftest.list
index 8d2ca77586..9ed4c37029 100644
--- a/layout/reftests/css-blending/reftest.list
+++ b/layout/reftests/css-blending/reftest.list
@@ -7,11 +7,11 @@ fuzzy-if(geckoview&&device,3-3,5-5) == blend-difference-stacking.html blend-diff
 fuzzy(0-1,0-30000) == background-blending-alpha.html background-blending-alpha-ref.html
 == background-blending-gradient-color.html background-blending-gradient-color-ref.html
 fuzzy(0-2,0-9450) fuzzy-if(!geckoview,0-1,0-6200) == background-blending-gradient-gradient.html background-blending-gradient-gradient-ref.html
-fuzzy-if(azureSkiaGL,0-2,0-7174) == background-blending-gradient-image.html background-blending-gradient-color-ref.html
-fuzzy-if(azureSkia||d2d||gtkWidget,0-1,0-10000) == background-blending-image-color-jpg.html background-blending-image-color-ref.html
+== background-blending-gradient-image.html background-blending-gradient-color-ref.html
+fuzzy(0-1,0-10000) == background-blending-image-color-jpg.html background-blending-image-color-ref.html
 == background-blending-image-color-png.html background-blending-image-color-ref.html
 == background-blending-image-color-svg.html background-blending-image-color-ref.html
-fuzzy-if(azureSkiaGL,0-2,0-7174) == background-blending-image-gradient.html background-blending-gradient-color-ref.html
+== background-blending-image-gradient.html background-blending-gradient-color-ref.html
 == background-blending-image-image.html background-blending-image-color-ref.html
 == background-blending-isolation.html background-blending-isolation-ref.html
 random-if(useDrawSnapshot) == background-blending-list-repeat.html background-blending-list-repeat-ref.html
@@ -20,22 +20,22 @@ random-if(useDrawSnapshot) == background-blending-list-repeat.html background-bl
 == background-blending-color-burn.html background-blending-color-burn-ref.svg
 == background-blending-color-dodge.html background-blending-color-dodge-ref.svg
 # need to investigate why these tests are fuzzy - first suspect is a possible color space conversion on some platforms; same for mix-blend-mode tests
-fuzzy-if(azureSkia||gtkWidget,0-2,0-9600) fuzzy-if(appleSilicon,0-1,0-11200) fuzzy-if(d2d,0-1,0-8000) fuzzy-if(swgl&&!Android,1-1,8000-9600) == background-blending-color.html background-blending-color-ref.svg
+fuzzy-if(!winWidget,0-2,0-9600) fuzzy-if(appleSilicon,0-1,0-11200) fuzzy-if(winWidget,0-1,0-8000) fuzzy-if(swgl&&!Android,1-1,8000-9600) == background-blending-color.html background-blending-color-ref.svg
 == background-blending-darken.html background-blending-darken-ref.svg
 == background-blending-difference.html background-blending-difference-ref.svg
 fuzzy(0-1,0-1600) == background-blending-exclusion.html background-blending-exclusion-ref.svg
-fuzzy-if(cocoaWidget||d2d||swgl,0-1,0-1600) == background-blending-hard-light.html background-blending-hard-light-ref.svg
-fuzzy-if(d2d,0-1,0-9600) fuzzy-if(azureSkia||gtkWidget,0-1,0-11200) fuzzy-if(!geckoview,1-1,9600-11240) == background-blending-hue.html background-blending-hue-ref.svg
+fuzzy-if(cocoaWidget||winWidget||swgl,0-1,0-1600) == background-blending-hard-light.html background-blending-hard-light-ref.svg
+fuzzy-if(winWidget,0-1,0-9600) fuzzy-if(!winWidget,0-1,0-11200) fuzzy-if(!geckoview,1-1,9600-11240) == background-blending-hue.html background-blending-hue-ref.svg
 == background-blending-lighten.html background-blending-lighten-ref.svg
-fuzzy-if(d2d,0-1,0-8000) fuzzy-if(azureSkia||gtkWidget,0-2,0-9600) fuzzy-if(appleSilicon,0-1,0-11200) fuzzy-if(swgl&&!Android,1-1,8000-9600) == background-blending-luminosity.html background-blending-luminosity-ref.svg
+fuzzy-if(winWidget,0-1,0-8000) fuzzy-if(!winWidget,0-2,0-9600) fuzzy-if(appleSilicon,0-1,0-11200) fuzzy-if(swgl&&!Android,1-1,8000-9600) == background-blending-luminosity.html background-blending-luminosity-ref.svg
 fuzzy(0-1,0-1600) == background-blending-multiply.html background-blending-multiply-ref.svg
 == background-blending-normal.html background-blending-normal-ref.svg
-fuzzy-if(azureSkia||gtkWidget,0-1,0-1600) == background-blending-overlay.html background-blending-overlay-ref.svg
-fuzzy-if(d2d,0-1,0-3200) fuzzy-if(azureSkia||gtkWidget,0-2,0-12800) == background-blending-saturation.html background-blending-saturation-ref.svg
-fuzzy-if(d2d||azureSkia||gtkWidget,0-1,0-1600) == background-blending-screen.html background-blending-screen-ref.svg
-fuzzy-if(d2d||azureSkia||gtkWidget,0-10,0-4800) == background-blending-soft-light.html background-blending-soft-light-ref.svg
+fuzzy-if(!winWidget,0-1,0-1600) == background-blending-overlay.html background-blending-overlay-ref.svg
+fuzzy-if(winWidget,0-1,0-3200) fuzzy-if(!winWidget,0-2,0-12800) == background-blending-saturation.html background-blending-saturation-ref.svg
+fuzzy(0-1,0-1600) == background-blending-screen.html background-blending-screen-ref.svg
+fuzzy(0-10,0-4800) == background-blending-soft-light.html background-blending-soft-light-ref.svg
 
-fuzzy-if(azureSkia||d2d||gtkWidget,0-1,0-40000) == background-blending-image-color-959674.html background-blending-image-color-959674-ref.html
+fuzzy(0-1,0-40000) == background-blending-image-color-959674.html background-blending-image-color-959674-ref.html
 
 #fuzzy due to inconsistencies in rounded rect cliping between parent and child; may be related to antialiasing. Between platforms, the max difference is the same, and the number of different pixels is either 36 or 37. (Win, Mac and Lin)
 fuzzy(0-65,0-53) fuzzy-if(geckoview&&device,63-64,163-328) == mix-blend-mode-952051.html mix-blend-mode-952051-ref.html
diff --git a/layout/reftests/css-gradients/reftest.list b/layout/reftests/css-gradients/reftest.list
index cb22973622..1574996fa3 100644
--- a/layout/reftests/css-gradients/reftest.list
+++ b/layout/reftests/css-gradients/reftest.list
@@ -32,19 +32,19 @@ fuzzy(0-3,0-21070) == linear-vertical-subpixel-1.html linear-vertical-subpixel-1
 == linear-viewport.html linear-viewport-ref.html
 == nostops.html about:blank
 == onestop.html about:blank
-random-if(d2d) fuzzy(0-4,0-6000) == radial-1a.html radial-1-ref.html
-random-if(d2d) fuzzy(0-4,0-6000) == radial-1b.html radial-1-ref.html
-fuzzy(0-3,0-7860) fuzzy-if(cocoaWidget,0-5,0-89041) fuzzy-if(azureSkiaGL,0-4,0-90000) == radial-2a.html radial-2-ref.html
-fuzzy(0-3,0-7860) fuzzy-if(cocoaWidget,0-5,0-89041) fuzzy-if(azureSkiaGL,0-4,0-90000) == radial-2b.html radial-2-ref.html
-fuzzy(0-3,0-7860) fuzzy-if(cocoaWidget,0-5,0-89041) fuzzy-if(azureSkiaGL,0-4,0-90000) == radial-2c.html radial-2-ref.html
-fuzzy(0-3,0-7860) fuzzy-if(cocoaWidget,0-5,0-89041) fuzzy-if(azureSkiaGL,0-4,0-90000) == radial-2d.html radial-2-ref.html
+random-if(winWidget) fuzzy(0-4,0-6000) == radial-1a.html radial-1-ref.html
+random-if(winWidget) fuzzy(0-4,0-6000) == radial-1b.html radial-1-ref.html
+fuzzy(0-3,0-7860) fuzzy-if(cocoaWidget,0-5,0-89041) == radial-2a.html radial-2-ref.html
+fuzzy(0-3,0-7860) fuzzy-if(cocoaWidget,0-5,0-89041) == radial-2b.html radial-2-ref.html
+fuzzy(0-3,0-7860) fuzzy-if(cocoaWidget,0-5,0-89041) == radial-2c.html radial-2-ref.html
+fuzzy(0-3,0-7860) fuzzy-if(cocoaWidget,0-5,0-89041) == radial-2d.html radial-2-ref.html
 fuzzy(0-1,0-50) == radial-position-1b.html radial-position-1-ref.html
 fuzzy-if(cocoaWidget,0-4,0-22317) fuzzy-if(Android,0-8,0-771) == radial-shape-closest-corner-1a.html radial-shape-closest-corner-1-ref.html
 fuzzy(0-2,0-300) == radial-shape-closest-corner-1b.html radial-shape-closest-corner-1-ref.html
 fuzzy(0-5,0-30000) fuzzy-if(Android,0-17,0-5000) == radial-shape-closest-side-1a.html radial-shape-closest-side-1-ref.html
 fuzzy(0-5,0-30000) fuzzy-if(Android,0-17,0-5000) == radial-shape-closest-side-1b.html radial-shape-closest-side-1-ref.html
 fuzzy-if(Android,0-8,0-771) == radial-shape-farthest-corner-1a.html radial-shape-farthest-corner-1-ref.html
-fails-if(gtkWidget&&/x86_64-/.test(xulRuntime.XPCOMABI)) fuzzy(0-2,0-500) == radial-shape-farthest-corner-1b.html radial-shape-farthest-corner-1-ref.html
+fails-if(gtkWidget) fuzzy(0-2,0-500) == radial-shape-farthest-corner-1b.html radial-shape-farthest-corner-1-ref.html
 fuzzy(0-2,0-15000) fuzzy-if(Android,0-17,0-13320) == radial-shape-farthest-side-1a.html radial-shape-farthest-side-1-ref.html
 fuzzy(0-2,0-15000) fuzzy-if(Android,0-17,0-13320) == radial-shape-farthest-side-1b.html radial-shape-farthest-side-1-ref.html
 == radial-size-1a.html radial-size-1-ref.html
@@ -60,9 +60,9 @@ fuzzy(0-1,0-40) == radial-premul.html radial-premul-ref.html
 == repeating-linear-1a.html repeating-linear-1-ref.html
 == repeating-linear-1b.html repeating-linear-1-ref.html
 == repeating-linear-2a.html repeating-linear-2-ref.html
-fuzzy-if(d2d,0-127,0-2612) == repeating-radial-1a.html repeating-radial-1-ref.html
+fuzzy-if(winWidget,0-127,0-2612) == repeating-radial-1a.html repeating-radial-1-ref.html
 == repeating-radial-1b.html repeating-radial-1-ref.html
-fuzzy-if(d2d,0-127,0-2612) == repeating-radial-1c.html repeating-radial-1-ref.html
+fuzzy-if(winWidget,0-127,0-2612) == repeating-radial-1c.html repeating-radial-1-ref.html
 == repeating-radial-1d.html repeating-radial-1-ref.html
 == repeating-radial-2a.html repeating-radial-2-ref.html
 == repeating-radial-2b.html repeating-radial-2-ref.html
@@ -73,7 +73,7 @@ fuzzy(0-141,0-300) == twostops-1d.html twostops-1-ref.html
 fuzzy(0-73,0-900) == twostops-1e.html twostops-1-ref.html
 
 # from http://www.xanthir.com/:4bhipd by way of http://a-ja.net/newgrad.html
-fuzzy-if(!contentSameGfxBackendAsCanvas,0-3,0-20000) fuzzy-if(azureSkiaGL||layersGPUAccelerated,0-8,0-20000) == aja-linear-1a.html aja-linear-1-ref.html
+fuzzy-if(winWidget,0-3,0-20000) fuzzy(0-8,0-20000) == aja-linear-1a.html aja-linear-1-ref.html
 fuzzy(0-1,0-20000) == aja-linear-1b.html aja-linear-1-ref.html # bug 526694
 fuzzy(0-8,0-20000) == aja-linear-1c.html aja-linear-1-ref.html
 fuzzy(0-8,0-20000) == aja-linear-1d.html aja-linear-1-ref.html
@@ -90,7 +90,7 @@ fuzzy-if(cocoaWidget,0-1,0-40000) fuzzy-if(Android,0-6,0-10576) == height-depend
 fuzzy-if(Android,0-6,0-10576) == height-dependence-3.html height-dependence-3-ref.html
 
 == linear-onestopposition-1.html linear-onestopposition-1-ref.html
-fuzzy-if(d2d,0-47,0-400) fuzzy-if(winWidget,0-1,0-1375) == linear-onestopposition-1.html linear-onestopposition-1-ref2.html # d2d interpolates the hard stop
+fuzzy-if(winWidget,0-1,0-1375) == linear-onestopposition-1.html linear-onestopposition-1-ref2.html # winWidget interpolates the hard stop
 == radial-onestopposition-1a.html radial-onestopposition-1-ref.html
 == radial-onestopposition-1b.html radial-onestopposition-1-ref.html
 fuzzy-if(winWidget,0-1,0-1875) == repeating-linear-onestopposition-1.html orange-square.html
diff --git a/layout/reftests/css-grid/reftest.list b/layout/reftests/css-grid/reftest.list
index 8673b99897..789159ffe9 100644
--- a/layout/reftests/css-grid/reftest.list
+++ b/layout/reftests/css-grid/reftest.list
@@ -36,7 +36,7 @@ fails == grid-abspos-items-016.html grid-abspos-items-015-ref.html
 fuzzy(0-1,0-200) == grid-order-placement-definite-001.html grid-order-placement-definite-001-ref.html
 == grid-placement-definite-implicit-001.html grid-placement-definite-implicit-001-ref.html
 == grid-placement-definite-implicit-002.html grid-placement-definite-implicit-002-ref.html
-fuzzy(0-64,0-1) skip-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)) == grid-placement-auto-implicit-001.html grid-placement-auto-implicit-001-ref.html # win10: bug 1507154
+fuzzy(0-64,0-1) skip-if(winWidget) == grid-placement-auto-implicit-001.html grid-placement-auto-implicit-001-ref.html # win10: bug 1507154
 == grid-placement-abspos-implicit-001.html grid-placement-abspos-implicit-001-ref.html
 == rtl-grid-placement-definite-001.html rtl-grid-placement-definite-001-ref.html
 == rtl-grid-placement-auto-row-sparse-001.html rtl-grid-placement-auto-row-sparse-001-ref.html
diff --git a/layout/reftests/display-list/reftest.list b/layout/reftests/display-list/reftest.list
index 7ac7edc4f8..f11bd1efdb 100644
--- a/layout/reftests/display-list/reftest.list
+++ b/layout/reftests/display-list/reftest.list
@@ -1,26 +1,26 @@
 # These tests are testing merging RDL implementation.
-skip-if(!retainedDisplayList||retainedDisplayListNew) == retained-dl-style-change-1.html retained-dl-style-change-1-ref.html
-skip-if(!retainedDisplayList||retainedDisplayListNew) == retained-dl-frame-deleted-1.html retained-dl-style-change-1-ref.html
-skip-if(!retainedDisplayList||retainedDisplayListNew) == retained-dl-frame-created-1.html retained-dl-style-change-1-ref.html
-skip-if(!retainedDisplayList||retainedDisplayListNew) == retained-dl-style-change-stacking-context-1.html retained-dl-style-change-stacking-context-1-ref.html
-skip-if(!retainedDisplayList||retainedDisplayListNew) == retained-dl-style-change-stacking-context-2.html retained-dl-style-change-stacking-context-2-ref.html
+skip-if(useDrawSnapshot) == retained-dl-style-change-1.html retained-dl-style-change-1-ref.html
+skip-if(useDrawSnapshot) == retained-dl-frame-deleted-1.html retained-dl-style-change-1-ref.html
+skip-if(useDrawSnapshot) == retained-dl-frame-created-1.html retained-dl-style-change-1-ref.html
+skip-if(useDrawSnapshot) == retained-dl-style-change-stacking-context-1.html retained-dl-style-change-stacking-context-1-ref.html
+skip-if(useDrawSnapshot) == retained-dl-style-change-stacking-context-2.html retained-dl-style-change-stacking-context-2-ref.html
 fails == retained-dl-style-change-stacking-context-3.html retained-dl-style-change-stacking-context-3-ref.html # bug 1650699 tracks this failure
-skip-if(!retainedDisplayList||retainedDisplayListNew) == retained-dl-style-change-stacking-context-4.html retained-dl-style-change-stacking-context-4-ref.html
-skip-if(!retainedDisplayList||retainedDisplayListNew||Android) == retained-dl-displayport-1.html retained-dl-displayport-1-ref.html
-skip-if(!retainedDisplayList||retainedDisplayListNew) == retained-dl-prerender-transform-1.html retained-dl-prerender-transform-1-ref.html
-skip-if(!retainedDisplayList||retainedDisplayListNew) == retained-dl-animation-on-pseudo.html retained-dl-animation-on-pseudo-ref.html
+skip-if(useDrawSnapshot) == retained-dl-style-change-stacking-context-4.html retained-dl-style-change-stacking-context-4-ref.html
+skip-if(useDrawSnapshot||Android) == retained-dl-displayport-1.html retained-dl-displayport-1-ref.html
+skip-if(useDrawSnapshot) == retained-dl-prerender-transform-1.html retained-dl-prerender-transform-1-ref.html
+skip-if(useDrawSnapshot) == retained-dl-animation-on-pseudo.html retained-dl-animation-on-pseudo-ref.html
 #
 
-skip-if(!retainedDisplayList||!asyncPan) == retained-dl-async-scrolled-1.html retained-dl-async-scrolled-1-ref.html
-skip-if(!retainedDisplayList) == retained-dl-remove-for-ancestor-change-1.html retained-dl-remove-for-ancestor-change-1-ref.html
-skip-if(!retainedDisplayList) == retained-dl-scroll-out-of-view-1.html retained-dl-scroll-out-of-view-1-ref.html
-skip-if(!retainedDisplayList) == retained-dl-opacity-animation-on-ib-split.html retained-dl-opacity-animation-on-ib-split-ref.html
-skip-if(!retainedDisplayList) == 1544948-1.html 1544948-1-ref.html
+skip-if(useDrawSnapshot) == retained-dl-async-scrolled-1.html retained-dl-async-scrolled-1-ref.html
+skip-if(useDrawSnapshot) == retained-dl-remove-for-ancestor-change-1.html retained-dl-remove-for-ancestor-change-1-ref.html
+skip-if(useDrawSnapshot) == retained-dl-scroll-out-of-view-1.html retained-dl-scroll-out-of-view-1-ref.html
+skip-if(useDrawSnapshot) == retained-dl-opacity-animation-on-ib-split.html retained-dl-opacity-animation-on-ib-split-ref.html
+skip-if(useDrawSnapshot) == 1544948-1.html 1544948-1-ref.html
 
-skip-if(!retainedDisplayListNew) == reuse-sc-style-change-1.html reuse-sc-style-change-1-ref.html
-skip-if(!retainedDisplayListNew) == reuse-sc-style-change-nested-1.html reuse-sc-style-change-nested-1-ref.html
-skip-if(!retainedDisplayListNew) == reuse-sc-style-change-abs-pos-1.html reuse-sc-style-change-abs-pos-1-ref.html
-skip-if(!retainedDisplayListNew) == reuse-sc-style-change-fixed-pos-1.html reuse-sc-style-change-fixed-pos-1-ref.html
+skip  == reuse-sc-style-change-1.html reuse-sc-style-change-1-ref.html
+skip == reuse-sc-style-change-nested-1.html reuse-sc-style-change-nested-1-ref.html
+skip == reuse-sc-style-change-abs-pos-1.html reuse-sc-style-change-abs-pos-1-ref.html
+skip == reuse-sc-style-change-fixed-pos-1.html reuse-sc-style-change-fixed-pos-1-ref.html
 
 == retained-dl-wrap-list.html retained-dl-wrap-list-ref.html
 == retained-dl-zindex-1.html retained-dl-zindex-1-ref.html
@@ -38,7 +38,7 @@ needs-focus fuzzy(0-3,0-2) == 1429027-1.html 1429027-1-ref.html
 == 1432553-1.html 1432553-1-ref.html
 == 1432553-2.html 1432553-2-ref.html
 == 1436189-1.html 1436189-1-ref.html
-skip-if(!asyncPan) == 1437374-1.html 1437374-1-ref.html
+skip-if(useDrawSnapshot) == 1437374-1.html 1437374-1-ref.html
 == 1439809-1.html 1439809-1-ref.html
 == 1443027-1.html 1443027-ref.html
 == 1443027-2.html 1443027-ref.html
@@ -48,13 +48,13 @@ skip-if(!asyncPan) == 1437374-1.html 1437374-1-ref.html
 == 1453541-2.html 1453541-ref.html
 == 1452805-1.html 1452805-ref.html
 == 1461231-1.html about:blank
-fuzzy(0-2,0-40000) skip-if(!asyncPan) == 1464288-1.html 1464288-ref.html
+fuzzy(0-2,0-40000) skip-if(useDrawSnapshot) == 1464288-1.html 1464288-ref.html
 == 1482403-1.html 1482403-1-ref.html
 == 1504233-1.html 1504233-1-ref.html
 == 1533317-1.html 1533317-1-ref.html
 fuzzy-if(swgl,0-1,0-1) == 1551053-1.html 1551053-1-ref.html
 == 1553828-1.html 1553828-1-ref.html
-fuzzy-if(browserIsFission,0-1,0-300) == 1619370-1.html 1619370-1-ref.html
+fuzzy-if(fission,0-1,0-300) == 1619370-1.html 1619370-1-ref.html
 == 1677568-1.html 1677568-1-ref.html
 == 1709452-1.html 1709452-ref.html
 == 1719346-1.html 1719346-1-ref.html
diff --git a/layout/reftests/first-letter/reftest.list b/layout/reftests/first-letter/reftest.list
index b6aaa5e5e6..72c6e6739f 100644
--- a/layout/reftests/first-letter/reftest.list
+++ b/layout/reftests/first-letter/reftest.list
@@ -23,7 +23,7 @@ fails == quote-1e.html quote-1-ref.html # bug 509685
 == quote-1e.html quote-1b.html
 == quote-1f.html quote-1-ref.html
 == dynamic-1.html dynamic-1-ref.html
-random-if(d2d) == dynamic-2.html dynamic-2-ref.html
+random-if(winWidget) == dynamic-2.html dynamic-2-ref.html
 == dynamic-3a.html dynamic-3-ref.html
 == dynamic-3b.html dynamic-3-ref.html
 == dynamic-4.html dynamic-4-ref.html
@@ -66,7 +66,7 @@ fails-if(winWidget||cocoaWidget) fails-if(geckoview) == 617869-1.html 617869-1-r
 == 922550-1.html 922550-1-ref.html
 == 958249.html 958249-ref.html
 == font-text-styles.html font-text-styles-ref.html
-random-if(gtkWidget) random-if(winWidget&&!d2d) == font-text-styles-floater.html font-text-styles-floater-ref.html # bug 992846
+random-if(gtkWidget) == font-text-styles-floater.html font-text-styles-floater-ref.html # bug 992846
 == inline-height-empty.html inline-height-empty-ref.html
 == indic-clusters-1.html indic-clusters-1-ref.html
 == overflow-float-nooverflow.html overflow-float-nooverflow-ref.html
diff --git a/layout/reftests/floats/reftest.list b/layout/reftests/floats/reftest.list
index c35925f2ce..701673f534 100644
--- a/layout/reftests/floats/reftest.list
+++ b/layout/reftests/floats/reftest.list
@@ -91,8 +91,8 @@ fuzzy(0-1,0-12000) == float-in-rtl-4d.html float-in-rtl-4-ref.html
 == float-in-rtl-vrl-4b.html float-in-rtl-vrl-4-ref.html
 == float-in-rtl-vrl-4c.html float-in-rtl-vrl-4-ref.html
 == float-in-rtl-vrl-4d.html float-in-rtl-vrl-4-ref.html
-fuzzy-if(OSX,0-28,0-11) fuzzy-if(Android,0-16,0-2) == orthogonal-floats-1a.html orthogonal-floats-1-ref.html
-fuzzy-if(OSX,0-28,0-11) fuzzy-if(winWidget,0-137,0-3) == orthogonal-floats-1b.html orthogonal-floats-1-ref.html
+fuzzy-if(cocoaWidget,0-28,0-11) fuzzy-if(Android,0-16,0-2) == orthogonal-floats-1a.html orthogonal-floats-1-ref.html
+fuzzy-if(cocoaWidget,0-28,0-11) fuzzy-if(winWidget,0-137,0-3) == orthogonal-floats-1b.html orthogonal-floats-1-ref.html
 fuzzy-if(winWidget,0-135,0-700) == orthogonal-floats-1c.html orthogonal-floats-1-ref.html
 fuzzy-if(winWidget,0-135,0-700) == orthogonal-floats-1d.html orthogonal-floats-1-ref.html
 
diff --git a/layout/reftests/font-face/reftest.list b/layout/reftests/font-face/reftest.list
index 920a53a4d0..5d534ead55 100644
--- a/layout/reftests/font-face/reftest.list
+++ b/layout/reftests/font-face/reftest.list
@@ -1,9 +1,9 @@
 != download-1.html download-1-notref.html
 == download-2.html download-2-ref.html
 != download-2.html about:blank
-random-if(winWidget||gtkWidget) == download-2-big.html download-2-big-otf.html # bug 470713
+random-if(gtkWidget||winWidget) == download-2-big.html download-2-big-otf.html # bug 470713
 != download-2-big-otf.html about:blank
-asserts-if(Android&&!asyncPan,1-8) != download-3-notref.html download-3.html # bug 1019192
+!= download-3-notref.html download-3.html # bug 1019192
 asserts-if(Android,0-8) == download-3-ref.html download-3.html # same bugs as above
 asserts-if(Android,0-8) == fallback-to-system-1.html fallback-to-system-1-ref.html # just delayed assertions from above tests
 == name-override-simple-1.html name-override-simple-1-ref.html
@@ -13,7 +13,7 @@ fails == name-override-1.html name-override-1-ref.html
 != multiple-descriptor-1.html multiple-descriptor-1-notref.html
 == src-list-1.html src-list-1-ref.html
 == src-list-2.html src-list-2-ref.html
-random-if(winWidget||gtkWidget) == src-list-2-big-otf.html src-list-2-big-ref.html # bug 470713
+random-if(gtkWidget||winWidget) == src-list-2-big-otf.html src-list-2-big-ref.html # bug 470713
 == src-list-format-1.html src-list-format-1-ref.html
 == src-list-format-2.html src-list-format-2-ref.html
 == src-list-format-4.html src-list-format-1-ref.html
@@ -154,9 +154,9 @@ HTTP(..) == font-redirect.html order-1-ref.html
 == dynamic-duplicate-rule-1c.html dynamic-duplicate-rule-1-ref.html
 
 # Test for COLR and CPAL support
-fuzzy-if(OSX,198-198,172-172) == color-1a.html color-1-ref.html
+fuzzy-if(cocoaWidget,198-198,172-172) == color-1a.html color-1-ref.html
 != color-1a.html color-1-notref.html
-fuzzy-if(OSX,198-198,172-172) == color-1b.html color-1-ref.html
+fuzzy-if(cocoaWidget,198-198,172-172) == color-1b.html color-1-ref.html
 == color-2a.html color-2-ref.html
 != color-2a.html color-2-notref.html
 
diff --git a/layout/reftests/font-inflation/reftest.list b/layout/reftests/font-inflation/reftest.list
index 20548830e7..7be883a42f 100644
--- a/layout/reftests/font-inflation/reftest.list
+++ b/layout/reftests/font-inflation/reftest.list
@@ -37,7 +37,7 @@ test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceE
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == textarea-3.html textarea-3-ref.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == css-transform-1.html css-transform-1-ref.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) fuzzy(0-1,0-19) == css-transform-2.html css-transform-2-ref.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,0-102,0-1764) test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == container-with-clamping.html container-with-clamping-ref.html
+test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == container-with-clamping.html container-with-clamping-ref.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) load video-1.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == intrinsic-min-1.html intrinsic-min-1-ref.html
 test-pref(font.size.inflation.emPerLine,15) test-pref(font.size.inflation.forceEnabled,true) test-pref(font.size.inflation.lineThreshold,0) == intrinsic-max-1.html intrinsic-max-1-ref.html
diff --git a/layout/reftests/font-matching/reftest.list b/layout/reftests/font-matching/reftest.list
index fe5f3a2065..0fd4a4ce1f 100644
--- a/layout/reftests/font-matching/reftest.list
+++ b/layout/reftests/font-matching/reftest.list
@@ -147,14 +147,14 @@ random-if(Android) != emoji-subregion-flag.html emoji-subregion-flag-notref.html
 # Bug 1212731 - initial implementation caused startup regression and
 # regression with full-width digits display in UI elements. Disable
 # tests until these problems are corrected.
-# random-if(!OSX) == system-generic-fallback-1.html system-generic-fallback-1-ref.html
-# random-if(!OSX) == system-generic-fallback-2.html system-generic-fallback-2-ref.html
-# random-if(!OSX) == system-generic-fallback-3.html system-generic-fallback-3-ref.html
-# random-if(!OSX) == system-generic-fallback-4.html system-generic-fallback-4-ref.html
-# random-if(!OSX) != system-generic-fallback-ko.html system-generic-fallback-ja.html
-# random-if(!OSX) != system-generic-fallback-zh-tw.html system-generic-fallback-ja.html
-# random-if(!OSX) != system-generic-fallback-zh-cn.html system-generic-fallback-ja.html
-# random-if(!OSX) != system-generic-fallback-zh-tw.html system-generic-fallback-zh-cn.html
+# random-if(!cocoaWidget) == system-generic-fallback-1.html system-generic-fallback-1-ref.html
+# random-if(!cocoaWidget) == system-generic-fallback-2.html system-generic-fallback-2-ref.html
+# random-if(!cocoaWidget) == system-generic-fallback-3.html system-generic-fallback-3-ref.html
+# random-if(!cocoaWidget) == system-generic-fallback-4.html system-generic-fallback-4-ref.html
+# random-if(!cocoaWidget) != system-generic-fallback-ko.html system-generic-fallback-ja.html
+# random-if(!cocoaWidget) != system-generic-fallback-zh-tw.html system-generic-fallback-ja.html
+# random-if(!cocoaWidget) != system-generic-fallback-zh-cn.html system-generic-fallback-ja.html
+# random-if(!cocoaWidget) != system-generic-fallback-zh-tw.html system-generic-fallback-zh-cn.html
 
 # Tests for legacy font family name (GDI-model families) matching;
 # these depend on specific fonts that are available as standard on macOS and Windows,
diff --git a/layout/reftests/forms/fieldset/reftest.list b/layout/reftests/forms/fieldset/reftest.list
index f99032a3ec..86d6250a44 100644
--- a/layout/reftests/forms/fieldset/reftest.list
+++ b/layout/reftests/forms/fieldset/reftest.list
@@ -5,7 +5,7 @@ fuzzy(0-2,0-13) == dynamic-legend-scroll-1.html dynamic-legend-scroll-1-ref.html
 == 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(!layersGPUAccelerated,0-142,0-276) == positioned-container-1.html positioned-container-1-ref.html
+== positioned-container-1.html positioned-container-1-ref.html
 == relpos-legend-1.html relpos-legend-1-ref.html
 == relpos-legend-2.html relpos-legend-2-ref.html
 == relpos-legend-3.html relpos-legend-3-ref.html
diff --git a/layout/reftests/forms/input/file/reftest.list b/layout/reftests/forms/input/file/reftest.list
index 2ad51b2f69..d8276cb941 100644
--- a/layout/reftests/forms/input/file/reftest.list
+++ b/layout/reftests/forms/input/file/reftest.list
@@ -5,7 +5,7 @@ fuzzy(0-1,0-10) == background.html chrome://reftest/content/forms/input/file/bac
 fuzzy-if(gtkWidget,0-1,0-10) == style.html chrome://reftest/content/forms/input/file/style-ref.xhtml
 != width-clip.html width-clip-ref.html
 == color-inherit.html color-inherit-ref.html
-pref(widget.non-native-theme.webrender,true) fuzzy(0-1,0-5) fuzzy-if(OSX,0-46,0-134) == dynamic-max-width.html dynamic-max-width-ref.html # bug 1496542 for webrender, bug 1724582 for appleSilicon
+pref(widget.non-native-theme.webrender,true) fuzzy(0-1,0-5) fuzzy-if(cocoaWidget,0-46,0-134) == dynamic-max-width.html dynamic-max-width-ref.html # bug 1496542 for webrender, bug 1724582 for appleSilicon
 == label-min-inline-size.html label-min-inline-size-ref.html
 == css-overflow.html css-overflow-ref.html
 == css-display.html css-display-ref.html
diff --git a/layout/reftests/forms/input/number/number.html b/layout/reftests/forms/input/number/number.html
new file mode 100644
index 0000000000..0b4221fe70
--- /dev/null
+++ b/layout/reftests/forms/input/number/number.html
@@ -0,0 +1,2 @@
+<!doctype html>
+<input type=number>
diff --git a/layout/reftests/forms/input/number/reftest.list b/layout/reftests/forms/input/number/reftest.list
index 0a50ef8113..256e3f1df1 100644
--- a/layout/reftests/forms/input/number/reftest.list
+++ b/layout/reftests/forms/input/number/reftest.list
@@ -1,5 +1,5 @@
 # sanity checks:
-!= not-other-type-unthemed-1.html not-other-type-unthemed-1a-notref.html
+fails-if(Android) pref(dom.forms.number.hide_spin_buttons_when_no_hover_or_focus,false) != not-other-type-unthemed-1.html not-other-type-unthemed-1a-notref.html
 != not-other-type-unthemed-1.html not-other-type-unthemed-1b-notref.html
 
 # should look the same as type=text, except for the spin box
@@ -17,7 +17,7 @@ fuzzy(0-2,0-13) == show-value.html show-value-ref.html
 
 # disabled
 == number-disabled.html number-disabled-ref.html
-!= number-spinbox-disabled.html number-spinbox-disabled-notref.html
+fails-if(Android) pref(dom.forms.number.hide_spin_buttons_when_no_hover_or_focus,false) != number-spinbox-disabled.html number-spinbox-disabled-notref.html
 
 # auto width:
 == number-auto-width-1.html number-auto-width-1-ref.html
@@ -72,3 +72,5 @@ fuzzy(0-14,0-4) == clipped-text.html clipped-text-ref.html
 fails-if(useDrawSnapshot) needs-focus != caret-right.html caret-right-notref.html
 fails-if(useDrawSnapshot) needs-focus != caret-left-rtl.html caret-left-rtl-notref.html
 fails-if(useDrawSnapshot) needs-focus != caret-right-vertical.html caret-right-vertical-notref.html
+
+fails-if(Android) test-pref(dom.forms.number.hide_spin_buttons_when_no_hover_or_focus,true) ref-pref(dom.forms.number.hide_spin_buttons_when_no_hover_or_focus,false) != number.html number.html
diff --git a/layout/reftests/forms/input/radio/reftest.list b/layout/reftests/forms/input/radio/reftest.list
index 6c80eaf447..f500a83d0d 100644
--- a/layout/reftests/forms/input/radio/reftest.list
+++ b/layout/reftests/forms/input/radio/reftest.list
@@ -5,5 +5,5 @@
 != checked-native.html about:blank
 != checked-native-notref.html about:blank
 == radio-clamp-01.html radio-clamp-01-ref.html
-skip-if(OSX||winWidget||Android) == radio-clamp-02.html radio-clamp-02-ref.html
+skip-if(!gtkWidget) == radio-clamp-02.html radio-clamp-02-ref.html
 != radio-minimum-size.html radio-minimum-size-notref.html
diff --git a/layout/reftests/forms/input/text/autofill-author-background.html b/layout/reftests/forms/input/text/autofill-author-background.html
new file mode 100644
index 0000000000..691adaa1ff
--- /dev/null
+++ b/layout/reftests/forms/input/text/autofill-author-background.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<input type=text style="background-color: red; background-image: linear-gradient(red, blue);">
+<script>
+  let input = SpecialPowers.wrap(document.querySelector("input"));
+  SpecialPowers.Cc["@mozilla.org/satchel/form-fill-controller;1"].getService(SpecialPowers.Ci.nsIFormFillController).markAsAutofillField(input);
+  input.getBoundingClientRect(); // previewValue setter depends on the reframe posted by markAsAutofillField() having being processed...
+  input.previewValue = "Autofill";
+  SpecialPowers.wrap(window).windowUtils.addManuallyManagedState(input, "-moz-autofill-preview");
+</script>
diff --git a/layout/reftests/forms/input/text/reftest.list b/layout/reftests/forms/input/text/reftest.list
index b6217d46bc..6c649a5196 100644
--- a/layout/reftests/forms/input/text/reftest.list
+++ b/layout/reftests/forms/input/text/reftest.list
@@ -15,9 +15,10 @@ fuzzy(0-1,0-500) needs-focus == select.html select-ref.html
 == autofill-blank.html autofill-preview-blank.html
 != autofill.html autofill-blank.html
 != autofill-preview.html autofill-preview-blank.html
-!= autofill.html autofill-preview.html
+== autofill.html autofill-preview.html
 == autofill-prefilled-value.html autofill-preview.html
 == autofill-preview-line-height.html autofill-line-height.html
+== autofill-author-background.html autofill.html
 
 == pseudo-class-lock.html pseudo-class-lock-ref.html
 
diff --git a/layout/reftests/forms/placeholder/reftest.list b/layout/reftests/forms/placeholder/reftest.list
index 54ec3b06e0..1e00ce0131 100644
--- a/layout/reftests/forms/placeholder/reftest.list
+++ b/layout/reftests/forms/placeholder/reftest.list
@@ -18,9 +18,9 @@
 == placeholder-5.html placeholder-visible-ref.html
 
 # This tests assumes that the overflowing placeholder won't eat the padding, which is just not true in some platforms...
-fuzzy-if(winWidget,0-160,0-10) fuzzy-if(Android,0-160,0-41) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-146,0-317) == placeholder-6.html placeholder-overflow-ref.html
+fuzzy-if(winWidget,0-160,0-10) fuzzy-if(Android,0-160,0-41) == placeholder-6.html placeholder-overflow-ref.html
 
-skip-if(Android&&asyncPan) == placeholder-6-textarea.html placeholder-overflow-textarea-ref.html
+skip-if(Android) == placeholder-6-textarea.html placeholder-overflow-textarea-ref.html
 # needs-focus == placeholder-7.html placeholder-focus-ref.html
 # needs-focus == placeholder-8.html placeholder-focus-ref.html
 # needs-focus == placeholder-9.html placeholder-focus-ref.html
diff --git a/layout/reftests/forms/textarea/reftest.list b/layout/reftests/forms/textarea/reftest.list
index f27e99726e..ee9c32d4e9 100644
--- a/layout/reftests/forms/textarea/reftest.list
+++ b/layout/reftests/forms/textarea/reftest.list
@@ -12,7 +12,7 @@ skip-if(Android) != rtl.html no-resize.html # bug 834724
 fuzzy(0-1,0-1) == rtl.html rtl-dynamic-attr.html
 fuzzy(0-1,0-1) == rtl.html rtl-dynamic-style.html
 == rtl.html in-dynamic-rtl-doc.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,0-102,0-4168) == padding-scrollbar-placement.html padding-scrollbar-placement-ref.html
+== padding-scrollbar-placement.html padding-scrollbar-placement-ref.html
 == various-cols.html various-cols-ref.html
 == appearance-background-change.html appearance-background-change-ref.html
 != padding-text-overflow.html padding-text-overflow-notref.html
diff --git a/layout/reftests/forms/textbox/reftest.list b/layout/reftests/forms/textbox/reftest.list
index edb83da6e2..9717969ebd 100644
--- a/layout/reftests/forms/textbox/reftest.list
+++ b/layout/reftests/forms/textbox/reftest.list
@@ -8,4 +8,3 @@ skip-if(cocoaWidget||Android) != chrome://reftest/content/forms/textbox/accesske
 fuzzy(0-1,0-4) skip-if(cocoaWidget||Android) == chrome://reftest/content/forms/textbox/accesskey-4.xhtml chrome://reftest/content/forms/textbox/accesskey-4-ref.xhtml
 skip-if(cocoaWidget||Android) != chrome://reftest/content/forms/textbox/accesskey-4.xhtml chrome://reftest/content/forms/textbox/accesskey-4-notref.xhtml
 skip-if(Android) == chrome://reftest/content/forms/textbox/align-baseline-1.xhtml chrome://reftest/content/forms/textbox/align-baseline-1-ref.xhtml # test for bug 494901
-skip-if(Android) == chrome://reftest/content/forms/textbox/setsize.xhtml chrome://reftest/content/forms/textbox/setsize-ref.xhtml
diff --git a/layout/reftests/forms/textbox/setsize-ref.xhtml b/layout/reftests/forms/textbox/setsize-ref.xhtml
deleted file mode 100644
index 5db79ff9d9..0000000000
--- a/layout/reftests/forms/textbox/setsize-ref.xhtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-
-<hbox style="appearance: auto; -moz-default-appearance: textarea; width: 200px; height: 200px;"/>
-<html:div style="position:fixed;top:0;left:0;width:100%;height:100%;"></html:div>
-
-</window>
diff --git a/layout/reftests/forms/textbox/setsize.xhtml b/layout/reftests/forms/textbox/setsize.xhtml
deleted file mode 100644
index 14ccdfb27b..0000000000
--- a/layout/reftests/forms/textbox/setsize.xhtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-
-<html:textarea style="width: 200px; height: 200px; margin: 0; resize: none; box-sizing: border-box;"/>
-<html:div style="position:fixed;top:0;left:0;width:100%;height:100%;"></html:div>
-</window>
diff --git a/layout/reftests/high-contrast/reftest.list b/layout/reftests/high-contrast/reftest.list
index 0057a92b2e..d6e2dbbfe7 100644
--- a/layout/reftests/high-contrast/reftest.list
+++ b/layout/reftests/high-contrast/reftest.list
@@ -103,3 +103,4 @@ pref(ui.use_standins_for_native_colors,false) pref(browser.display.use_system_co
 
 # Forced color adjust
 pref(layout.css.forced-color-adjust.enabled,true) == backplate-force-color-adjust.html backplate-force-color-adjust-ref.html
+== transparent-textarea.html transparent-textarea-ref.html
diff --git a/layout/reftests/high-contrast/transparent-textarea-ref.html b/layout/reftests/high-contrast/transparent-textarea-ref.html
new file mode 100644
index 0000000000..1c9fb2288e
--- /dev/null
+++ b/layout/reftests/high-contrast/transparent-textarea-ref.html
@@ -0,0 +1,4 @@
+<!doctype html>
+<pre>
+  PASS
+</pre>
diff --git a/layout/reftests/high-contrast/transparent-textarea.html b/layout/reftests/high-contrast/transparent-textarea.html
new file mode 100644
index 0000000000..a82aef57d5
--- /dev/null
+++ b/layout/reftests/high-contrast/transparent-textarea.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<style>
+textarea {
+  color: transparent;
+  background: unset;
+  border: none;
+  resize: none;
+  padding: 0;
+  position: absolute;
+}
+</style>
+<textarea>
+  FAIL
+</textarea>
+<pre>
+  PASS
+</pre>
diff --git a/layout/reftests/image-element/reftest.list b/layout/reftests/image-element/reftest.list
index 2b31398ccf..a31ebb89b8 100644
--- a/layout/reftests/image-element/reftest.list
+++ b/layout/reftests/image-element/reftest.list
@@ -5,30 +5,30 @@ random == bug-364968.html bug-364968-ref.html
 == mozsetimageelement-02.html about:blank
 == image-outside-document-invalidate.html about:blank
 == canvas-outside-document-invalidate-01.html about:blank
-fails-if(azureSkia&&!winWidget) fails-if(cocoaWidget) fails-if(remoteCanvas&&swgl&&winWidget) == canvas-outside-document-invalidate-02.html about:blank # See bug 666800
+fails-if(!winWidget) fails-if(swgl&&winWidget) == canvas-outside-document-invalidate-02.html about:blank # See bug 666800
 #fails with Skia due to Skia bug http://code.google.com/p/skia/issues/detail?id=568
 fuzzy-if(winWidget,47-129,47-54) == element-paint-simple.html element-paint-simple-ref.html
 == element-paint-repeated.html element-paint-repeated-ref.html
 == element-paint-recursion.html element-paint-recursion-ref.html
 == element-paint-continuation.html element-paint-continuation-ref.html
 == element-paint-transform-01.html element-paint-transform-01-ref.html
-random-if(d2d) fuzzy-if(!useDrawSnapshot,255-255,39-42) == element-paint-transform-02.html element-paint-transform-02-ref.html # bug 587133
+random-if(winWidget) fuzzy-if(!useDrawSnapshot,255-255,39-42) == element-paint-transform-02.html element-paint-transform-02-ref.html # bug 587133
 == element-paint-background-size-01.html element-paint-background-size-01-ref.html
 == element-paint-background-size-02.html element-paint-background-size-02-ref.html
 fuzzy(0-255,0-4) == element-paint-transform-repeated.html element-paint-transform-repeated-ref.html # Bug 1475907
-fuzzy-if(d2d,0-255,0-24) fuzzy-if(!useDrawSnapshot,255-255,50-115) == element-paint-transform-03.html element-paint-transform-03-ref.html
+fuzzy-if(winWidget,0-255,0-24) fuzzy-if(!useDrawSnapshot,255-255,50-115) == element-paint-transform-03.html element-paint-transform-03-ref.html
 
 # For element() uses fallback / skia in WebRender, which antialiases differently from WR.
 # For Windows: bug 1496542, the scrollframe snaps differently.
 # For the rest: -ref the scrollframe is active and layerized differently with APZ.
-fuzzy(0-24,0-106) fuzzy-if(winWidget&&!layersGPUAccelerated,149-149,1203-1203) fuzzy-if(!useDrawSnapshot,1-48,5-68) fuzzy-if(winWidget,47-222,1197-1588) fuzzy-if(Android,0-40,0-81) == element-paint-native-widget.html element-paint-native-widget-ref.html
+fuzzy(0-24,0-106) fuzzy-if(!useDrawSnapshot,1-48,5-68) fuzzy-if(winWidget,47-222,1197-1588) fuzzy-if(Android,0-40,0-81) == element-paint-native-widget.html element-paint-native-widget-ref.html
 
 # This fails with CreateSamplingRestrictedDrawable removed
 fails-if(!Android&&!useDrawSnapshot) == element-paint-subimage-sampling-restriction.html about:blank
 == element-paint-clippath.html element-paint-clippath-ref.html
-fuzzy-if(!useDrawSnapshot,1-1,128-128) fuzzy-if(d2d,47-47,650-652) fuzzy-if(!useDrawSnapshot,36-39,704-738) == element-paint-sharpness-01a.html element-paint-sharpness-01b.html
+fuzzy-if(winWidget,47-47,650-652) fuzzy-if(!useDrawSnapshot,36-39,704-738) == element-paint-sharpness-01a.html element-paint-sharpness-01b.html
 fuzzy(0-1,0-326) fails-if(useDrawSnapshot) == element-paint-sharpness-01b.html element-paint-sharpness-01c.html
-fuzzy-if(!useDrawSnapshot,1-1,128-128) fuzzy-if(d2d,47-47,650-652) fuzzy-if(!useDrawSnapshot,36-39,704-738) == element-paint-sharpness-01c.html element-paint-sharpness-01d.html
+fuzzy-if(winWidget,47-47,650-652) fuzzy-if(!useDrawSnapshot,36-39,704-738) == element-paint-sharpness-01c.html element-paint-sharpness-01d.html
 == element-paint-sharpness-02a.html element-paint-sharpness-02b.html
 fails-if(useDrawSnapshot) == element-paint-sharpness-02b.html element-paint-sharpness-02c.html
 == element-paint-paintserversize-rounding-01.html element-paint-paintserversize-rounding-01-ref.html
diff --git a/layout/reftests/image/reftest.list b/layout/reftests/image/reftest.list
index ad07b512fe..e6e24a1cf5 100644
--- a/layout/reftests/image/reftest.list
+++ b/layout/reftests/image/reftest.list
@@ -1,5 +1,5 @@
 fuzzy-if(Android,0-8,0-30) fails-if(useDrawSnapshot) == background-image-zoom-1.html background-image-zoom-1-ref.html
-fails-if(usesRepeatResampling&&!winWidget) fails-if(useDrawSnapshot) == background-image-zoom-2.html about:blank
+fails-if(useDrawSnapshot) == background-image-zoom-2.html about:blank
 == image-in-iframe-1.html image-in-iframe-1-ref.html
 == image-seam-1a.html image-seam-1-ref.html
 == image-seam-1b.html image-seam-1-ref.html
diff --git a/layout/reftests/invalidation/reftest.list b/layout/reftests/invalidation/reftest.list
index 27b228fa2b..99465a7f7f 100644
--- a/layout/reftests/invalidation/reftest.list
+++ b/layout/reftests/invalidation/reftest.list
@@ -97,7 +97,7 @@ pref(layers.single-tile.enabled,false) != fast-scrolling.html about:blank
 == clip-path-invalidation-1d.html mask-invalidation-2-ref.html
 
 != fractional-transform-1.html about:blank
-skip-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)) != fractional-transform-2.html about:blank
+skip-if(winWidget) != fractional-transform-2.html about:blank
 != fractional-transform-3.html about:blank
 
 == partially-scrolled-svg-group.html partially-scrolled-svg-group-ref.html
diff --git a/layout/reftests/layers/reftest.list b/layout/reftests/layers/reftest.list
index f65a93a165..d200d69d70 100644
--- a/layout/reftests/layers/reftest.list
+++ b/layout/reftests/layers/reftest.list
@@ -16,19 +16,19 @@ skip != pull-background-animated-position-3.html about:blank # Fails because Pai
 skip != pull-background-animated-position-4.html about:blank # Fails because PaintedLayer item assignment and background pulling don't recognize overflow:hidden clips
 skip != pull-background-animated-position-5.html about:blank # Fails because ownLayer bounds don't anticipate changes of animated contents, but doesn't fail with event regions
 
-skip-if(!asyncPan) != pull-background-displayport-1.html about:blank
-skip-if(!asyncPan) != pull-background-displayport-2.html about:blank
-skip-if(!asyncPan) != pull-background-displayport-3.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
-skip-if(!asyncPan) != pull-background-displayport-4.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
-skip-if(!asyncPan) != pull-background-displayport-5.html about:blank
-skip-if(!asyncPan) != pull-background-displayport-6.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
+skip-if(useDrawSnapshot) != pull-background-displayport-1.html about:blank
+skip-if(useDrawSnapshot) != pull-background-displayport-2.html about:blank
+skip-if(useDrawSnapshot) != pull-background-displayport-3.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
+skip-if(useDrawSnapshot) != pull-background-displayport-4.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
+skip-if(useDrawSnapshot) != pull-background-displayport-5.html about:blank
+skip-if(useDrawSnapshot) != pull-background-displayport-6.html about:blank # fails with non-overlay scrollbars and event regions due to bug 1148515
 
 skip-if(Android&&emulator) fuzzy(0-2,0-30150) == opacity-blending.html opacity-blending-ref.html
 fuzzy(0-16,0-30) == mask-layer-transform.html mask-layer-transform-ref.html
 fuzzy-if(gtkWidget,0-1,0-17) fuzzy-if(Android,0-3,0-4) == forced-bg-color-outside-visible-region.html forced-bg-color-outside-visible-region-ref.html
 != layerize-over-fixed-bg-1.html about:blank
-skip-if(!asyncPan) != fixed-pos-scrolled-clip-layerize.html about:blank
-skip-if(!asyncPan) == fixed-pos-scrolled-clip-opacity-layerize.html fixed-pos-scrolled-clip-opacity-inside-layerize.html
+skip-if(useDrawSnapshot) != fixed-pos-scrolled-clip-layerize.html about:blank
+skip-if(useDrawSnapshot) == fixed-pos-scrolled-clip-opacity-layerize.html fixed-pos-scrolled-clip-opacity-inside-layerize.html
 
 fuzzy(0-1,0-8033) == opacity-background-1.html opacity-background-1-ref.html
 == opacity-flattening-large-image.html opacity-flattening-large-image-ref.html
diff --git a/layout/reftests/list-item/reftest.list b/layout/reftests/list-item/reftest.list
index 36ab01f78b..5ade8fe480 100644
--- a/layout/reftests/list-item/reftest.list
+++ b/layout/reftests/list-item/reftest.list
@@ -1,7 +1,7 @@
-fuzzy-if(OSX,0-55,0-4) == numbering-1.html numbering-1-ref.html
+fuzzy-if(cocoaWidget,0-55,0-4) == numbering-1.html numbering-1-ref.html
 == numbering-2.html numbering-2-ref.html
-fuzzy-if(OSX,0-11,0-1) == numbering-3.html numbering-3-ref.html
-fuzzy-if(OSX,0-76,0-2) == numbering-4.html numbering-4-ref.html
+fuzzy-if(cocoaWidget,0-11,0-1) == numbering-3.html numbering-3-ref.html
+fuzzy-if(cocoaWidget,0-76,0-2) == numbering-4.html numbering-4-ref.html
 == numbering-5.html numbering-5-ref.html
 == ol-reversed-1a.html ol-reversed-1-ref.html
 == ol-reversed-1b.html ol-reversed-1-ref.html
diff --git a/layout/reftests/mathml/largeop-1-ref.html b/layout/reftests/mathml/largeop-1-ref.html
deleted file mode 100644
index e69de29bb2..0000000000
--- a/layout/reftests/mathml/largeop-1-ref.html
+++ /dev/null
diff --git a/layout/reftests/mathml/largeop-1.html b/layout/reftests/mathml/largeop-1.html
deleted file mode 100644
index e69de29bb2..0000000000
--- a/layout/reftests/mathml/largeop-1.html
+++ /dev/null
diff --git a/layout/reftests/mathml/mathml-mmultiscript-base-ref.html b/layout/reftests/mathml/mathml-mmultiscript-base-ref.html
deleted file mode 100644
index 45f43e9f9b..0000000000
--- a/layout/reftests/mathml/mathml-mmultiscript-base-ref.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>mmultiscript with only base</title>
-	</head>
-	
-	<body>
-		<math>
-			<mmultiscripts>
-			<mtext>base</mtext>
-			</mmultiscripts>
-		</math>
-	</body>
-</html>
diff --git a/layout/reftests/mathml/mathml-mmultiscript-base.html b/layout/reftests/mathml/mathml-mmultiscript-base.html
deleted file mode 100644
index f2832df479..0000000000
--- a/layout/reftests/mathml/mathml-mmultiscript-base.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>mmultiscript with only base and none as placeholder</title>
-	</head>
-
-	<body>
-		<math> 
-			<mmultiscripts>
-				<mtext>base</mtext>
-				<none/>
-				<none/>
-			</mmultiscripts>
-		</math>
-	</body>
-</html>
diff --git a/layout/reftests/mathml/mathml-mmultiscript-mprescript-ref.html b/layout/reftests/mathml/mathml-mmultiscript-mprescript-ref.html
deleted file mode 100644
index b30e7fb976..0000000000
--- a/layout/reftests/mathml/mathml-mmultiscript-mprescript-ref.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>mmultiscript with mprescripts without none</title>
-	</head>
-
-	<body>
-		<math> 
-			<mmultiscripts>
-				<mtext>base</mtext>
-				<mprescripts/>
-			</mmultiscripts>
-		</math>
-	</body>
-</html>
diff --git a/layout/reftests/mathml/mathml-mmultiscript-mprescript.html b/layout/reftests/mathml/mathml-mmultiscript-mprescript.html
deleted file mode 100644
index 5bc0b5a5ad..0000000000
--- a/layout/reftests/mathml/mathml-mmultiscript-mprescript.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>mmultiscript with mprescripts with none as placeholders</title>
-	</head>
-	
-	<body>
-		<math>
-			<mmultiscripts>
-				<mtext>base</mtext>
-				<none/>
-				<none/>
-				<mprescripts/>
-			</mmultiscripts>
-
-		</math>
-	</body>
-</html>
diff --git a/layout/reftests/mathml/mirror-op-1-ref.html b/layout/reftests/mathml/mirror-op-1-ref.html
deleted file mode 100644
index d7515156c3..0000000000
--- a/layout/reftests/mathml/mirror-op-1-ref.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test mirror op</title></head>
-  <style type="text/css">
-    mo {
-      transform: scaleX(-1.0);
-    }
-  </style>
-  <body>
-
-    <p><math><mo>(</mo></math></p>
-    <p><math><mo>)</mo></math></p>
-    <p><math><mo>[</mo></math></p>
-    <p><math><mo>]</mo></math></p>
-    <p><math><mo>{</mo></math></p>
-    <p><math><mo>}</mo></math></p>
-    
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mirror-op-1.html b/layout/reftests/mathml/mirror-op-1.html
deleted file mode 100644
index bb59e16c23..0000000000
--- a/layout/reftests/mathml/mirror-op-1.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test mirror op</title></head>
-  <body>
-
-    <p><math dir="rtl"><mo>(</mo></math></p>
-    <p><math dir="rtl"><mo>)</mo></math></p>
-    <p><math dir="rtl"><mo>[</mo></math></p>
-    <p><math dir="rtl"><mo>]</mo></math></p>
-    <p><math dir="rtl"><mo>{</mo></math></p>
-    <p><math dir="rtl"><mo>}</mo></math></p>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mirror-op-2-ref.html b/layout/reftests/mathml/mirror-op-2-ref.html
deleted file mode 100644
index c67710cca6..0000000000
--- a/layout/reftests/mathml/mirror-op-2-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test mirror op</title></head>
-  <body>
-
-    <p><math display="block"><mo>&#x2211;</mo></math></p>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mirror-op-2.html b/layout/reftests/mathml/mirror-op-2.html
deleted file mode 100644
index 5db6819cfe..0000000000
--- a/layout/reftests/mathml/mirror-op-2.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test mirror op</title></head>
-  <body>
-
-    <p><math display="block" dir="rtl"><mo>&#x2211;</mo></math></p>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mirror-op-3-ref.html b/layout/reftests/mathml/mirror-op-3-ref.html
deleted file mode 100644
index fc3a183ef3..0000000000
--- a/layout/reftests/mathml/mirror-op-3-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test mirror op</title></head>
-  <body>
-
-    <p><math display="block"><mo>&#x221A;</mo></math></p>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mirror-op-3.html b/layout/reftests/mathml/mirror-op-3.html
deleted file mode 100644
index 501af10926..0000000000
--- a/layout/reftests/mathml/mirror-op-3.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test mirror op</title></head>
-  <body>
-
-    <p><math display="block" dir="rtl"><mo>&#x221A;</mo></math></p>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mirror-op-4-ref.html b/layout/reftests/mathml/mirror-op-4-ref.html
deleted file mode 100644
index 6c39a47a33..0000000000
--- a/layout/reftests/mathml/mirror-op-4-ref.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test mirror op</title></head>
-  <body>
-
-    <p><math display="block"><mo>&#x222B;</mo></math></p>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mirror-op-4.html b/layout/reftests/mathml/mirror-op-4.html
deleted file mode 100644
index ba1acf89f7..0000000000
--- a/layout/reftests/mathml/mirror-op-4.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test mirror op</title></head>
-  <body>
-
-    <p><math display="block" dir="rtl"><mo>&#x222B;</mo></math></p>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mmultiscript-align-ref.html b/layout/reftests/mathml/mmultiscript-align-ref.html
deleted file mode 100644
index 337852837f..0000000000
--- a/layout/reftests/mathml/mmultiscript-align-ref.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>alignment of mmultiscript sub/superscripts</title>
-  </head>
-
-  <body>
-    <math>
-      <mmultiscripts>
-        <mspace width="50px" height="50px" mathbackground="red"/>
-        <mrow>
-          <mspace width="50px" height="10px" mathbackground="blue"/>
-          <mspace width="50px" height="10px"/>
-        </mrow>
-        <mspace width="100px" height="10px" mathbackground="green"/>
-        <mprescripts/>
-        <mrow>
-          <mspace width="50px" height="10px"/>
-          <mspace width="50px" height="10px" mathbackground="blue"/>
-        </mrow>
-        <mspace width="100px" height="10px" mathbackground="green"/>
-      </mmultiscripts>
-    </math>
-    <br/>
-    <math>
-      <mmultiscripts>
-        <mspace width="50px" height="50px" mathbackground="red"/>
-        <mspace width="100px" height="10px" mathbackground="green"/>
-        <mrow>
-          <mspace width="50px" height="10px" mathbackground="blue"/>
-          <mspace width="50px" height="10px"/>
-        </mrow>
-        <mprescripts/>
-        <mspace width="100px" height="10px" mathbackground="green"/>
-        <mrow>
-          <mspace width="50px" height="10px"/>
-          <mspace width="50px" height="10px" mathbackground="blue"/>
-        </mrow>
-      </mmultiscripts>
-    </math>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mmultiscript-align.html b/layout/reftests/mathml/mmultiscript-align.html
deleted file mode 100644
index 44fb713a34..0000000000
--- a/layout/reftests/mathml/mmultiscript-align.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>alignment of mmultiscript sub/superscripts</title>
-  </head>
-
-  <body>
-    <math>
-      <mmultiscripts>
-        <mspace width="50px" height="50px" mathbackground="red"/>
-        <mrow>
-          <mspace width="50px" height="10px" mathbackground="blue"/>
-        </mrow>
-        <mspace width="100px" height="10px" mathbackground="green"/>
-        <mprescripts/>
-        <mrow>
-          <mspace width="50px" height="10px" mathbackground="blue"/>
-        </mrow>
-        <mspace width="100px" height="10px" mathbackground="green"/>
-      </mmultiscripts>
-    </math>
-    <br/>
-    <math>
-      <mmultiscripts>
-        <mspace width="50px" height="50px" mathbackground="red"/>
-        <mspace width="100px" height="10px" mathbackground="green"/>
-        <mrow>
-          <mspace width="50px" height="10px" mathbackground="blue"/>
-        </mrow>
-        <mprescripts/>
-        <mspace width="100px" height="10px" mathbackground="green"/>
-        <mrow>
-          <mspace width="50px" height="10px" mathbackground="blue"/>
-        </mrow>
-      </mmultiscripts>
-    </math>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mo-glyph-size-ref.html b/layout/reftests/mathml/mo-glyph-size-ref.html
deleted file mode 100644
index e4dd43747e..0000000000
--- a/layout/reftests/mathml/mo-glyph-size-ref.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-</head>
-<body>
-<!-- Bug 1219068 -->
-
-<div id="hider"
-     style="position:absolute; top:0; left:0; background-color:green;
-            height:1em; width:100%; z-index:1; padding-top:5px;
-            padding-bottom:5px;" />
-</body>
-</html>
diff --git a/layout/reftests/mathml/mo-glyph-size.html b/layout/reftests/mathml/mo-glyph-size.html
deleted file mode 100644
index c0cc726daf..0000000000
--- a/layout/reftests/mathml/mo-glyph-size.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<head>
-<meta charset="UTF-8">
-</head>
-<body>
-<!-- Bug 1219068 -->
-
-<math style="position:absolute; top: 0; font-size:1em;  z-index: 0;" display="block">
-<mrow>
-  <mo>|</mo>
-  <mrow>
-    <mi>f</mi>
-    <mrow>
-      <mn>(</mn>
-      <mi>x</mi>
-      <mn>)</mn>
-    </mrow>
-    <mn>-</mn>
-    <mrow>
-      <mi>f</mi>
-      <mrow>
-        <mn>(</mn>
-        <msub>
-          <mi>x</mi>
-          <mn>0</mn>
-        </msub>
-        <mn>)</mn>
-      </mrow>
-    </mrow>
-  </mrow>
-  <mo>|</mo>
-</mrow>
-</math>
-<div id="hider"
-     style="position:absolute; top:0; left:0; background-color:green;
-            height:1em; width:100%; z-index:1; padding-top:5px;
-            padding-bottom:5px; visibility:hidden" />
-  <script>
-    function obscureMathML() {
-      var hider = document.getElementById("hider");
-      hider.style.visibility="visible";
-      // The math should now be completely obscured
-
-      document.documentElement.removeAttribute("class");
-    }
-    window.addEventListener("MozReftestInvalidate", obscureMathML);
-  </script>
-</body>
-</html>
diff --git a/layout/reftests/mathml/mpadded-7-ref.html b/layout/reftests/mathml/mpadded-7-ref.html
deleted file mode 100644
index 50f14246ee..0000000000
--- a/layout/reftests/mathml/mpadded-7-ref.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test mpadded</title>
-  </head>
-  <body>
-    <math>
-      <mpadded mathbackground="red" height="100height" depth="0">
-        <mphantom>
-          <mtext>&#x1D687;<!-- Mathematical Monospace Capital X --></mtext>
-        </mphantom>
-      </mpadded>
-    </math>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mpadded-7.html b/layout/reftests/mathml/mpadded-7.html
deleted file mode 100644
index 94d51b5845..0000000000
--- a/layout/reftests/mathml/mpadded-7.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test mpadded</title>
-  </head>
-  <body>
-    <math>
-      <!--height in term of height should not depend on the characters-->
-      <mpadded mathbackground="red" height="100height" depth="0">
-        <mphantom>
-          <mtext>&#x1D692;<!-- Mathematical Monospace Small I --></mtext>
-        </mphantom>
-      </mpadded>
-    </math>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mpadded-8-ref.html b/layout/reftests/mathml/mpadded-8-ref.html
deleted file mode 100644
index e01e6498f2..0000000000
--- a/layout/reftests/mathml/mpadded-8-ref.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test mpadded</title>
-  </head>
-  <body>
-    <math>
-      <mpadded mathbackground="red" height="100width" depth="0">
-        <mphantom>
-          <mtext>&#x1D687;<!-- Mathematical Monospace Capital X --></mtext>
-        </mphantom>
-      </mpadded>
-    </math>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mpadded-8.html b/layout/reftests/mathml/mpadded-8.html
deleted file mode 100644
index 4f203d4225..0000000000
--- a/layout/reftests/mathml/mpadded-8.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test mpadded</title>
-  </head>
-  <body>
-    <math>
-      <!--height in term of width should not depend on the characters-->
-      <mpadded mathbackground="red" height="100width" depth="0">
-        <mphantom>
-          <mtext>&#x1D692;<!-- Mathematical Monospace Small I --></mtext>
-        </mphantom>
-      </mpadded>
-    </math>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mpadded-9-ref.html b/layout/reftests/mathml/mpadded-9-ref.html
deleted file mode 100644
index e2a4943edd..0000000000
--- a/layout/reftests/mathml/mpadded-9-ref.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test mpadded</title>
-  </head>
-  <body>
-    <math>
-      <mpadded mathbackground="red" width="100width">
-        <mphantom>
-          <mtext>&#x1D687;<!-- Mathematical Monospace Capital X --></mtext>
-        </mphantom>
-      </mpadded>
-    </math>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mpadded-9.html b/layout/reftests/mathml/mpadded-9.html
deleted file mode 100644
index 2b86721f50..0000000000
--- a/layout/reftests/mathml/mpadded-9.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test mpadded</title>
-  </head>
-  <body>
-    <math>
-      <!--with fixed width, height + depth should not depend on the characters-->
-      <mpadded mathbackground="red" width="100width">
-        <mphantom>
-          <mtext>&#x1D692;<!-- Mathematical Monospace Small I --></mtext>
-        </mphantom>
-      </mpadded>
-    </math>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/mstyle-2-ref.xhtml b/layout/reftests/mathml/mstyle-2-ref.xhtml
deleted file mode 100644
index a8843780cb..0000000000
--- a/layout/reftests/mathml/mstyle-2-ref.xhtml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="content-type"
-  content="application/xhtml+xml; charset=us-ascii" />
-  <title>Test mstyle</title>
-  <style type="text/css">
-    table { width: 100%;  border-collapse: collapse; }
-    td { border: solid black 1px; }
-  </style>
-</head>
-
-<body>
-
-<table>
-  <tbody>
-    <tr>
-      <td>mpadded: width</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <mtext>_</mtext>
-            <mpadded/>
-            <mtext>_</mtext>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mpadded: lspace</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <mtext>_</mtext>
-            <mpadded/>
-            <mtext>_</mtext>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mpadded: height</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <msup>
-              <mrow>
-                <mtext>_</mtext>
-                <mpadded/>
-                <mtext>_</mtext>
-              </mrow>
-              <mtext>_</mtext>
-            </msup>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mpadded: depth</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <msub>
-              <mrow>
-                <mtext>_</mtext>
-                <mpadded/>
-                <mtext>_</mtext>
-              </mrow>
-              <mtext>_</mtext>
-            </msub>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mspace: width</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <mtext>_</mtext>
-            <mspace/>
-            <mtext>_</mtext>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mspace: height</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <msup>
-              <mrow>
-                <mtext>_</mtext>
-                <mspace/>
-                <mtext>_</mtext>
-              </mrow>
-              <mtext>_</mtext>
-            </msup>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mspace: depth</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <msub>
-              <mrow>
-                <mtext>_</mtext>
-                <mspace/>
-                <mtext>_</mtext>
-              </mrow>
-              <mtext>_</mtext>
-            </msub>
-          </mstyle>
-        </math></td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/layout/reftests/mathml/mstyle-2.xhtml b/layout/reftests/mathml/mstyle-2.xhtml
deleted file mode 100644
index f11f3ad8cd..0000000000
--- a/layout/reftests/mathml/mstyle-2.xhtml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="content-type"
-  content="application/xhtml+xml; charset=us-ascii" />
-  <title>Test mstyle</title>
-  <style type="text/css">
-    table { width: 100%;  border-collapse: collapse; }
-    td { border: solid black 1px; }
-  </style>
-</head>
-
-<body>
-
-<!-- The attributes below should no longer have effect on <mstyle>/<math>
-     elements. See bug 838509 -->
-
-<table>
-  <tbody>
-    <tr>
-      <td>mpadded: width</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" width="1em">
-          <mstyle width="1em">
-            <mtext>_</mtext>
-            <mpadded/>
-            <mtext>_</mtext>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mpadded: lspace</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" lspace="1em">
-          <mstyle lspace="1em">
-            <mtext>_</mtext>
-            <mpadded/>
-            <mtext>_</mtext>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mpadded: height</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" height="1em">
-          <mstyle height="1em">
-            <msup>
-              <mrow>
-                <mtext>_</mtext>
-                <mpadded/>
-                <mtext>_</mtext>
-              </mrow>
-              <mtext>_</mtext>
-            </msup>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mpadded: depth</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" depth="1em">
-          <mstyle depth="1em">
-            <msub>
-              <mrow>
-                <mtext>_</mtext>
-                <mpadded/>
-                <mtext>_</mtext>
-              </mrow>
-              <mtext>_</mtext>
-            </msub>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mspace: width</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" width="1em">
-          <mstyle width="1em">
-            <mtext>_</mtext>
-            <mspace/>
-            <mtext>_</mtext>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mspace: height</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" height="1em">
-          <mstyle height="1em">
-            <msup>
-              <mrow>
-                <mtext>_</mtext>
-                <mspace/>
-                <mtext>_</mtext>
-              </mrow>
-              <mtext>_</mtext>
-            </msup>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mspace: depth</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" depth="1em">
-          <mstyle depth="1em">
-            <msub>
-              <mrow>
-                <mtext>_</mtext>
-                <mspace/>
-                <mtext>_</mtext>
-              </mrow>
-              <mtext>_</mtext>
-            </msub>
-          </mstyle>
-        </math></td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/layout/reftests/mathml/mstyle-3-ref.xhtml b/layout/reftests/mathml/mstyle-3-ref.xhtml
deleted file mode 100644
index 66c03f89ad..0000000000
--- a/layout/reftests/mathml/mstyle-3-ref.xhtml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="content-type"
-  content="application/xhtml+xml; charset=us-ascii" />
-  <title>Test mstyle</title>
-  <style type="text/css">
-    table { width: 100%;  border-collapse: collapse; }
-    td { border: solid black 1px; }
-  </style>
-</head>
-
-<body>
-
-<table>
-  <tbody>
-    <tr>
-      <td>mo: form</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <mrow>
-              <!-- We assume that the infix/postfix forms of _ do -->
-              <!-- not have the same lspace/rspace values in the operator dictionary -->
-              <mtext>_</mtext>
-              <mo>_</mo>
-              <mtext>_</mtext>
-            </mrow>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: lspace, rspace</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <mrow>
-              <!-- We assume that the infix form of _ has -->
-              <!-- nonzero lspace/rspace values in the operator dictionary -->
-              <mtext>_</mtext>
-              <mo>_</mo>
-              <mtext>_</mtext>
-            </mrow>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: stretchy</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <mover>
-              <!-- We assume that the arrow has stretchy=true in the operator dictionary -->
-              <mtext>abcd</mtext>
-              <mo>&#x2192;</mo>
-            </mover>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: accent</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <mover>
-              <!-- We assume &#x23de; has accent=true in the operator dictionary -->
-              <mrow>
-                <mi>x</mi>
-                <mo>+</mo>
-                <mi>y</mi>
-                <mo>+</mo>
-                <mi>z</mi>
-              </mrow>
-              <mo>&#x23de;</mo>
-            </mover>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: maxsize</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <mo>(</mo>
-            <mspace height="3em"/>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: minsize</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <mo>(</mo>
-            <mspace height="1em"/>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: symmetric</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <!-- We assume that ( has symmetric=true in the operator dictionary -->
-          <mstyle>
-            <mtext>_</mtext>
-            <mo minsize="200%">(</mo>
-            <mtext>_</mtext>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: movablelimits</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <!-- We assume that &#x2211; has movablelimits=true in the operator dictionary -->
-          <mstyle>
-            <munderover>
-              <mo>&#x2211;</mo>
-              <mi>a</mi>
-              <mi>b</mi>
-            </munderover>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: largeop</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
-          <!-- We assume that &#x2211; has largeop=true in the operator dictionary -->
-          <mstyle>
-            <mo>&#x2211;</mo>
-          </mstyle>
-        </math></td>
-    </tr>
-    <!-- 
-            fence: This attribute generally has no direct effect on the visual rendering.
-            separator: This attribute generally has no direct effect on the visual rendering.
-      -->
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/layout/reftests/mathml/mstyle-3.xhtml b/layout/reftests/mathml/mstyle-3.xhtml
deleted file mode 100644
index 4b395d3942..0000000000
--- a/layout/reftests/mathml/mstyle-3.xhtml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="content-type"
-  content="application/xhtml+xml; charset=us-ascii" />
-  <title>Test mstyle</title>
-  <style type="text/css">
-    table { width: 100%;  border-collapse: collapse; }
-    td { border: solid black 1px; }
-  </style>
-</head>
-
-<body>
-
-<!-- The attributes below (except math@display) should no longer have effect on
-     <mstyle>/<math> elements. See bug 838509 -->
-
-<table>
-  <tbody>
-    <tr>
-      <td>mo: form</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" form="postfix">
-          <mstyle form="postfix">
-            <mrow>
-              <!-- We assume that the infix/postfix forms of _ do -->
-              <!-- not have the same lspace/rspace values in the operator dictionary -->
-              <mtext>_</mtext>
-              <mo>_</mo>
-              <mtext>_</mtext>
-            </mrow>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: lspace, rspace</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" lspace="0" rspace="0">
-          <mstyle lspace="0" rspace="0">
-            <mrow>
-              <!-- We assume that the infix form of _ has -->
-              <!-- nonzero lspace/rspace values in the operator dictionary -->
-              <mtext>_</mtext>
-              <mo>_</mo>
-              <mtext>_</mtext>
-            </mrow>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: stretchy</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" stretchy="false">
-          <mstyle stretchy="false">
-            <mover>
-              <!-- We assume that the arrow has stretchy=true in the operator dictionary -->
-              <mtext>abcd</mtext>
-              <mo>&#x2192;</mo>
-            </mover>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: accent</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" accent="false">
-          <mstyle accent="false">
-            <mover>
-              <!-- We assume &#x23de; has accent=true in the operator dictionary -->
-              <mrow>
-                <mi>x</mi>
-                <mo>+</mo>
-                <mi>y</mi>
-                <mo>+</mo>
-                <mi>z</mi>
-              </mrow>
-              <mo>&#x23de;</mo>
-            </mover>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: maxsize</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" maxsize="100%">
-          <mstyle maxsize="100%">
-            <mo>(</mo>
-            <mspace height="3em"/>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: minsize</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" minsize="300%">
-          <mstyle minsize="300%">
-            <mo>(</mo>
-            <mspace height="1em"/>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: symmetric</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" symmetric="false">
-          <!-- We assume that ( has symmetric=true in the operator dictionary -->
-          <mstyle symmetric="false">
-            <mtext>_</mtext>
-            <mo minsize="200%">(</mo>
-            <mtext>_</mtext>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: movablelimits</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" movablelimits="false">
-          <!-- We assume that &#x2211; has movablelimits=true in the operator dictionary -->
-          <mstyle movablelimits="false">
-            <munderover>
-              <mo>&#x2211;</mo>
-              <mi>a</mi>
-              <mi>b</mi>
-            </munderover>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>mo: largeop</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" display="block" largeop="false">
-          <!-- We assume that &#x2211; has largeop=true in the operator dictionary -->
-          <mstyle largeop="false">
-            <mo>&#x2211;</mo>
-          </mstyle>
-        </math></td>
-    </tr>
-    <!-- 
-            fence: This attribute generally has no direct effect on the visual rendering.
-            separator: This attribute generally has no direct effect on the visual rendering.
-      -->
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/layout/reftests/mathml/mstyle-4-ref.xhtml b/layout/reftests/mathml/mstyle-4-ref.xhtml
deleted file mode 100644
index e82876083e..0000000000
--- a/layout/reftests/mathml/mstyle-4-ref.xhtml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="content-type"
-  content="application/xhtml+xml; charset=us-ascii" />
-  <title>Test mstyle</title>
-  <style type="text/css">
-    table { width: 100%;  border-collapse: collapse; }
-    td { border: solid black 1px; }
-  </style>
-</head>
-
-<body>
-
-<table>
-  <tbody>
-    <tr>
-      <td>mover: accent</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <mover>
-              <!-- We assume &#x23de; is accent in the operator dictionary -->
-              <mrow>
-                <mi>x</mi>
-                <mo>+</mo>
-                <mi>y</mi>
-                <mo>+</mo>
-                <mi>z</mi>
-              </mrow>
-              <mo>&#x23de;</mo>
-            </mover>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>munder: accentunder</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <munder>
-              <!-- We assume &#x23df; is accent in the operator dictionary -->
-              <mrow>
-                <mi>x</mi>
-                <mo>+</mo>
-                <mi>y</mi>
-                <mo>+</mo>
-                <mi>z</mi>
-              </mrow>
-              <mo>&#x23df;</mo>
-            </munder>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>munderover: accent, accentunder</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML">
-          <mstyle>
-            <munderover>
-              <!-- We assume &#x23de; and &#x23df; are accents in the operator dictionary -->
-              <mrow>
-                <mi>x</mi>
-                <mo>+</mo>
-                <mi>y</mi>
-                <mo>+</mo>
-                <mi>z</mi>
-              </mrow>
-              <mo>&#x23df;</mo>
-              <mo>&#x23de;</mo>
-            </munderover>
-          </mstyle>
-        </math></td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/layout/reftests/mathml/mstyle-4.xhtml b/layout/reftests/mathml/mstyle-4.xhtml
deleted file mode 100644
index e934977557..0000000000
--- a/layout/reftests/mathml/mstyle-4.xhtml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="content-type"
-  content="application/xhtml+xml; charset=us-ascii" />
-  <title>Test mstyle</title>
-  <style type="text/css">
-    table { width: 100%;  border-collapse: collapse; }
-    td { border: solid black 1px; }
-  </style>
-</head>
-
-<body>
-
-<!-- The attributes below should no longer have effect on <mstyle>/<math>
-     elements. See bug 838509 -->
-
-<table>
-  <tbody>
-    <tr>
-      <td>mover: accent</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" accent="false">
-          <mstyle accent="false">
-            <mover>
-              <!-- We assume &#x23de; is accent in the operator dictionary -->
-              <mrow>
-                <mi>x</mi>
-                <mo>+</mo>
-                <mi>y</mi>
-                <mo>+</mo>
-                <mi>z</mi>
-              </mrow>
-              <mo>&#x23de;</mo>
-            </mover>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>munder: accentunder</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" accentunder="false">
-          <mstyle accentunder="false">
-            <munder>
-              <!-- We assume &#x23df; is accent in the operator dictionary -->
-              <mrow>
-                <mi>x</mi>
-                <mo>+</mo>
-                <mi>y</mi>
-                <mo>+</mo>
-                <mi>z</mi>
-              </mrow>
-              <mo>&#x23df;</mo>
-            </munder>
-          </mstyle>
-        </math></td>
-    </tr>
-    <tr>
-      <td>munderover: accent, accentunder</td>
-      <td><math xmlns="http://www.w3.org/1998/Math/MathML" accent="false" accentunder="false">
-          <mstyle accent="false" accentunder="false">
-            <munderover>
-              <!-- We assume &#x23de; and &#x23df; are accents in the operator dictionary -->
-              <mrow>
-                <mi>x</mi>
-                <mo>+</mo>
-                <mi>y</mi>
-                <mo>+</mo>
-                <mi>z</mi>
-              </mrow>
-              <mo>&#x23df;</mo>
-              <mo>&#x23de;</mo>
-            </munderover>
-          </mstyle>
-        </math></td>
-    </tr>
-  </tbody>
-</table>
-</body>
-</html>
diff --git a/layout/reftests/mathml/multiscripts-1-ref.html b/layout/reftests/mathml/multiscripts-1-ref.html
deleted file mode 100644
index 2fcc142503..0000000000
--- a/layout/reftests/mathml/multiscripts-1-ref.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"><title>Comparison of script elements</title></head>
-  <body>
-    msubsup:
-    <math>
-      <mmultiscripts style="background: red;">
-	<mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-	<mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-	<mtext style="background-color: rgba(0, 255, 0, 0.4);">ccc</mtext>
-      </mmultiscripts>
-    </math>
-
-    <br><br>
-
-    msubsup:
-    <math>
-      <mmultiscripts style="background: red;">
-	<mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-	<mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-        <none/>
-      </mmultiscripts>
-    </math>
-
-    <br><br>
-
-    msup / msubsup:
-    <math>
-      <mmultiscripts style="background: red;">
-	<mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <none/>
-	<mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-      </mmultiscripts>
-    </math>
-
-    <math>
-      <mmultiscripts style="background: red;">
-	<mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <none/>
-	<mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-      </mmultiscripts>
-    </math>
-
-    <br><br>
-
-
-    mrow / msub:
-    <math>
-      <mrow style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-      </mrow>
-    </math>
-
-    <math>
-      <mrow style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-      </mrow>
-    </math>
-
-    <br><br>
-
-    msupsub:
-    <math>
-      <mmultiscripts style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <none />
-        <none />
-      </mmultiscripts>
-    </math>
-
-</body></html>
diff --git a/layout/reftests/mathml/multiscripts-1.html b/layout/reftests/mathml/multiscripts-1.html
deleted file mode 100644
index fa45ff3699..0000000000
--- a/layout/reftests/mathml/multiscripts-1.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"><title>Comparison of script elements</title></head>
-  <body>
-    msubsup:
-    <math>
-      <msubsup style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-        <mtext style="background-color: rgba(0, 255, 0, 0.4);">ccc</mtext>
-      </msubsup>
-    </math>
-
-    <br><br>
-
-    <!-- Different rules apply to msub, so it won't provide equivalent output -->
-    msubsup:
-    <math>
-      <msubsup style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-        <mrow></mrow>
-      </msubsup>
-    </math>
-
-    <br><br>
-
-    msup / msubsup:
-    <math>
-      <msup style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-      </msup>
-    </math>
-
-    <math>
-      <msubsup style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <mrow></mrow>
-        <mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-      </msubsup>
-    </math>
-
-    <br><br>
-
-    mrow / msub:
-    <math>
-      <mrow style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-      </mrow>
-    </math>
-
-    <math>
-      <msub style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <mrow></mrow>
-      </msub>
-    </math>
-
-    <br><br>
-
-    msupsub:
-    <math>
-      <msubsup style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <mrow></mrow>
-        <mrow></mrow>
-      </msubsup>
-    </math>
-
-</body></html>
diff --git a/layout/reftests/mathml/munder-mover-align-accent-false-ref.html b/layout/reftests/mathml/munder-mover-align-accent-false-ref.html
deleted file mode 100644
index ff98924f80..0000000000
--- a/layout/reftests/mathml/munder-mover-align-accent-false-ref.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title></title></head>
-  <body>
-    <h2> Test with accent="false" </h2>
-    <table border="1">
-      <tr>
-	<th colspan="2">mover</th>
-	<th colspan="2">munder</th>
-      </tr>
-      <tr>
-	<td align="center"><mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	  </mrow></td>
-      </tr>
-      <tr>
-	<td align="center">
-	  <math>
-	    <mover>
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	    </mover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <mover>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="blue"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </mover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munder>
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	    </munder>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munder>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="blue"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munder>
-	  </math>
-	  </td>
-      </tr>
-    </table>
-    <table>
-      <tr>
-	<th>
-	  <h5>Under & Over</h5>
-	  
-	  <math>
-	    <mrow>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </mrow>
-	  </math>
-	</th>
-	<th>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-	<th>
-	  <h5>Base</h5>
-	  
-	  <math>
-	    <mrow>
-	      <mspace height="15px" width="25px" mathbackground="blue"/>
-	    </mrow>
-	  </math>
-	</th>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/munder-mover-align-accent-false.html b/layout/reftests/mathml/munder-mover-align-accent-false.html
deleted file mode 100644
index 14696c286d..0000000000
--- a/layout/reftests/mathml/munder-mover-align-accent-false.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title></title></head>
-  <body>
-    <h2> Test with accent="false" </h2>
-    <table border="1">
-      <tr>
-	<th colspan="2">mover</th>
-	<th colspan="2">munder</th>
-      </tr>
-      <tr>
-	<td align="center"><mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	  </mrow></td>
-      </tr>
-      <tr>
-	<td align="center">
-	  <math>
-	    <mover>
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </mover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <mover>
-	      <mspace height="15px" width="25px" mathbackground="blue"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </mover>
-	  </math>
-	  </td>
-	<td align="center">
-	  <math>
-	    <munder>
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </munder>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munder>
-	      <mspace height="15px" width="25px" mathbackground="blue"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munder>
-	  </math>
-	  </td>
-      </tr>
-    </table>
-    <table>
-      <tr>
-      <th>
-	<h5>Under & Over</h5>
-      
-	<math>
-	  <mrow>
-	    <mspace height="15px" width="25px" mathbackground="red"/>
-	  </mrow>
-	</math>
-      </th>
-      <th>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-      <th>
-	<h5>Base</h5>
-	
-	<math>
-	  <mrow>
-	    <mspace height="15px" width="25px" mathbackground="blue"/>
-	  </mrow>
-	</math>
-      </th>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/munder-mover-align-accent-true-ref.html b/layout/reftests/mathml/munder-mover-align-accent-true-ref.html
deleted file mode 100644
index 9ed8c4e518..0000000000
--- a/layout/reftests/mathml/munder-mover-align-accent-true-ref.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title></title></head>
-  <body>
-    <h2> Test with accent="true" </h2>
-    <table border="1">
-      <tr>
-	<th colspan="2">mover</th>
-	<th colspan="2">munder</th>
-      </tr>
-      <tr>
-	<td align="center"><mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	  </mrow></td>
-      </tr>
-      <tr>
-	<td align="center">
-	  <math>
-	    <mover accent="true">
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	    </mover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <mover accent="true">
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="blue"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </mover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munder accentunder="true">
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	    </munder>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munder accentunder="true">
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="blue"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munder>
-	  </math>
-	  </td>
-      </tr>
-    </table>
-    <table>
-      <tr>
-	<th>
-	  <h5>Under & Over</h5>
-	  
-	  <math>
-	    <mrow>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </mrow>
-	  </math>
-	</th>
-	<th>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-	<th>
-	  <h5>Base</h5>
-	  
-	  <math>
-	    <mrow>
-	      <mspace height="15px" width="25px" mathbackground="blue"/>
-	    </mrow>
-	  </math>
-	</th>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/munder-mover-align-accent-true.html b/layout/reftests/mathml/munder-mover-align-accent-true.html
deleted file mode 100644
index e98e0ef677..0000000000
--- a/layout/reftests/mathml/munder-mover-align-accent-true.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title></title></head>
-  <body>
-    <h2> Test with accent="true" </h2>
-    <table border="1">
-      <tr>
-	<th colspan="2">mover</th>
-	<th colspan="2">munder</th>
-      </tr>
-      <tr>
-	<td align="center"><mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow>
-	</td>
-	<td align="center">
-	  <mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	  </mrow></td>
-      </tr>
-      <tr>
-	<td align="center">
-	  <math>
-	    <mover accent="true">
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </mover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <mover accent="true">
-	      <mspace height="15px" width="25px" mathbackground="blue"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </mover>
-	  </math>
-	  </td>
-	<td align="center">
-	  <math>
-	    <munder accentunder="true">
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </munder>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munder accentunder="true">
-	      <mspace height="15px" width="25px" mathbackground="blue"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munder>
-	  </math>
-	  </td>
-      </tr>
-    </table>
-    <table>
-      <tr>
-      <th>
-	<h5>Under & Over</h5>
-      
-	<math>
-	  <mrow>
-	    <mspace height="15px" width="25px" mathbackground="red"/>
-	  </mrow>
-	</math>
-      </th>
-      <th>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-      <th>
-	<h5>Base</h5>
-	
-	<math>
-	  <mrow>
-	    <mspace height="15px" width="25px" mathbackground="blue"/>
-	  </mrow>
-	</math>
-      </th>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/munderover-align-accent-false-ref.html b/layout/reftests/mathml/munderover-align-accent-false-ref.html
deleted file mode 100644
index 7948407abf..0000000000
--- a/layout/reftests/mathml/munderover-align-accent-false-ref.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title></title></head>
-  <body>
-    <h2> Test with accent="false" </h2>
-    <table border="1">
-      <tr>
-	<th colspan="6">munderover</th>
-      </tr>
-      <tr>
-	<td align="center"><math><mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	    <mo>&lt;</mo>
-	    <mi>Under<mi>
-	  </mrow></math>
-	</td>
-	<td align="center">
-	  <math><mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	    <mo>&gt;</mo>
-	    <mi>Under</mi>
-	  </mrow></math>
-	</td>
-	<td align="center">
-	  <math><mrow>
-	    <mi>Over = Under</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow></math>
-	</td>
-	<td align="center"><math><mrow>
-	    <mi>Over = Under</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	</mrow></math></td>
-      </tr>
-      <tr>
-	<td align="center">
-	  <math>
-	    <munderover accent="false" accentunder="false">
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="50px" mathbackground="blue"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	    </munderover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munderover accent="false" accentunder="false">
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="50px" mathbackground="blue"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munderover accent="false" accentunder="false">
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	    </munderover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munderover accent="false" accentunder="false">
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="blue"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	  </td>
-      </tr>
-    </table>
-    <table>
-      <tr>
-	<th>
-	  <h5>Under & Over</h5>
-	  
-	  <math>
-	    <mrow>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </mrow>
-	  </math>
-	</th>
-	<th>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-	<th>
-	  <h5>Base</h5>
-	  
-	  <math>
-	    <mrow>
-	      <mspace height="15px" width="25px" mathbackground="blue"/>
-	    </mrow>
-	  </math>
-	</th>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/munderover-align-accent-false.html b/layout/reftests/mathml/munderover-align-accent-false.html
deleted file mode 100644
index d2ab965d96..0000000000
--- a/layout/reftests/mathml/munderover-align-accent-false.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title></title></head>
-  <body>
-    <h2> Test with accent="false" </h2>
-    <table border="1">
-      <tr>
-	<th colspan="4">munderover</th>
-      </tr>
-      <tr>
-	<td align="center"><math><mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	    <mo>&lt;</mo>
-	    <mi>Under<mi>
-	  </mrow></math>
-	</td>
-	<td align="center">
-	  <math><mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	    <mo>&gt;</mo>
-	    <mi>Under</mi>
-	  </mrow></math>
-	</td>
-	<td align="center">
-	  <math><mrow>
-	    <mi>Over = Under</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow></math>
-	</td>
-	<td align="center"><math><mrow>
-	    <mi>Over = Under</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	</mrow></math></td>
-      </tr>
-      <tr>
-	<td align="center">
-	  <math>
-	    <munderover>
-	      <mspace height="15px" width="50px" mathbackground="blue"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munderover>
-	      <mspace height="15px" width="50px" mathbackground="blue"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	  </td>
-	<td align="center">
-	  <math>
-	    <munderover>
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munderover>
-	      <mspace height="15px" width="25px" mathbackground="blue"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	</td>
-      </tr>
-    </table>
-    <table>
-      <tr>
-      <th>
-	<h5>Under & Over</h5>
-      
-	<math>
-	  <mrow>
-	    <mspace height="15px" width="25px" mathbackground="red"/>
-	  </mrow>
-	</math>
-      </th>
-      <th>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-      <th>
-	<h5>Base</h5>
-	
-	<math>
-	  <mrow>
-	    <mspace height="15px" width="25px" mathbackground="blue"/>
-	  </mrow>
-	</math>
-      </th>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/munderover-align-accent-true-ref.html b/layout/reftests/mathml/munderover-align-accent-true-ref.html
deleted file mode 100644
index d4c88c06e1..0000000000
--- a/layout/reftests/mathml/munderover-align-accent-true-ref.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title></title></head>
-  <body>
-    <h2> Test with accent="true" </h2>
-    <table border="1">
-      <tr>
-	<th colspan="6">munderover</th>
-      </tr>
-      <tr>
-	<td align="center"><math><mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	    <mo>&lt;</mo>
-	    <mi>Under<mi>
-	  </mrow></math>
-	</td>
-	<td align="center">
-	  <math><mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	    <mo>&gt;</mo>
-	    <mi>Under</mi>
-	  </mrow></math>
-	</td>
-	<td align="center">
-	  <math><mrow>
-	    <mi>Over = Under</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow></math>
-	</td>
-	<td align="center"><math><mrow>
-	    <mi>Over = Under</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	</mrow></math></td>
-      </tr>
-      <tr>
-	<td align="center">
-	  <math>
-	    <munderover accent="true" accentunder="true">
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="50px" mathbackground="blue"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	    </munderover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munderover accent="true" accentunder="true">
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="50px" mathbackground="blue"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munderover accent="true" accentunder="true">
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="red"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	    </munderover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munderover accent="true" accentunder="true">
-	      <mrow>
-		<mspace height="15px" width="25px"/>
-		<mspace height="15px" width="25px" mathbackground="blue"/>
-		<mspace height="15px" width="25px"/>
-	      </mrow>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	  </td>
-      </tr>
-    </table>
-    <table>
-      <tr>
-	<th>
-	  <h5>Under & Over</h5>
-	  
-	  <math>
-	    <mrow>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </mrow>
-	  </math>
-	</th>
-	<th>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-	<th>
-	  <h5>Base</h5>
-	  
-	  <math>
-	    <mrow>
-	      <mspace height="15px" width="25px" mathbackground="blue"/>
-	    </mrow>
-	  </math>
-	</th>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/munderover-align-accent-true.html b/layout/reftests/mathml/munderover-align-accent-true.html
deleted file mode 100644
index 3067ae5ea8..0000000000
--- a/layout/reftests/mathml/munderover-align-accent-true.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title></title></head>
-  <body>
-    <h2> Test with accent="true" </h2>
-    <table border="1">
-      <tr>
-	<th colspan="4">munderover</th>
-      </tr>
-      <tr>
-	<td align="center"><math><mrow>
-	    <mi>Over</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	    <mo>&lt;</mo>
-	    <mi>Under<mi>
-	  </mrow></math>
-	</td>
-	<td align="center">
-	  <math><mrow>
-	    <mi>Over</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	    <mo>&gt;</mo>
-	    <mi>Under</mi>
-	  </mrow></math>
-	</td>
-	<td align="center">
-	  <math><mrow>
-	    <mi>Over = Under</mi>
-	    <mo>&lt;</mo>
-	    <mi>Base</mi>
-	  </mrow></math>
-	</td>
-	<td align="center"><math><mrow>
-	    <mi>Over = Under</mi>
-	    <mo>&gt;</mo>
-	    <mi>Base</mi>
-	</mrow></math></td>
-      </tr>
-      <tr>
-	<td align="center">
-	  <math>
-	    <munderover accent="true" accentunder="true">
-	      <mspace height="15px" width="50px" mathbackground="blue"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munderover accent="true" accentunder="true">
-	      <mspace height="15px" width="50px" mathbackground="blue"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	  </td>
-	<td align="center">
-	  <math>
-	    <munderover accent="true" accentunder="true">
-	      <mspace height="15px" width="75px" mathbackground="blue"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	      <mspace height="15px" width="25px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	</td>
-	<td align="center">
-	  <math>
-	    <munderover accent="true" accentunder="true">
-	      <mspace height="15px" width="25px" mathbackground="blue"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	      <mspace height="15px" width="75px" mathbackground="red"/>
-	    </munderover>
-	  </math>
-	</td>
-      </tr>
-    </table>
-    <table>
-      <tr>
-      <th>
-	<h5>Under & Over</h5>
-      
-	<math>
-	  <mrow>
-	    <mspace height="15px" width="25px" mathbackground="red"/>
-	  </mrow>
-	</math>
-      </th>
-      <th>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
-      <th>
-	<h5>Base</h5>
-	
-	<math>
-	  <mrow>
-	    <mspace height="15px" width="25px" mathbackground="blue"/>
-	  </mrow>
-	</math>
-      </th>
-      </tr>
-    </table>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/munderover-empty-scripts-ref.html b/layout/reftests/mathml/munderover-empty-scripts-ref.html
deleted file mode 100644
index 27d858309d..0000000000
--- a/layout/reftests/mathml/munderover-empty-scripts-ref.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test munderover with empty scripts</title>
-  </head>
-  <body>
-
-    <p>munder / munderover with empty overscript:
-    <math>
-      <munderover style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-        <mspace></mspace>
-      </munderover>
-    </math></p>
-
-    <p>mover / munderover with empty underscript:
-    <math>
-      <munderover style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <mspace></mspace>
-        <mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-      </munderover>
-    </math></p>
-
-    <p>mrow / munder with empty scripts:
-    <math>
-      <munderover style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <mspace></mspace>
-        <mspace></mspace>
-      </munderover>
-    </math></p>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/munderover-empty-scripts.html b/layout/reftests/mathml/munderover-empty-scripts.html
deleted file mode 100644
index 5704c5c74d..0000000000
--- a/layout/reftests/mathml/munderover-empty-scripts.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Test munderover with empty scripts</title>
-  </head>
-  <body>
-
-    <p>munder / munderover with empty overscript:
-    <math>
-      <munder style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-      </munder>
-    </math></p>
-
-    <p>mover / munderover with empty underscript:
-    <math>
-      <mover style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-        <mtext style="background-color: rgba(0, 255, 0, 0.4);">bbb</mtext>
-      </mover>
-    </math></p>
-
-    <p>mrow / munder with empty scripts:
-    <math>
-      <mrow style="background: red;">
-        <mtext style="background-color: rgba(0, 0, 255, 0.4);">AAA</mtext>
-      </mrow>
-    </math></p>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/overbar-width-1-ref.xhtml b/layout/reftests/mathml/overbar-width-1-ref.xhtml
deleted file mode 100644
index 64e89f403f..0000000000
--- a/layout/reftests/mathml/overbar-width-1-ref.xhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <style type="text/css">
-      html { background-color: grey; }
-      div { display: inline-block;
-            font-size: 30px;
-            line-height: 60px; /* Ensure space for overbar */
-            border: 1px solid white;
-            padding: 2px; /* 10% error allowed in char selection */
-            background-color: black;
-            color: red; }
-    </style>
-  </head>
-<body>
-  <div>
-    <math xmlns="http://www.w3.org/1998/Math/MathML">
-      <mphantom>
-	<mover>
-	  <mi>ai</mi>
-	  <mo>&#xaf;</mo>
-	</mover>
-      </mphantom>
-    </math>
-  </div>
-</body>
-</html>
diff --git a/layout/reftests/mathml/overbar-width-1.xhtml b/layout/reftests/mathml/overbar-width-1.xhtml
deleted file mode 100644
index ab261d061d..0000000000
--- a/layout/reftests/mathml/overbar-width-1.xhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Check width of stretchy OverBar</title>
-    <style type="text/css">
-      html { background-color: grey; }
-      div { display: inline-block;
-            font-size: 30px;
-            line-height: 60px; /* Ensure space for overbar */
-            border: 1px solid white;
-            padding: 2px; /* 10% error allowed in char selection */
-            background-color: black;
-            color: black; }
-    </style>
-  </head>
-<body>
-  <div>
-    <math xmlns="http://www.w3.org/1998/Math/MathML">
-      <mover>
-	<mi>ai</mi>
-	<mo>&#xaf;</mo>
-      </mover>
-    </math>
-  </div>
-</body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-1.html b/layout/reftests/mathml/radicalbar-1.html
deleted file mode 100644
index 326164c0fa..0000000000
--- a/layout/reftests/mathml/radicalbar-1.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-  <html>
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="hidden">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="hidden">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="visible">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-1a.html b/layout/reftests/mathml/radicalbar-1a.html
deleted file mode 100644
index bf2e5147ae..0000000000
--- a/layout/reftests/mathml/radicalbar-1a.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom=".5">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="hidden">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="hidden">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="visible">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-1b.html b/layout/reftests/mathml/radicalbar-1b.html
deleted file mode 100644
index a469943e79..0000000000
--- a/layout/reftests/mathml/radicalbar-1b.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom=".4">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="hidden">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="hidden">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="visible">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-1c.html b/layout/reftests/mathml/radicalbar-1c.html
deleted file mode 100644
index 0485fe4136..0000000000
--- a/layout/reftests/mathml/radicalbar-1c.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom=".3">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="hidden">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="hidden">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="visible">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-1d.html b/layout/reftests/mathml/radicalbar-1d.html
deleted file mode 100644
index f89db4ded3..0000000000
--- a/layout/reftests/mathml/radicalbar-1d.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom=".2">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="hidden">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="hidden">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="visible">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-2.html b/layout/reftests/mathml/radicalbar-2.html
deleted file mode 100644
index 1870493cb4..0000000000
--- a/layout/reftests/mathml/radicalbar-2.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-  <html>
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="hidden">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="visible">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="hidden">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-2a.html b/layout/reftests/mathml/radicalbar-2a.html
deleted file mode 100644
index 9856fa868c..0000000000
--- a/layout/reftests/mathml/radicalbar-2a.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom="0.5">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="hidden">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="visible">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="hidden">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-2b.html b/layout/reftests/mathml/radicalbar-2b.html
deleted file mode 100644
index 7df074c40e..0000000000
--- a/layout/reftests/mathml/radicalbar-2b.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom="0.4">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="hidden">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="visible">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="hidden">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-2c.html b/layout/reftests/mathml/radicalbar-2c.html
deleted file mode 100644
index 138bad31ab..0000000000
--- a/layout/reftests/mathml/radicalbar-2c.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom="0.3">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="hidden">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="visible">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="hidden">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-2d.html b/layout/reftests/mathml/radicalbar-2d.html
deleted file mode 100644
index 7f12882422..0000000000
--- a/layout/reftests/mathml/radicalbar-2d.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom="0.2">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="hidden">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="visible">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="hidden">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-3.html b/layout/reftests/mathml/radicalbar-3.html
deleted file mode 100644
index 12fa3ae050..0000000000
--- a/layout/reftests/mathml/radicalbar-3.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-  <html>
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="visible">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="hidden">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="hidden">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-3a.html b/layout/reftests/mathml/radicalbar-3a.html
deleted file mode 100644
index 24ebfec8e5..0000000000
--- a/layout/reftests/mathml/radicalbar-3a.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom="0.5">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="visible">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="hidden">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="hidden">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-3b.html b/layout/reftests/mathml/radicalbar-3b.html
deleted file mode 100644
index 1aeafb6cb7..0000000000
--- a/layout/reftests/mathml/radicalbar-3b.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom="0.4">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="visible">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="hidden">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="hidden">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-3c.html b/layout/reftests/mathml/radicalbar-3c.html
deleted file mode 100644
index e9e7e7ae55..0000000000
--- a/layout/reftests/mathml/radicalbar-3c.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom="0.3">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="visible">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="hidden">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="hidden">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/radicalbar-3d.html b/layout/reftests/mathml/radicalbar-3d.html
deleted file mode 100644
index 7d780af44c..0000000000
--- a/layout/reftests/mathml/radicalbar-3d.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-  <html reftest-zoom="0.2">
-  <head>
-    <!-- Default to invisible text -->
-    <style type="text/css" media="screen, print">
-      .hidden {
-        color: white;
-      }
-      .visible {
-        color: black;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- Nest successive radicals and test that the horizontal bar of one of them is drawn.
-         Because the comparison is for inequality with about:blank, at most one can be visible -->
-    <math>
-      <mrow>
-        <msqrt class="hidden">
-          <mspace width="1em" height="1em" />
-          <msqrt class="hidden">
-            <mspace width="1em" height="1em" />
-            <msqrt class="hidden">
-              <mspace width="1em" height="1em" />
-              <msqrt class="hidden">
-                <mspace width="1em" height="1em" />
-                <msqrt class="visible">
-                  <mspace width="1em" height="1em" />
-                  <msqrt class="hidden">
-                    <mspace width="1em" height="1em" />
-                    <msqrt class="hidden">
-                      <mspace width="20em" height="1em" />
-                    </msqrt>
-                  </msqrt>
-                </msqrt>
-              </msqrt>
-            </msqrt>
-          </msqrt>
-        </msqrt>
-      </mrow>
-    </math>
-
-    <!-- Block out all but the horizontal bar of the visible radical -->
-    <div style="position: absolute; top: 5px; left: 0px;
-                width: 20em; height: 10em; background: white;"></div>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list
deleted file mode 100644
index b143a25174..0000000000
--- a/layout/reftests/mathml/reftest.list
+++ /dev/null
@@ -1,55 +0,0 @@
-random-if(smallScreen&&Android) fuzzy(0-255,0-200) fuzzy-if(geckoview,201-216,200-250) fuzzy-if(winWidget,114-255,245-361) fuzzy-if(OSX,79-153,240-250) == mirror-op-1.html mirror-op-1-ref.html
-!= mirror-op-2.html mirror-op-2-ref.html
-!= mirror-op-3.html mirror-op-3-ref.html
-!= mirror-op-4.html mirror-op-4-ref.html
-== overbar-width-1.xhtml overbar-width-1-ref.xhtml
-== stretchy-largeop-1.html stretchy-largeop-1-ref.html
-== stretchy-largeop-2.html stretchy-largeop-2-ref.html
-== stretchy-largeop-3.html stretchy-largeop-3-ref.html
-== underbar-width-1.xhtml underbar-width-1-ref.xhtml
-== semantics-1.xhtml semantics-1-ref.xhtml
-== semantics-2.html semantics-2-ref.html
-== semantics-3.html semantics-3-ref.html
-pref(mathml.stixgeneral_operator_stretching.disabled,false) == semantics-5.html semantics-5-ref.html # bug 1309429; bug 1648335
-fuzzy-if(OSX,0-16,0-8) == mstyle-3.xhtml mstyle-3-ref.xhtml
-fuzzy-if(OSX,0-1,0-4) == mstyle-4.xhtml mstyle-4-ref.xhtml
-== scale-stretchy-1.xhtml scale-stretchy-1-ref.xhtml
-!= scale-stretchy-2.xhtml scale-stretchy-2-ref.xhtml
-fails-if(OSX>=1010) == scale-stretchy-3.xhtml scale-stretchy-3-ref.xhtml
-!= scale-stretchy-4.xhtml scale-stretchy-4-ref.xhtml
-!= scale-stretchy-5.xhtml scale-stretchy-5-ref.xhtml
-!= stretchy-1.html stretchy-1-ref.html
-== mpadded-7.html mpadded-7-ref.html
-== mpadded-8.html mpadded-8-ref.html
-== mpadded-9.html mpadded-9-ref.html
-== scriptlevel-movablelimits-1.html scriptlevel-movablelimits-1-ref.html
-== munderover-align-accent-false.html munderover-align-accent-false-ref.html
-== munderover-align-accent-true.html munderover-align-accent-true-ref.html
-== munder-mover-align-accent-true.html munder-mover-align-accent-true-ref.html
-== munder-mover-align-accent-false.html munder-mover-align-accent-false-ref.html
-== munderover-empty-scripts.html munderover-empty-scripts-ref.html
-== mo-glyph-size.html mo-glyph-size-ref.html
-fuzzy(0-1,0-80) fuzzy-if(Android,0-255,0-105) fuzzy-if(gtkWidget,0-255,0-136) skip-if(winWidget) == multiscripts-1.html multiscripts-1-ref.html # Windows: bug 1314684; Android: bug 1392254; Linux: bug 1599638
-== mathml-mmultiscript-base.html mathml-mmultiscript-base-ref.html
-== mathml-mmultiscript-mprescript.html mathml-mmultiscript-mprescript-ref.html
-== mmultiscript-align.html mmultiscript-align-ref.html
-fails-if(winWidget) fuzzy-if(gtkWidget,255-255,776226-776226) == subscript-italic-correction.html subscript-italic-correction-ref.html # bug 961482 (Windows), bug 1599640 (Linux)
-
-# radicalbar*.html tests rely on reftest-zoom to verify the visibility of the
-# radical bar at different zoom levels. There does not seem to be any equivalent
-# way of testing that via WPT. See bug 1850661.
-!= radicalbar-1.html about:blank
-!= radicalbar-1a.html about:blank
-!= radicalbar-1b.html about:blank
-!= radicalbar-1c.html about:blank
-!= radicalbar-1d.html about:blank
-!= radicalbar-2.html about:blank
-!= radicalbar-2a.html about:blank
-!= radicalbar-2b.html about:blank
-!= radicalbar-2c.html about:blank
-!= radicalbar-2d.html about:blank
-!= radicalbar-3.html about:blank
-!= radicalbar-3a.html about:blank
-!= radicalbar-3b.html about:blank
-!= radicalbar-3c.html about:blank
-!= radicalbar-3d.html about:blank
diff --git a/layout/reftests/mathml/scale-stretchy-1-ref.xhtml b/layout/reftests/mathml/scale-stretchy-1-ref.xhtml
deleted file mode 100644
index e1182941c0..0000000000
--- a/layout/reftests/mathml/scale-stretchy-1-ref.xhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Maximal size for a vertical arrow stretched by scaling</title>
-  </head>
-
-  <body>
-
-    <table style="position: absolute;">
-      <tr>
-        <td><div style="height: 200px; width: 5px; background: black"/></td>
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <mrow>
-              <mspace height="50px" depth="50px" width="5px"
-                      style="background: yellow" />
-              <mspace height="55px" depth="55px" width="50px"
-                      style="background: red;"/>
-            </mrow>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/scale-stretchy-1.xhtml b/layout/reftests/mathml/scale-stretchy-1.xhtml
deleted file mode 100644
index 76f0620dfd..0000000000
--- a/layout/reftests/mathml/scale-stretchy-1.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Maximal size for a vertical arrow stretched by scaling</title>
-  </head>
-
-  <body>
-
-    <table style="position: absolute;">
-      <tr>
-        <td><div style="height: 200px; width: 5px; background: black"/></td>
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <mrow>
-              <mspace height="50px" depth="50px" width="5px"
-                      style="background: yellow" />
-              <mo style="color: blue;">&#x290B;</mo>
-            </mrow>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-    <table style="position: absolute;">
-      <tr>
-        <td><div style="height: 200px; width: 5px; background: black"/></td>
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <mrow>
-              <mspace height="50px" depth="50px" width="5px"
-                      style="background: yellow" />
-              <mspace height="55px" depth="55px" width="50px"
-                      style="background: red;"/>
-            </mrow>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/scale-stretchy-2-ref.xhtml b/layout/reftests/mathml/scale-stretchy-2-ref.xhtml
deleted file mode 100644
index e219fe0be6..0000000000
--- a/layout/reftests/mathml/scale-stretchy-2-ref.xhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Minimal size for a vertical arrow stretched by scaling</title>
-  </head>
-
-  <body>
-
-    <table style="position: absolute;">
-      <tr>
-        <td><div style="height: 200px; width: 5px; background: black"/></td>
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <mrow>
-              <mspace height="50px" depth="50px" width="5px"
-                      style="background: yellow" />
-              <mspace height="44px" depth="44px" width="50px"
-                      style="background: green;"/>
-            </mrow>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/scale-stretchy-2.xhtml b/layout/reftests/mathml/scale-stretchy-2.xhtml
deleted file mode 100644
index e89910586d..0000000000
--- a/layout/reftests/mathml/scale-stretchy-2.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Minimal size for a vertical arrow stretched by scaling</title>
-  </head>
-
-  <body>
-
-    <table style="position: absolute;">
-      <tr>
-        <td><div style="height: 200px; width: 5px; background: black"/></td>
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <mrow>
-              <mspace height="50px" depth="50px" width="5px"
-                      style="background: yellow" />
-              <mo style="color: blue;">&#x290B;</mo>
-            </mrow>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-    <table style="position: absolute;">
-      <tr>
-        <td><div style="height: 200px; width: 5px; background: black"/></td>
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <mrow>
-              <mspace height="50px" depth="50px" width="5px"
-                      style="background: yellow" />
-              <mspace height="44px" depth="44px" width="50px"
-                      style="background: green;"/>
-            </mrow>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/scale-stretchy-3-ref.xhtml b/layout/reftests/mathml/scale-stretchy-3-ref.xhtml
deleted file mode 100644
index 7a671c1cad..0000000000
--- a/layout/reftests/mathml/scale-stretchy-3-ref.xhtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Maximal size for a horizontal arrow stretched by scaling</title>
-  </head>
-
-  <body>
-
-    <table style="position: absolute;">
-      <tr align="center">
-        <td><div style="width: 200px; height: 5px; background: black"/></td>
-      </tr>
-      <tr align="center">
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <munder accentunder="false">
-              <mspace width="100px" height="5px" style="background: yellow"/>
-              <mspace width="110px" height="25px" depth="25px"
-                      style="background: red;"/>
-            </munder>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/scale-stretchy-3.xhtml b/layout/reftests/mathml/scale-stretchy-3.xhtml
deleted file mode 100644
index a21b03f61d..0000000000
--- a/layout/reftests/mathml/scale-stretchy-3.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Maximal size for a horizontal arrow stretched by scaling</title>
-  </head>
-
-  <body>
-
-    <table style="position: absolute;">
-      <tr align="center">
-        <td><div style="width: 200px; height: 5px; background: black"/></td>
-      </tr>
-      <tr align="center">
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <munder accentunder="false">
-              <mspace width="100px" height="5px" style="background: yellow"/>
-              <mo style="color: blue;">&#x21DB;</mo>
-            </munder>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-    <table style="position: absolute;">
-      <tr align="center">
-        <td><div style="width: 200px; height: 5px; background: black"/></td>
-      </tr>
-      <tr align="center">
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <munder accentunder="false">
-              <mspace width="100px" height="5px" style="background: yellow"/>
-              <mspace width="110px" height="25px" depth="25px"
-                      style="background: red;"/>
-            </munder>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/scale-stretchy-4-ref.xhtml b/layout/reftests/mathml/scale-stretchy-4-ref.xhtml
deleted file mode 100644
index 87cb94d305..0000000000
--- a/layout/reftests/mathml/scale-stretchy-4-ref.xhtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Minimal size for a horizontal arrow stretched by scaling</title>
-  </head>
-
-  <body>
-
-    <table style="position: absolute;">
-      <tr align="center">
-        <td><div style="width: 200px; height: 5px; background: black"/></td>
-      </tr>
-      <tr align="center">
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <munder>
-              <mspace width="100px" height="5px" style="background: yellow"/>
-              <mspace width="88px" height="25px" depth="25px"
-                      style="background: green;"/>
-            </munder>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/scale-stretchy-4.xhtml b/layout/reftests/mathml/scale-stretchy-4.xhtml
deleted file mode 100644
index 693fdc7ed4..0000000000
--- a/layout/reftests/mathml/scale-stretchy-4.xhtml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Minimal size for a horizontal arrow stretched by scaling</title>
-  </head>
-
-  <body>
-
-    <table style="position: absolute;">
-      <tr align="center">
-        <td><div style="width: 200px; height: 5px; background: black"/></td>
-      </tr>
-      <tr align="center">
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <munder>
-              <mspace width="100px" height="5px" style="background: yellow"/>
-              <mo style="color: blue;">&#x21DB;</mo>
-            </munder>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-    <table style="position: absolute;">
-      <tr align="center">
-        <td><div style="width: 200px; height: 5px; background: black"/></td>
-      </tr>
-      <tr align="center">
-        <td>
-          <math xmlns="http://www.w3.org/1998/Math/MathML">
-            <munder>
-              <mspace width="100px" height="5px" style="background: yellow"/>
-              <mspace width="88px" height="25px" depth="25px"
-                      style="background: green;"/>
-            </munder>
-          </math>
-        </td>
-      </tr>
-    </table>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/scale-stretchy-5-ref.xhtml b/layout/reftests/mathml/scale-stretchy-5-ref.xhtml
deleted file mode 100644
index 8dc382e304..0000000000
--- a/layout/reftests/mathml/scale-stretchy-5-ref.xhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>Largeop in display mode stretched by scaling</title>
-</head>
-
-<body>
-
-<math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
-  <mo largeop="false">&#x2A0C;</mo>
-</math>
-
-</body>
-</html>
diff --git a/layout/reftests/mathml/scale-stretchy-5.xhtml b/layout/reftests/mathml/scale-stretchy-5.xhtml
deleted file mode 100644
index a79e757d73..0000000000
--- a/layout/reftests/mathml/scale-stretchy-5.xhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>Largeop in display mode stretched by scaling</title>
-</head>
-
-<body>
-
-<math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
-  <mo>&#x2A0C;</mo>
-</math>
-
-</body>
-</html>
diff --git a/layout/reftests/mathml/scriptlevel-movablelimits-1-ref.html b/layout/reftests/mathml/scriptlevel-movablelimits-1-ref.html
deleted file mode 100644
index bbffa910ab..0000000000
--- a/layout/reftests/mathml/scriptlevel-movablelimits-1-ref.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test accent/accentunder</title></head>
-  <body>    
-    <math displaystyle="false">
-      <munderover>
-	<mo>&#x2211;</mo>
-	<mi>a</mi>
-	<mi>b</mi>
-      </munderover>
-    </math>
-    <math displaystyle="false">
-      <munder>
-	<mo>&#x2211;</mo>
-	<mi>a</mi>
-      </munder>
-    </math>
-    <math displaystyle="false">
-      <mover>
-	<mo>&#x2211;</mo>
-	<mi>a</mi>
-      </mover>
-    </math>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/scriptlevel-movablelimits-1.html b/layout/reftests/mathml/scriptlevel-movablelimits-1.html
deleted file mode 100644
index f3ef2e53ba..0000000000
--- a/layout/reftests/mathml/scriptlevel-movablelimits-1.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test accent/accentunder</title></head>
-  <body>
-    <math displaystyle="false">
-      <munderover accentunder="true" accent="true">
-	<mo>&#x2211;</mo>
-	<mi>a</mi>
-	<mi>b</mi>
-      </munderover>
-    </math>
-    <math displaystyle="false">
-      <munder accentunder="true">
-	<mo>&#x2211;</mo>
-	<mi>a</mi>
-      </munder>
-    </math>
-    <math displaystyle="false">
-      <mover accent="true">
-	<mo>&#x2211;</mo>
-	<mi>a</mi>
-      </mover>
-    </math>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/semantics-1-ref.xhtml b/layout/reftests/mathml/semantics-1-ref.xhtml
deleted file mode 100644
index f5a6d4d493..0000000000
--- a/layout/reftests/mathml/semantics-1-ref.xhtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="content-type"
-  content="application/xhtml+xml; charset=utf-8" />
-  <title>Various tests for semantics</title>
-  <style>
-    @font-face
-    {
-        font-family: Ahem;
-        src: url(../fonts/Ahem.ttf);
-    }
-    math, p {
-        font: 25px Ahem;
-    }
-  </style>
-</head>
-
-<body>
-<!-- displaystyle (bug 468059) -->
-<p><math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
-  <semantics>
-    <mstyle displaystyle="true">
-      <munderover>
-        <mo movablelimits="true">pXp</mo>
-        <mtext>XpXpXp</mtext>
-        <mtext>XpXpXp</mtext>
-      </munderover>
-    </mstyle>
-  </semantics>
-</math></p>
-
-<!-- unwanted whitespace (bug 512418) -->
-<p>XpXpXp<math xmlns="http://www.w3.org/1998/Math/MathML">
-    <mrow>
-      <mrow>
-        <mo>lcm</mo>
-        <mo>(</mo>
-        <mn>a</mn>
-        <mo>,</mo>
-        <mn>b</mn>
-        <mo>)</mo>
-      </mrow>
-      <mo>=</mo>
-      <mfrac>
-        <mrow>
-          <mo>(</mo>
-          <mn>a</mn>
-          <mo>&#x2062;</mo>
-          <mn>b</mn>
-          <mo>)</mo>
-        </mrow>
-        <mrow>
-          <mo>gcd</mo>
-          <mo>(</mo>
-          <mn>a</mn>
-          <mo>,</mo>
-          <mn>b</mn>
-          <mo>)</mo>
-        </mrow>
-      </mfrac>
-    </mrow>
-</math>XpXpXp</p>
-
-</body>
-</html>
diff --git a/layout/reftests/mathml/semantics-1.xhtml b/layout/reftests/mathml/semantics-1.xhtml
deleted file mode 100644
index d4ea92a4e5..0000000000
--- a/layout/reftests/mathml/semantics-1.xhtml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="content-type"
-  content="application/xhtml+xml; charset=utf-8" />
-  <title>Various tests for semantics</title>
-  <style>
-    @font-face
-    {
-        font-family: Ahem;
-        src: url(../fonts/Ahem.ttf);
-    }
-    math, p {
-        font: 25px Ahem;
-    }
-</style>
-</head>
-
-<body>
-<!-- displaystyle (bug 468059) -->
-<p><math xmlns="http://www.w3.org/1998/Math/MathML" display="block">
-    <semantics>
-      <munderover>
-        <mo movablelimits="true">pXp</mo>
-        <mtext>XpXpXp</mtext>
-        <mtext>XpXpXp</mtext>
-      </munderover>
-    </semantics>
-</math></p>
-
-<!-- unwanted whitespace (bug 512418) -->
-<p>XpXpXp<math xmlns="http://www.w3.org/1998/Math/MathML">
-  <semantics>
-    <mrow>
-      <mrow>
-        <mo>lcm</mo>
-        <mo>(</mo>
-        <mn>a</mn>
-        <mo>,</mo>
-        <mn>b</mn>
-        <mo>)</mo>
-      </mrow>
-      <mo>=</mo>
-      <mfrac>
-        <mrow>
-          <mo>(</mo>
-          <mn>a</mn>
-          <mo>&#x2062;</mo>
-          <mn>b</mn>
-          <mo>)</mo>
-        </mrow>
-        <mrow>
-          <mo>gcd</mo>
-          <mo>(</mo>
-          <mn>a</mn>
-          <mo>,</mo>
-          <mn>b</mn>
-          <mo>)</mo>
-        </mrow>
-      </mfrac>
-    </mrow>
-  </semantics>
-</math>XpXpXp</p>
-
-</body>
-</html>
diff --git a/layout/reftests/mathml/semantics-2-ref.html b/layout/reftests/mathml/semantics-2-ref.html
deleted file mode 100644
index 43b52b17db..0000000000
--- a/layout/reftests/mathml/semantics-2-ref.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Various tests for semantics</title>
-  <meta charset="utf-8"/>
-</head>
-
-<body>
-  <p>Empty semantics: <math><mrow></mrow></math></p>
-  <p>annotation: <math><mrow><annotation>annotation</annotation></mrow></math></p>
-  <p>annotation-xml: <math><mrow><annotation-xml encoding="MathML-Presentation"><mtext>annotation-xml</mtext></annotation-xml></mrow></math></p>
-  <p>presentation MathML (no annotations): <math><mrow><mtext>presentation MathML</mtext></mrow></math></p>
-  <p>content MathML (no annotations): <math><mrow><csymbol>content MathML</csymbol></mrow></math></p>
-  <p>presentation MathML ; annotation: <math><mrow><mtext>presentation MathML</mtext></mrow></math></p>
-  <p>presentation MathML ; annotation-xml: <math><mrow><mtext>presentation MathML</mtext></mrow></math></p>
-  <p>content MathML ; annotation: <math><mrow><csymbol>content MathML</csymbol></mrow></math></p>
-  <p>content MathML ; annotation-xml: <math><mrow><csymbol>content MathML</csymbol></mrow></math></p>
-</body>
-</html>
diff --git a/layout/reftests/mathml/semantics-2.html b/layout/reftests/mathml/semantics-2.html
deleted file mode 100644
index 2c7d99ac3d..0000000000
--- a/layout/reftests/mathml/semantics-2.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Various tests for semantics</title>
-  <meta charset="utf-8"/>
-</head>
-
-<body>
-  <p>Empty semantics: <math><semantics></semantics></math></p>
-  <p>annotation: <math><semantics><annotation>annotation</annotation></semantics></math></p>
-  <p>annotation-xml: <math><semantics><annotation-xml encoding="MathML-Presentation"><mtext>annotation-xml</mtext></annotation-xml></semantics></math></p>
-  <p>presentation MathML (no annotations): <math><semantics><mtext>presentation MathML</mtext></semantics></math></p>
-  <p>content MathML (no annotations): <math><semantics><csymbol>content MathML</csymbol></semantics></math></p>
-  <p>presentation MathML ; annotation: <math><semantics><mtext>presentation MathML</mtext><annotation>annotation</annotation></semantics></math></p>
-  <p>presentation MathML ; annotation-xml: <math><semantics><mtext>presentation MathML</mtext><annotation-xml encoding="application/mathml-presentation+xml"><mtext>annotation-xml</mtext></annotation-xml></semantics></math></p>
-  <p>content MathML ; annotation: <math><semantics><csymbol>content MathML</csymbol><annotation>annotation</annotation></semantics></math></p>
-  <p>content MathML ; annotation-xml: <math><semantics><csymbol>content MathML</csymbol><annotation-xml encoding="application/mathml-presentation+xml"><mtext>annotation-xml</mtext></annotation-xml></semantics></math></p>
-</body>
-</html>
diff --git a/layout/reftests/mathml/semantics-3-ref.html b/layout/reftests/mathml/semantics-3-ref.html
deleted file mode 100644
index 8d42de963c..0000000000
--- a/layout/reftests/mathml/semantics-3-ref.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Various tests for semantics</title>
-   <meta charset="utf-8"/>
-</head>
-
-<body>
-  <p>annotation 1: <math><mrow><csymbol>Content MathML</csymbol></mrow></math></p>
-  <p>annotation 2: <math><mrow><csymbol>Content MathML</csymbol></mrow></math></p>
-  <p>annotation 3: <math><mrow><csymbol>Content MathML</csymbol></mrow></math></p>
-
-  <p>annotation-xml 1: <math><mrow><csymbol>Content MathML</csymbol></mrow></math></p>
-  <p>annotation-xml 2: <math><mrow><csymbol>Content MathML</csymbol></mrow></math></p>
-  <p>annotation-xml 3: <math><mrow><csymbol>Content MathML</csymbol></mrow></math></p>
-  <p>annotation-xml 4: <math><mrow><csymbol>Content MathML</csymbol></mrow></math></p>
-  <p>annotation-xml 5: <math><mrow><csymbol>Content MathML</csymbol></mrow></math></p>
-  <p>annotation-xml 6: <math><mrow><csymbol>Content MathML</csymbol></mrow></math></p>
-  <p>annotation-xml 7: <math><mrow><csymbol>Content MathML</csymbol></mrow></math></p>
-</body>
-</html>
diff --git a/layout/reftests/mathml/semantics-3.html b/layout/reftests/mathml/semantics-3.html
deleted file mode 100644
index 92a93c774f..0000000000
--- a/layout/reftests/mathml/semantics-3.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Various tests for semantics</title>
-   <meta charset="utf-8"/>
-</head>
-
-<body>
-  <p>annotation 1: <math><semantics><csymbol>Content MathML</csymbol><annotation>annotation</annotation><annotation>error</annotation><annotation-xml encoding="application/mathml-presentation+xml"><mtext>error</mtext></annotation-xml></semantics></math></p>
-  <p>annotation 2: <math><semantics><csymbol>Content MathML</csymbol><annotation encoding="application/x-tex">\sin x + 5</annotation><annotation>error</annotation><annotation-xml encoding="application/mathml-presentation+xml"><mtext>error</mtext></annotation-xml></semantics></math></p>
-  <p>annotation 3: <math><semantics><csymbol>Content MathML</csymbol><annotation src="external-resource">error</annotation><annotation>annotation</annotation><annotation-xml encoding="application/mathml-presentation+xml"><mtext>error</mtext></annotation-xml></semantics></math></p>
-
-  <p>annotation-xml 1: <math><semantics><csymbol>Content MathML</csymbol><annotation-xml encoding="application/mathml-presentation+xml"><mtext>application/mathml-presentation+xml</mtext></annotation-xml><annotation-xml encoding="application/mathml-presentation+xml"><mtext>error</mtext></annotation-xml><annotation>error</annotation></semantics></math></p>
-  <p>annotation-xml 2: <math><semantics><csymbol>Content MathML</csymbol><annotation-xml encoding="MathML-Presentation"><mtext>MathML-Presentation</mtext></annotation-xml><annotation-xml encoding="application/mathml-presentation+xml"><mtext>error</mtext></annotation-xml><annotation>error</annotation></semantics></math></p>
-  <p>annotation-xml 3: <math><semantics><csymbol>Content MathML</csymbol><annotation-xml encoding="image/svg+xml"><svg xmlns="http://www.w3.org/2000/svg" height="2em"><text y="1em">image/svg+xml</text></svg></annotation-xml><annotation-xml encoding="application/mathml-presentation+xml"><mtext>error</mtext></annotation-xml><annotation>error</annotation></semantics></math></p>
-  <p>annotation-xml 4: <math><semantics><csymbol>Content MathML</csymbol><annotation-xml encoding="SVG1.1"><svg xmlns="http://www.w3.org/2000/svg" height="2em"><text y="1em">SVG1.1</text></svg></annotation-xml><annotation-xml encoding="application/mathml-presentation+xml"><mtext>error</mtext></annotation-xml><annotation>error</annotation></semantics></math></p>
-  <p>annotation-xml 5: <math><semantics><csymbol>Content MathML</csymbol><annotation-xml encoding="application/xhtml+xml"><html xmlns="http://www.w3.org/1999/xhtml"><head><title>application/xhtml+xml</title></head><body><p>application/xhtml+xml</p></body></html></annotation-xml><annotation-xml encoding="application/mathml-presentation+xml"><mtext>error</mtext></annotation-xml><annotation>error</annotation></math></p>
-  <p>annotation-xml 6: <math><semantics><csymbol>Content MathML</csymbol><annotation-xml encoding="text/html"><html><head><title>text/html</title></head><body><p>text/html</p></body></html></annotation-xml><annotation-xml encoding="application/mathml-presentation+xml"><mtext>error</mtext></annotation-xml><annotation>error</annotation></semantics></math></p>
-  <p>annotation-xml 7: <math><semantics><csymbol>Content MathML</csymbol><annotation-xml encoding="unknown"><mtext>error</mtext></annotation-xml><annotation-xml encoding="application/mathml-presentation+xml"><mtext>annotation-xml</mtext></annotation-xml><annotation>error</annotation></semantics></math></p>
-</body>
-</html>
diff --git a/layout/reftests/mathml/semantics-5-ref.html b/layout/reftests/mathml/semantics-5-ref.html
deleted file mode 100644
index 9184cdcc81..0000000000
--- a/layout/reftests/mathml/semantics-5-ref.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>semantics - embellished operator (bug 21479)</title>
-  <meta charset="utf-8"/>
-</head>
-<body>
-  <p>
-    <math xmlns="http://www.w3.org/1998/Math/MathML">
-      <mover>
-        <mspace width="300px" height="10px" mathbackground="black"></mspace>
-        <mo>&#xaf;</mo>
-      </mover>
-    </math>
-  </p>
-</body>
-</html>
diff --git a/layout/reftests/mathml/semantics-5.html b/layout/reftests/mathml/semantics-5.html
deleted file mode 100644
index 0c2ad9541a..0000000000
--- a/layout/reftests/mathml/semantics-5.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>semantics - embellished operator (bug 21479)</title>
-  <meta charset="utf-8"/>
-</head>
-<body>
-  <p>
-    <math xmlns="http://www.w3.org/1998/Math/MathML">
-      <mover>
-        <mspace width="300px" height="10px" mathbackground="black"></mspace>
-        <semantics><mo>&#xaf;</mo></semantics>
-      </mover>
-    </math>
-  </p>
-</body>
-</html>
diff --git a/layout/reftests/mathml/stretchy-1-ref.html b/layout/reftests/mathml/stretchy-1-ref.html
deleted file mode 100644
index 23950c02fa..0000000000
--- a/layout/reftests/mathml/stretchy-1-ref.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test stretchy equal (bug 854339)</title></head>
-  <body>
-
-    <math>
-      <munder>
-        <mi>AVERYLONGBASE</mi>
-        <mo stretchy="false">=</mo>
-      </munder>
-    </math>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/stretchy-1.html b/layout/reftests/mathml/stretchy-1.html
deleted file mode 100644
index d4cfcb24f5..0000000000
--- a/layout/reftests/mathml/stretchy-1.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head><title>Test stretchy equal (bug 854339)</title></head>
-  <body>
-
-    <math>
-      <munder>
-        <mi>AVERYLONGBASE</mi>
-        <mo stretchy="true">=</mo>
-      </munder>
-    </math>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/stretchy-largeop-1-ref.html b/layout/reftests/mathml/stretchy-largeop-1-ref.html
deleted file mode 100644
index b65a38958f..0000000000
--- a/layout/reftests/mathml/stretchy-largeop-1-ref.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Largeop stretching</title>
-    <meta charset="utf-8"/>
-  </head>
-  <body>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mo id="mo0">(</mo>
-          <mo>∫</mo>
-          <mo id="mo1">)</mo>
-        <mrow>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mrow>
-          <mo id="mo0a">(</mo>
-          <mo>∫</mo>
-          <mo id="mo1a">)</mo>
-        <mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mo id="mo2">(</mo>
-          <mo>&Product;</mo>
-          <mo id="mo3">)</mo>
-        <mrow>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mrow>
-          <mo id="mo2a">(</mo>
-          <mo>&Product;</mo>
-          <mo id="mo3a">)</mo>
-        <mrow>
-      </math>
-    </p>
-    <p>
-      <!-- &bigotimes; included in the test to check for an assertion involving
-           the direction of the largeop pre-stretch -->
-      <math displaystyle="true">
-        <mrow>
-          <mo id="mo4">(</mo>
-          <mo>&bigotimes;</mo>
-          <mo id="mo5">)</mo>
-        <mrow>
-      </math>
-    </p>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/stretchy-largeop-1.html b/layout/reftests/mathml/stretchy-largeop-1.html
deleted file mode 100644
index bb63c8a435..0000000000
--- a/layout/reftests/mathml/stretchy-largeop-1.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-  <head>
-    <title>Largeop stretching</title>
-    <meta charset="utf-8"/>
-    <script type="text/javascript">
-
-      function verifyGreaterThan(aElement, aReference) {
-        /* Verify that the height of the element is greater than that of the
-           reference, and otherwise paint the element in red. */
-        var element = document.getElementById(aElement);
-        var ref = document.getElementById(aReference);
-        if (element.getBoundingClientRect().height -
-            ref.getBoundingClientRect().height <= 1) {
-          element.setAttribute("mathcolor", "red");
-        }
-      }
-
-      function doTest() {
-        /* Ensure that the parentheses in the displaystyle case stretch more
-           than the alternative. */
-        verifyGreaterThan("mo0", "mo0a");
-        verifyGreaterThan("mo1", "mo1a");
-        verifyGreaterThan("mo2", "mo2a");
-        verifyGreaterThan("mo3", "mo3a");
-
-        document.documentElement.removeAttribute("class");
-
-      }
-    </script>
-  </head>
-  <body onload="doTest();">
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mo id="mo0">(</mo>
-          <mo>∫</mo>
-          <mo id="mo1">)</mo>
-        <mrow>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mrow>
-          <mo id="mo0a">(</mo>
-          <mo>∫</mo>
-          <mo id="mo1a">)</mo>
-        <mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mo id="mo2">(</mo>
-          <mo>&Product;</mo>
-          <mo id="mo3">)</mo>
-        <mrow>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mrow>
-          <mo id="mo2a">(</mo>
-          <mo>&Product;</mo>
-          <mo id="mo3a">)</mo>
-        <mrow>
-      </math>
-    </p>
-    <p>
-      <!-- &bigotimes; included in the test to check for an assertion involving
-           the direction of the largeop pre-stretch -->
-      <math displaystyle="true">
-        <mrow>
-          <mo id="mo4">(</mo>
-          <mo>&bigotimes;</mo>
-          <mo id="mo5">)</mo>
-        <mrow>
-      </math>
-    </p>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/stretchy-largeop-2-ref.html b/layout/reftests/mathml/stretchy-largeop-2-ref.html
deleted file mode 100644
index d06d26527b..0000000000
--- a/layout/reftests/mathml/stretchy-largeop-2-ref.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE html>
-<!-- Test that non-stretchy largeops are bigger in display mode -->
-
-<html>
-  <head>
-    <title>Largeop stretching</title>
-    <meta charset="utf-8"/>
-  </head>
-  <body>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo0">&bigodot;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo1">&bigoplus;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo2">&#x2a03;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo3">&#x2a05;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo4">&#x2a07;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo5">&#x2a08;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo6">&#x2a09;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo7">&#x2a0a;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo8">&#x2afc;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo9">&#x2aff;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef0">&bigodot;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef1">&bigoplus;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef2">&#x2a03;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef3">&#x2a05;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef4">&#x2a07;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef5">&#x2a08;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef6">&#x2a09;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef7">&#x2a0a;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef8">&#x2afc;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef9">&#x2aff;</mo>
-      </math>
-    </p>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/stretchy-largeop-2.html b/layout/reftests/mathml/stretchy-largeop-2.html
deleted file mode 100644
index c7f40580ec..0000000000
--- a/layout/reftests/mathml/stretchy-largeop-2.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html>
-<!-- Test that non-stretchy largeops are bigger in display mode -->
-
-<html class="reftest-wait">
-  <head>
-    <title>Largeop stretching</title>
-    <meta charset="utf-8"/>
-    <script type="text/javascript">
-
-      function verifyGreaterThan(aElement, aReference) {
-        /* Verify that the height of the element is greater than that of the
-           reference, and otherwise paint the element in red. */
-        var element = document.getElementById(aElement);
-        var ref = document.getElementById(aReference);
-        if (element.getBoundingClientRect().height -
-            ref.getBoundingClientRect().height <= 1) {
-          element.setAttribute("mathcolor", "red");
-        }
-      }
-
-      function doTest() {
-        /* Ensure that largeops are bigger in displaystyle */
-        var numTests = 10; // zero indexed
-        var opPrefix = "mo";
-        var refPrefix = "moRef";
-        for (var i = 0; i < numTests; i++)
-        {
-          verifyGreaterThan(opPrefix + i, refPrefix + i);
-        }
-        document.documentElement.removeAttribute("class");
-
-      }
-    </script>
-  </head>
-  <body onload="doTest();">
-    <p>
-      <math displaystyle="true">
-        <mo id="mo0">&bigodot;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo1">&bigoplus;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo2">&#x2a03;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo3">&#x2a05;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo4">&#x2a07;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo5">&#x2a08;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo6">&#x2a09;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo7">&#x2a0a;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo8">&#x2afc;</mo>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="mo9">&#x2aff;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef0">&bigodot;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef1">&bigoplus;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef2">&#x2a03;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef3">&#x2a05;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef4">&#x2a07;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef5">&#x2a08;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef6">&#x2a09;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef7">&#x2a0a;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef8">&#x2afc;</mo>
-      </math>
-    </p>
-    <p>
-      <math>
-        <mo id="moRef9">&#x2aff;</mo>
-      </math>
-    </p>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/stretchy-largeop-3-ref.html b/layout/reftests/mathml/stretchy-largeop-3-ref.html
deleted file mode 100644
index 83837c8b30..0000000000
--- a/layout/reftests/mathml/stretchy-largeop-3-ref.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<!-- Test that non-stretchy largeops do not stretch -->
-
-<html>
-  <head>
-    <title>Largeop stretching</title>
-    <meta charset="utf-8" />
-  </head>
-   <body>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo0">&bigodot;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo1">&bigoplus;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo2">&#x2a03;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo3">&#x2a05;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo4">&#x2a07;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo5">&#x2a08;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo6">&#x2a09;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo7">&#x2a0a;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo8">&#x2afc;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo9">&#x2aff;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="moRef0">&bigodot;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef1">&bigoplus;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef2">&#x2a03;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef3">&#x2a05;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef4">&#x2a07;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef5">&#x2a08;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef6">&#x2a09;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef7">&#x2a0a;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef8">&#x2afc;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef9">&#x2aff;</mo>
-      </math>
-    </p>
-  </body>
-</html>
-\ No newline at end of file
diff --git a/layout/reftests/mathml/stretchy-largeop-3.html b/layout/reftests/mathml/stretchy-largeop-3.html
deleted file mode 100644
index 5fe3149894..0000000000
--- a/layout/reftests/mathml/stretchy-largeop-3.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE html>
-<!-- Test that non-stretchy largeops do not stretch -->
-
-<html class="reftest-wait">
-  <head>
-    <title>Largeop stretching</title>
-    <meta charset="utf-8" />
-    <script type="text/javascript">
-
-      function almostEqual(aX, aY) {
-        var epsilon = 2;
-        return Math.abs(aX - aY) < epsilon;
-      }
-
-      function verifySize(aElement, aReference) {
-        /* Verify if the size of the element matches the reference, and
-           otherwise paint the element in red. */
-        var element = document.getElementById(aElement);
-        var ref = document.getElementById(aReference);
-        if (!almostEqual(element.getBoundingClientRect().height,
-                         ref.getBoundingClientRect().height) ||
-            !almostEqual(element.getBoundingClientRect().width,
-                         ref.getBoundingClientRect().width)) {
-          element.setAttribute("mathcolor", "red");
-        }
-      }
-
-      function doTest() {
-        /* Ensure that largeops are bigger in displaystyle */
-        var numTests = 10; // zero indexed
-        var opPrefix = "mo";
-        var refPrefix = "moRef";
-        for (var i = 0; i < numTests; i++)
-        {
-          verifySize(opPrefix + i, refPrefix + i);
-        }
-        document.documentElement.removeAttribute("class");
-
-      }
-    </script>
-  </head>
-  <body onload="doTest();">
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo0">&bigodot;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo1">&bigoplus;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo2">&#x2a03;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo3">&#x2a05;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo4">&#x2a07;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo5">&#x2a08;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo6">&#x2a09;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo7">&#x2a0a;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo8">&#x2afc;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mrow>
-          <mspace height="3em" />
-          <mo id="mo9">&#x2aff;</mo>
-        </mrow>
-      </math>
-    </p>
-    <p>
-      <math displaystyle="true">
-        <mo id="moRef0">&bigodot;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef1">&bigoplus;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef2">&#x2a03;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef3">&#x2a05;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef4">&#x2a07;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef5">&#x2a08;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef6">&#x2a09;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef7">&#x2a0a;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef8">&#x2afc;</mo>
-      </math>
-      <math displaystyle="true">
-        <mo id="moRef9">&#x2aff;</mo>
-      </math>
-    </p>
-  </body>
-</html>
diff --git a/layout/reftests/mathml/subscript-italic-correction-ref.html b/layout/reftests/mathml/subscript-italic-correction-ref.html
deleted file mode 100644
index a4527325cd..0000000000
--- a/layout/reftests/mathml/subscript-italic-correction-ref.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>subscript</title>
-    <meta charset="utf-8"/>
-  </head>
-  <body style="background: #5f5; font-size: 50px;">
-
-    <div>
-      <math>
-        <msubsup>
-          <mi mathbackground="#5f5">f</mi>
-          <mspace id="s0" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s1" width="50px" height="50px" mathbackground="blue"/>
-        </msubsup>
-      </math>
-    </div>
-
-    <br/>
-
-    <div>
-      <math>
-        <mmultiscripts>
-          <mi mathbackground="#5f5">f</mi>
-          <mspace id="s2" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s3" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s4" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s5" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s6" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s7" width="50px" height="50px" mathbackground="blue"/>
-        </mmultiscripts>
-      </math>
-    </div>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/subscript-italic-correction.html b/layout/reftests/mathml/subscript-italic-correction.html
deleted file mode 100644
index 04be7ba5f9..0000000000
--- a/layout/reftests/mathml/subscript-italic-correction.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-  <head>
-    <title>subscript</title>
-    <meta charset="utf-8"/>
-    <script type="text/javascript">
-      function verifyItalicCorrections()
-      {
-        var epsilon = 2;
-        for (var i = 0; i < 8; i += 2) {
-          var sub = document.getElementById("s" + i);
-          var sup = document.getElementById("s" + (i+1));
-          var italicCorrection =
-           sup.getBoundingClientRect().left - sub.getBoundingClientRect().left;
-           if (italicCorrection < epsilon) {
-             return false;
-           }
-        }
-        return true;
-      }
-
-      function doTest()
-      {
-        if (verifyItalicCorrections()) {
-          document.body.style.background = "#5f5";
-        }
-        document.documentElement.removeAttribute("class");
-      }
-      window.addEventListener("MozReftestInvalidate", doTest);
-    </script>
-  </head>
-  <body style="background: #f00; font-size: 50px;">
-
-    <div>
-      <math>
-        <msubsup>
-          <mi mathbackground="#5f5">f</mi>
-          <mspace id="s0" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s1" width="50px" height="50px" mathbackground="blue"/>
-        </msubsup>
-      </math>
-    </div>
-
-    <br/>
-
-    <div>
-      <math>
-        <mmultiscripts>
-          <mi mathbackground="#5f5">f</mi>
-          <mspace id="s2" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s3" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s4" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s5" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s6" width="50px" height="50px" mathbackground="blue"/>
-          <mspace id="s7" width="50px" height="50px" mathbackground="blue"/>
-        </mmultiscripts>
-      </math>
-    </div>
-
-  </body>
-</html>
diff --git a/layout/reftests/mathml/underbar-width-1-ref.xhtml b/layout/reftests/mathml/underbar-width-1-ref.xhtml
deleted file mode 100644
index 737673ccb1..0000000000
--- a/layout/reftests/mathml/underbar-width-1-ref.xhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <style type="text/css">
-      html { background-color: grey; }
-      div { display: inline-block;
-            font-size: 30px;
-            line-height: 60px; /* Ensure space for underbar */
-            border: 1px solid white;
-            padding: 2px; /* 10% error allowed in char selection */
-            background-color: black;
-            color: red; }
-    </style>
-  </head>
-<body>
-  <div>
-    <math xmlns="http://www.w3.org/1998/Math/MathML">
-      <mphantom>
-	<munder>
-	  <mn>1</mn>
-	  <mo>&#x332;</mo>
-	</munder>
-      </mphantom>
-    </math>
-  </div>
-</body>
-</html>
diff --git a/layout/reftests/mathml/underbar-width-1.xhtml b/layout/reftests/mathml/underbar-width-1.xhtml
deleted file mode 100644
index 473b25b91d..0000000000
--- a/layout/reftests/mathml/underbar-width-1.xhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Check width of stretchy OverBar</title>
-    <style type="text/css">
-      html { background-color: grey; }
-      div { display: inline-block;
-            font-size: 30px;
-            line-height: 60px; /* Ensure space for underbar */
-            border: 1px solid white;
-            padding: 2px; /* 10% error allowed in char selection */
-            background-color: black;
-            color: black; }
-    </style>
-  </head>
-<body>
-  <div>
-    <math xmlns="http://www.w3.org/1998/Math/MathML">
-      <munder>
-	<mn>1</mn>
-	<mo>&#x332;</mo>
-      </munder>
-    </math>
-  </div>
-</body>
-</html>
diff --git a/layout/reftests/mp4-video/reftest.list b/layout/reftests/mp4-video/reftest.list
index 6462ae1820..d07ff47577 100644
--- a/layout/reftests/mp4-video/reftest.list
+++ b/layout/reftests/mp4-video/reftest.list
@@ -1,4 +1,4 @@
 skip-if(winWidget) == canvas-1.xhtml canvas-1-ref.xhtml
-fuzzy-if(OSX,1-1,107584-107584) == image-rendering-css.html image-rendering-ref.html
-fuzzy-if(OSX,1-1,107584-107584) == image-rendering-script.html image-rendering-ref.html
-fuzzy-if(OSX,0-1,0-107584) != image-rendering-css.html image-rendering-css-auto.html
+fuzzy-if(cocoaWidget,1-1,107584-107584) == image-rendering-css.html image-rendering-ref.html
+fuzzy-if(cocoaWidget,1-1,107584-107584) == image-rendering-script.html image-rendering-ref.html
+fuzzy-if(cocoaWidget,0-1,0-107584) != image-rendering-css.html image-rendering-css-auto.html
diff --git a/layout/reftests/native-theme/reftest.list b/layout/reftests/native-theme/reftest.list
index 33dfbad099..d1cbd58cb2 100644
--- a/layout/reftests/native-theme/reftest.list
+++ b/layout/reftests/native-theme/reftest.list
@@ -33,7 +33,7 @@ needs-focus == listbox-nonnative-when-styled.html listbox-nonnative-when-styled-
 == 492155-1.html about:blank
 == 492155-2.html about:blank
 == 492155-3.html about:blank
-fails-if(Android&&!asyncPan) != 492155-4.html about:blank
+!= 492155-4.html about:blank
 
 != box-shadow-input.html box-shadow-input-ref.html
 != box-shadow-button.html box-shadow-button-ref.html
diff --git a/layout/reftests/ogg-video/reftest.list b/layout/reftests/ogg-video/reftest.list
index fa3d68587c..2c9a96f8ee 100644
--- a/layout/reftests/ogg-video/reftest.list
+++ b/layout/reftests/ogg-video/reftest.list
@@ -6,7 +6,7 @@ fails-if(Android) skip-if(gtkWidget) == aspect-ratio-2a.xhtml aspect-ratio-2-ref
 fails-if(Android) skip-if(gtkWidget) == aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
 == aspect-ratio-3a.xhtml aspect-ratio-3-ref.xhtml
 == aspect-ratio-3b.xhtml aspect-ratio-3-ref.xhtml
-fails-if(Android) random-if(layersGPUAccelerated) == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html
+fails-if(Android) random == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html
 fails-if(Android) == basic-1.xhtml basic-1-ref.html
 == canvas-1a.xhtml basic-1-ref.html
 fails-if(Android) == canvas-1b.xhtml basic-1-ref.html
diff --git a/layout/reftests/outline/reftest.list b/layout/reftests/outline/reftest.list
index 2de8cdfb3c..04931312ce 100644
--- a/layout/reftests/outline/reftest.list
+++ b/layout/reftests/outline/reftest.list
@@ -1,7 +1,7 @@
 fuzzy(0-52,0-1452) == outline-and-box-shadow.html outline-and-box-shadow-ref.html
 pref(layout.outline.include-overflow,true) == outline-and-3d-transform-1a.html outline-and-3d-transform-1-ref.html
 pref(layout.outline.include-overflow,true) == outline-and-3d-transform-1b.html outline-and-3d-transform-1-ref.html
-fuzzy-if(gtkWidget,0-136,0-120) fuzzy-if(Android,0-255,0-356) fuzzy-if(d2d,0-16,0-96) fuzzy-if(cocoaWidget,0-255,0-120) fuzzy-if(winWidget,0-255,0-216) == outline-and-3d-transform-2.html outline-and-3d-transform-2-ref.html
+fuzzy-if(gtkWidget,0-136,0-120) fuzzy-if(Android,0-255,0-356) fuzzy-if(cocoaWidget,0-255,0-120) fuzzy-if(winWidget,0-255,0-216) == outline-and-3d-transform-2.html outline-and-3d-transform-2-ref.html
 == outline-dynamic-change-1a.html outline-dynamic-change-1-ref.html
 == outline-dynamic-change-1b.html outline-dynamic-change-1-ref.html
 == outline-overflow-block-abspos.html outline-overflow-block-ref.html
diff --git a/layout/reftests/pagination/reftest.list b/layout/reftests/pagination/reftest.list
index 6946a3126a..a26bf56b31 100644
--- a/layout/reftests/pagination/reftest.list
+++ b/layout/reftests/pagination/reftest.list
@@ -51,11 +51,11 @@ fuzzy(0-1,0-23) == resize-reflow-001.html resize-reflow-001.ref.html
 == table-page-break-after-always-1.html table-page-break-before-auto-2-ref.html
 == table-page-break-after-left-1.html table-page-break-before-auto-2-ref.html
 == table-page-break-after-right-1.html table-page-break-before-auto-2-ref.html
-== rowgroup-page-break-after-always-1.html table-page-break-before-auto-2-ref.html
-== row-page-break-after-always-1.html table-page-break-before-auto-2-ref.html
-== row-page-break-after-always-2.html table-page-break-before-auto-2-ref.html
-== rowgroup-thead-page-break-after-always-1.html table-page-break-before-auto-3-ref.html
-== rowgroup-tfoot-page-break-after-always-1.html table-page-break-before-auto-3-ref.html
+== rowgroup-page-break-after-always-1.html rowgroup-page-break-after-always-1-ref.html
+== row-page-break-after-always-1.html rowgroup-page-break-after-always-1-ref.html
+== row-page-break-after-always-2.html rowgroup-page-break-after-always-1-ref.html
+== rowgroup-thead-page-break-after-always-1.html rowgroup-page-break-after-always-2-ref.html
+== rowgroup-tfoot-page-break-after-always-1.html rowgroup-page-break-after-always-2-ref.html
 == table-tfoot-thead-1.html table-tfoot-thead-1-ref.html
 == table-caption-splitrowgroup-1.html table-caption-splitrowgroup-1-ref.html
 == table-caption-splitaftercaption-1.html table-caption-splitaftercaption-1-ref.html
@@ -75,7 +75,7 @@ asserts(1-1) pref(layout.display-list.improve-fragmentation,false) == table-cell
 asserts(1-1) pref(layout.display-list.improve-fragmentation,true) fails == table-cell-breaking-3b.html table-cell-breaking-3-ref.html # assert is bug 714667, fails due to bug 1681063
 == column-balancing-break-inside-avoid-2.html column-balancing-break-inside-avoid-2-ref.html
 fuzzy-if(Android,0-4,0-2) fuzzy-if(swgl,0-1,0-35) == combobox-page-break-inside.html combobox-page-break-inside-ref.html
-pref(layout.display-list.improve-fragmentation,false) fuzzy-if(OSX,23-23,1-1) == table-nested-1308876-1.xhtml table-nested-1308876-1-ref.html # bug 1681063
+pref(layout.display-list.improve-fragmentation,false) == table-nested-1308876-1.xhtml table-nested-1308876-1-ref.html # bug 1681063
 == contain-size-break-001.html contain-size-break-001-ref.html
 == contain-size-break-002.html contain-size-break-002-ref.html
 == contain-size-break-003.html contain-size-break-003-ref.html
diff --git a/layout/reftests/pagination/rowgroup-page-break-after-always-1-ref.html b/layout/reftests/pagination/rowgroup-page-break-after-always-1-ref.html
new file mode 100644
index 0000000000..130833dbba
--- /dev/null
+++ b/layout/reftests/pagination/rowgroup-page-break-after-always-1-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html class="reftest-paged">
+  <style>
+  div.spacer { height: 50px; width: 50px; border: thin solid green;}
+  </style>
+
+  <table>
+    <tbody>
+      <tr><td><div class="spacer"></div></td></tr>
+    </tbody>
+  </table>
+  <div style="page-break-after: always"></div>
+  <table style="position: relative; top: -2px">
+    <tbody>
+      <tr><td><div class="spacer"></div></td></tr>
+    </tbody>
+  </table>
+</html>
diff --git a/layout/reftests/pagination/table-page-break-before-auto-3-ref.html b/layout/reftests/pagination/rowgroup-page-break-after-always-2-ref.html
index 72f5960ac2..9a47194f61 100644
--- a/layout/reftests/pagination/table-page-break-before-auto-3-ref.html
+++ b/layout/reftests/pagination/rowgroup-page-break-after-always-2-ref.html
@@ -14,7 +14,7 @@ div.spacer { height: 50px; width: 50px; border:thin solid green;}
 </tbody>
 </table>
 <div style= "page-break-after: always"></div>
-<table>
+<table style="position: relative; top: -2px">
 <thead><tr><td><div class="spacer"></div></td></tr></thead>
 <tbody>
 <tr><td><div class="spacer"></div></td></tr>
diff --git a/layout/reftests/pagination/table-caption-splitaftercaption-5-ref.html b/layout/reftests/pagination/table-caption-splitaftercaption-5-ref.html
index b66fef887f..c6cd61a08f 100644
--- a/layout/reftests/pagination/table-caption-splitaftercaption-5-ref.html
+++ b/layout/reftests/pagination/table-caption-splitaftercaption-5-ref.html
@@ -4,20 +4,22 @@
 <head>
 <style type="text/css">
 div.spacer { height: 0px; width: 0px; padding: 0.2in;border:thin solid green;}
-caption {margin-top: 0.15in; margin-bottom:0.15in; caption-side:bottom}
+.caption {margin-top: 0.15in; margin-bottom:0.15in;
+          position: absolute; bottom: 0;}
 table {margin-top: 0.15in; margin-bottom:0.15in}
 </style>
 </head>
 <body>
 
 <table cellspacing="0" cellpadding="0">
-<caption><div class="spacer"></div></caption>
 <tbody>
 <tr><td><div class="spacer"></div></td></tr>
 </tbody>
 <tfoot><tr><td><div class="spacer"></div></td></tr></tfoot>
 </table>
 
+<div class="caption"><div class="spacer"></div></div>
+
 <table cellspacing="0" cellpadding="0" style="page-break-before:always">
 <tbody>
 <tr><td><div class="spacer"></div></td></tr>
diff --git a/layout/reftests/pagination/table-nested-1308876-1-ref.html b/layout/reftests/pagination/table-nested-1308876-1-ref.html
index ba8cd989aa..f5521cda37 100644
--- a/layout/reftests/pagination/table-nested-1308876-1-ref.html
+++ b/layout/reftests/pagination/table-nested-1308876-1-ref.html
@@ -6,15 +6,16 @@ correct, but I'd at least like to know about it if it changes, given how
 little test coverage of this we currently have.
 -->
 <style>
+@page { size: 5in 3in; margin: 0.5in; }
 html, body { margin: 0; padding: 0; }
 </style>
-<div id="page1" style="border: 2px solid black; background: yellow; height: 2in; box-sizing: border-box; padding: 3px; width: min-content">
-  <div style="background: orange; height: calc(2in - 15px); padding: 3px;">
+<div id="page1" style="border: 2px solid black; border-bottom: 0; height: 2in; box-sizing: border-box; background: yellow; padding: 3px; padding-bottom: 0; width: min-content">
+  <div id="or" style="background: orange; height: calc(2in - 5px - 6px); padding: 3px;">
     <div style="background: brown; color: black;padding: 1px;">A</div>
   </div>
 </div>
-<div id="page2" style="border: 2px solid black; background: yellow; height: 2in; box-sizing: border-box; padding: 2px 3px 3px 3px; border-bottom: none; padding-bottom: 0; width: min-content">
-  <div style="background: orange; height: calc(2in - 6px); padding: 2px 3px 0 3px">
-    <div style="border: 1px solid fuchsia; background: aqua; height: calc(2in - 7px); border-bottom: none; color: transparent">A</div>
+<div id="page2" style="border: solid black; border-width: 0 2px; background: yellow; height: 2in; box-sizing: border-box; padding: 0 3px; width: min-content">
+  <div style="background: orange; height: 2in; padding: 0 3px">
+    <div style="border: 1px solid fuchsia; background: aqua; height: calc(2in - 1px); border-bottom: none; color: transparent">A</div>
   </div>
 </div>
diff --git a/layout/reftests/pagination/table-nested-1308876-1.xhtml b/layout/reftests/pagination/table-nested-1308876-1.xhtml
index 3a804949c4..023b77429c 100644
--- a/layout/reftests/pagination/table-nested-1308876-1.xhtml
+++ b/layout/reftests/pagination/table-nested-1308876-1.xhtml
@@ -2,6 +2,10 @@
 <!--
 Reduced from layout/base/crashtests/470851-1.xhtml and turned into a reftest.
 -->
+<style>
+@page { size: 5in 3in; margin: 0.5in; }
+html, body { margin: 0; padding: 0; }
+</style>
 <table style="background: black">
 <tbody>
 <tr>
@@ -15,7 +19,7 @@ Reduced from layout/base/crashtests/470851-1.xhtml and turned into a reftest.
         <tr><td>A</td></tr>
       </tbody>
       <tbody style="background: fuchsia">
-        <tr><td><div style="background: aqua; line-height: 4in">A</div></td></tr>
+        <tr><td><div style="background: aqua; line-height: 4in; color: transparent">A</div></td></tr>
       </tbody>
     </table>
   </td>
diff --git a/layout/reftests/pagination/table-tfoot-thead-1-ref.html b/layout/reftests/pagination/table-tfoot-thead-1-ref.html
index 469027d86a..9c730dea1b 100644
--- a/layout/reftests/pagination/table-tfoot-thead-1-ref.html
+++ b/layout/reftests/pagination/table-tfoot-thead-1-ref.html
@@ -18,7 +18,7 @@ thead div.spacer{height: 140px}
 <tbody><tr><td><div class="spacer"></div></td></tr></tbody>
 </table>
 
-<table cellspacing="1" cellpadding="0">
+<table cellspacing="1" cellpadding="0" style="position: relative; top: -1px">
 <tbody> <tr><td><div class="spacer"></div></td></tr></tbody>
 <tfoot><tr><td><div class="spacer"></div></td></tr></tfoot>
 </table>
diff --git a/layout/reftests/percent-overflow-sizing/reftest.list b/layout/reftests/percent-overflow-sizing/reftest.list
index 937f0f00da..bcea88980e 100644
--- a/layout/reftests/percent-overflow-sizing/reftest.list
+++ b/layout/reftests/percent-overflow-sizing/reftest.list
@@ -1,26 +1,26 @@
 == simpleHeight100.html greenbox.html
 == simpleAbsHeight.html greenbox.html
-random-if(transparentScrollbars) == hScrollSimpleHeight.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollSimpleHeightQuirks-1.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollSimpleHeightQuirks-2.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollSimpleHeightQuirks-3.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollAbsHeight.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollAbsHeightQuirks.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollSimpleHeight.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollSimpleHeightQuirks-1.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollSimpleHeightQuirks-2.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollSimpleHeightQuirks-3.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollAbsHeight.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollAbsHeightQuirks.html greenboxhbar.html # bug 650591
 == simpleHeight100D.html greenbox.html
 == simpleAbsHeightD.html greenbox.html
-random-if(transparentScrollbars) == hScrollSimpleHeightD.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollSimpleHeightQuirks-1D.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollSimpleHeightQuirks-2D.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollSimpleHeightQuirks-3D.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollAbsHeightD.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollAbsHeightQuirksD.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollSimpleHeightD.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollSimpleHeightQuirks-1D.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollSimpleHeightQuirks-2D.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollSimpleHeightQuirks-3D.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollAbsHeightD.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollAbsHeightQuirksD.html greenboxhbar.html # bug 650591
 == simpleMinHeight100D.html greenbox.html
 == simpleAbsMinHeightD.html greenbox.html
-random-if(transparentScrollbars) == hScrollSimpleMinHeightD.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollSimpleMinHeightQuirks-1D.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollSimpleMinHeightQuirks-3D.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollAbsMinHeightD.html greenboxhbar.html # bug 650591
-random-if(transparentScrollbars) == hScrollAbsMinHeightQuirksD.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollSimpleMinHeightD.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollSimpleMinHeightQuirks-1D.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollSimpleMinHeightQuirks-3D.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollAbsMinHeightD.html greenboxhbar.html # bug 650591
+random-if(gtkWidget) == hScrollAbsMinHeightQuirksD.html greenboxhbar.html # bug 650591
 == dynamicHeight100.html dynamicHeight100-ref.html
 == nestedHeight.html nestedHeight-ref.html
 == nestedHeightQuirks.html nestedHeightQuirks-ref.html
diff --git a/layout/reftests/position-dynamic-changes/reftest.list b/layout/reftests/position-dynamic-changes/reftest.list
index 8392f8cff2..66fdbd0e13 100644
--- a/layout/reftests/position-dynamic-changes/reftest.list
+++ b/layout/reftests/position-dynamic-changes/reftest.list
@@ -7,4 +7,4 @@ include relative/reftest.list
 == multiple-changes.html multiple-changes-ref.html
 == shrink-wrap.html shrink-wrap-ref.html
 == max-width.html max-width-ref.html
-fuzzy-if(cocoaWidget&&layersGPUAccelerated,0-1,0-2) == min-width.html min-width-ref.html # Bug 761770
+fuzzy-if(cocoaWidget,0-1,0-2) == min-width.html min-width-ref.html # Bug 761770
diff --git a/layout/reftests/position-dynamic-changes/relative/reftest.list b/layout/reftests/position-dynamic-changes/relative/reftest.list
index 320fad98b2..cca518eb05 100644
--- a/layout/reftests/position-dynamic-changes/relative/reftest.list
+++ b/layout/reftests/position-dynamic-changes/relative/reftest.list
@@ -1,5 +1,5 @@
-fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(d2d,0-47,0-26) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-169,0-970) == move-right-bottom.html move-right-bottom-ref.html
-fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-169,0-970) == move-top-left.html move-top-left-ref.html # Bug 688545
-fuzzy-if(cocoaWidget,0-1,0-3) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-144,0-580) == move-right-bottom-table.html move-right-bottom-table-ref.html
-fuzzy-if(cocoaWidget,0-1,0-3) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-144,0-580) == move-top-left-table.html move-top-left-table-ref.html # Bug 688545
+fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(winWidget,0-47,0-26) == move-right-bottom.html move-right-bottom-ref.html
+fuzzy-if(cocoaWidget,0-1,0-2) == move-top-left.html move-top-left-ref.html # Bug 688545
+fuzzy-if(cocoaWidget,0-1,0-3) == move-right-bottom-table.html move-right-bottom-table-ref.html
+fuzzy-if(cocoaWidget,0-1,0-3) == move-top-left-table.html move-top-left-table-ref.html # Bug 688545
 == percent.html percent-ref.html
diff --git a/layout/reftests/position-sticky/reftest.list b/layout/reftests/position-sticky/reftest.list
index cd47d90a45..bd9aadc1d0 100644
--- a/layout/reftests/position-sticky/reftest.list
+++ b/layout/reftests/position-sticky/reftest.list
@@ -39,17 +39,17 @@ fuzzy-if(Android,0-4,0-810) == containing-block-1.html containing-block-1-ref.ht
 == overconstrained-3.html overconstrained-3-ref.html
 == inline-1.html inline-1-ref.html
 == inline-2.html inline-2-ref.html
-fuzzy-if(OSX,0-99,0-210) == inline-3.html inline-3-ref.html
-skip-if(!asyncPan) fuzzy-if(swgl&&!Android,0-1,0-3) fails-if(useDrawSnapshot) == inline-4.html inline-4-ref.html
+fuzzy-if(cocoaWidget,0-99,0-210) == inline-3.html inline-3-ref.html
+skip-if(useDrawSnapshot) fuzzy-if(swgl&&!Android,0-1,0-3) fails-if(useDrawSnapshot) == inline-4.html inline-4-ref.html
 == column-contain-1a.html column-contain-1-ref.html
 == column-contain-1b.html column-contain-1-ref.html
 == column-contain-2.html column-contain-2-ref.html
 == block-in-inline-1.html block-in-inline-1-ref.html
-fuzzy(0-1,0-22) fuzzy-if(winWidget&&!layersGPUAccelerated,0-116,0-1320) fuzzy-if(Android,0-8,0-1533) == block-in-inline-2.html block-in-inline-2-ref.html
-fuzzy(0-1,0-220) fuzzy-if(winWidget&&!layersGPUAccelerated,0-116,0-1320) == block-in-inline-3.html block-in-inline-3-ref.html
+fuzzy(0-1,0-22) fuzzy-if(Android,0-8,0-1533) == block-in-inline-2.html block-in-inline-2-ref.html
+fuzzy(0-1,0-220) == block-in-inline-3.html block-in-inline-3-ref.html
 == block-in-inline-continuations.html block-in-inline-continuations-ref.html
 == iframe-1.html iframe-1-ref.html
 == transformed-1.html transformed-1-ref.html
-fuzzy-if(Android,0-8,0-9) fuzzy-if(gtkWidget,10-17,12-32) fuzzy-if(cocoaWidget,7-8,18-42) skip-if(!asyncPan) fails-if(useDrawSnapshot) == transformed-2.html transformed-2-ref.html # Bug 1604644
-skip-if(!asyncPan) fuzzy-if(Android,0-14,0-11) fuzzy-if(gtkWidget,19-30,12-32) fuzzy-if(cocoaWidget,13-16,20-44) fails-if(useDrawSnapshot) == nested-sticky-1.html nested-sticky-1-ref.html # Bug 1604644
-skip-if(!asyncPan) fuzzy-if(Android,0-14,0-11) fuzzy-if(gtkWidget,19-30,12-32) fuzzy-if(cocoaWidget,13-16,20-44) fails-if(useDrawSnapshot) == nested-sticky-2.html nested-sticky-2-ref.html # Bug 1604644
+fuzzy-if(Android,0-8,0-9) fuzzy-if(gtkWidget,10-17,12-32) fuzzy-if(cocoaWidget,7-8,18-42) skip-if(useDrawSnapshot) fails-if(useDrawSnapshot) == transformed-2.html transformed-2-ref.html # Bug 1604644
+skip-if(useDrawSnapshot) fuzzy-if(Android,0-14,0-11) fuzzy-if(gtkWidget,19-30,12-32) fuzzy-if(cocoaWidget,13-16,20-44) fails-if(useDrawSnapshot) == nested-sticky-1.html nested-sticky-1-ref.html # Bug 1604644
+skip-if(useDrawSnapshot) fuzzy-if(Android,0-14,0-11) fuzzy-if(gtkWidget,19-30,12-32) fuzzy-if(cocoaWidget,13-16,20-44) fails-if(useDrawSnapshot) == nested-sticky-2.html nested-sticky-2-ref.html # Bug 1604644
diff --git a/layout/reftests/reftest-sanity/reftest.list b/layout/reftests/reftest-sanity/reftest.list
index 1aa272d6e2..52b6982aac 100644
--- a/layout/reftests/reftest-sanity/reftest.list
+++ b/layout/reftests/reftest-sanity/reftest.list
@@ -93,16 +93,16 @@ fails == data:text/plain,HELLO about:blank
 needs-focus == data:text/plain, about:blank
 
 # Sanity check of viewport+displayport overrides
-pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote) fails-if(useDrawSnapshot) != test-displayport-2.html test-displayport-ref.html # bug 593168
-skip-if(!browserIsRemote) fails-if(OSX&&layersGPUAccelerated) fuzzy-if(layersOMTC,0-1,0-1390) random-if(Android) random-if(transparentScrollbars) == 647192-1.html 647192-1-ref.html
-skip-if(!browserIsRemote) == 656041-1.html 656041-1-ref.html
-pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote||layersOMTC) == test-displayport-bg.html test-displayport-ref.html # bug 694706
+pref(dom.meta-viewport.enabled,true) fails-if(useDrawSnapshot) != test-displayport-2.html test-displayport-ref.html # bug 593168
+fails-if(cocoaWidget) fuzzy(0-1,0-1390) random-if(Android) random-if(gtkWidget) == 647192-1.html 647192-1-ref.html
+== 656041-1.html 656041-1-ref.html
+pref(dom.meta-viewport.enabled,true) skip == test-displayport-bg.html test-displayport-ref.html # bug 694706
 
 # IPC Position-fixed frames/layers test
 # Fixed layers are temporarily disabled (bug 656167).
-#pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote) == test-pos-fixed.html test-pos-fixed-ref.html
-#pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote) == test-bg-attachment-fixed.html test-bg-attachment-fixed-ref.html
-pref(dom.meta-viewport.enabled,true) skip-if(!browserIsRemote) == test-pos-fixed-transform.html test-pos-fixed-transform-ref.html
+#pref(dom.meta-viewport.enabled,true) == test-pos-fixed.html test-pos-fixed-ref.html
+#pref(dom.meta-viewport.enabled,true) == test-bg-attachment-fixed.html test-bg-attachment-fixed-ref.html
+pref(dom.meta-viewport.enabled,true) == test-pos-fixed-transform.html test-pos-fixed-transform-ref.html
 
 # reftest syntax: require-or
 require-or(unrecognizedCondition,skip) script scripttest-fail.html
@@ -171,11 +171,11 @@ noautofuzz fails fuzzy-if(false,0-2,0-1) == fuzzy.html fuzzy-ref.html
 # Test that reftest-no-paint fails correctly.
 == reftest-no-paint.html reftest-no-paint-ref.html
 
-skip-if(!asyncPan||!browserIsRemote) == async-scroll-1a.html async-scroll-1-ref.html
+skip-if(useDrawSnapshot) == async-scroll-1a.html async-scroll-1-ref.html
 
-skip-if(!asyncPan||!browserIsRemote) != async-scroll-1b.html async-scroll-1-ref.html
+skip-if(useDrawSnapshot) != async-scroll-1b.html async-scroll-1-ref.html
 
-skip-if(!asyncPan||!browserIsRemote) == async-scroll-1c.html async-scroll-1-ref.html
+skip-if(useDrawSnapshot) == async-scroll-1c.html async-scroll-1-ref.html
 
 skip-if(!Android) pref(apz.allow_zooming,true) != async-zoom-1.html async-zoom-1-ref.html
 fuzzy(0-112,0-800) skip-if(!Android) pref(apz.allow_zooming,true) == async-zoom-2.html async-zoom-2-ref.html
diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list
index 5fc3ebc76a..9587c70798 100644
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -252,9 +252,6 @@ include line-breaking/reftest.list
 # list-item/
 include list-item/reftest.list
 
-# mathml/
-include mathml/reftest.list
-
 # margin-collapsing
 include margin-collapsing/reftest.list
 
@@ -277,13 +274,13 @@ include outline/reftest.list
 include object/reftest.list
 
 # ogg-video/
-skip-if(browserIsRemote) include ogg-video/reftest.list
+skip include ogg-video/reftest.list
 
 # webm-video/
-skip-if(browserIsRemote) include webm-video/reftest.list
+skip include webm-video/reftest.list
 
 # mp4-video/
-skip-if(browserIsRemote) include mp4-video/reftest.list
+skip include mp4-video/reftest.list
 
 # parser/
 include ../../parser/htmlparser/tests/reftest/reftest.list
@@ -372,8 +369,7 @@ include ../../toolkit/themes/osx/reftests/reftest.list
 include ../../toolkit/content/tests/reftests/reftest.list
 
 # transform/
-# skipping on non-e10s windows because of assertion in bug 1401228
-skip-if(winWidget&&!browserIsRemote) include transform/reftest.list
+include transform/reftest.list
 
 # 3d transforms
 include transform-3d/reftest.list
diff --git a/layout/reftests/scrolling/reftest.list b/layout/reftests/scrolling/reftest.list
index f631654250..159f480416 100644
--- a/layout/reftests/scrolling/reftest.list
+++ b/layout/reftests/scrolling/reftest.list
@@ -1,12 +1,12 @@
 HTTP == deferred-anchor.xhtml#d deferred-anchor-ref.xhtml#d
-fuzzy-if(xulRuntime.widgetToolkit=="gtk",0-1,0-23) fails-if(useDrawSnapshot) == deferred-anchor2.xhtml deferred-anchor-ref.xhtml#d # bug 1182632
+fuzzy-if(gtkWidget,0-1,0-23) fails-if(useDrawSnapshot) == deferred-anchor2.xhtml deferred-anchor-ref.xhtml#d # bug 1182632
 HTTP == fixed-1.html fixed-1.html?ref
 fuzzy(0-1,0-32200) HTTP == fixed-table-1.html fixed-table-1.html?ref
 HTTP == fixed-opacity-1.html fixed-opacity-1.html?ref
 HTTP == fixed-opacity-2.html fixed-opacity-2.html?ref
 random-if(gtkWidget) fuzzy-if(Android,0-3,0-60) HTTP == fixed-text-1.html fixed-text-1.html?ref
 HTTP == fixed-text-2.html fixed-text-2.html?ref
-random-if(Android) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-12) fuzzy-if(winWidget,0-1,0-31) == iframe-border-radius.html iframe-border-radius-ref.html # bug 760269
+random-if(Android) fuzzy-if(winWidget,0-1,0-12) fuzzy-if(winWidget,0-1,0-31) == iframe-border-radius.html iframe-border-radius-ref.html # bug 760269
 random-if(Android) HTTP == image-1.html image-1.html?ref
 random-if(Android) HTTP == opacity-mixed-scrolling-1.html opacity-mixed-scrolling-1.html?ref # bug 760269
 random-if(cocoaWidget) HTTP == opacity-mixed-scrolling-2.html opacity-mixed-scrolling-2.html?ref # see bug 625357
@@ -31,13 +31,13 @@ fuzzy(0-1,0-42) HTTP == transformed-1.html transformed-1.html?ref
 fuzzy(0-1,0-43) HTTP == transformed-1.html?up transformed-1.html?ref
 fuzzy-if(Android,0-5,0-20000) == uncovering-1.html uncovering-1-ref.html
 fuzzy-if(Android,0-5,0-20000) == uncovering-2.html uncovering-2-ref.html
-fuzzy-if(asyncPan&&!layersGPUAccelerated,0-149,0-4520) == less-than-scrollbar-height.html less-than-scrollbar-height-ref.html
+== less-than-scrollbar-height.html less-than-scrollbar-height-ref.html
 == huge-horizontal-overflow.html huge-horizontal-overflow-ref.html
 == huge-vertical-overflow.html huge-vertical-overflow-ref.html
-pref(apz.allow_zooming,true) fuzzy-if(gtkWidget,0-1,0-80) fuzzy-if(winWidget,0-4,0-170) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-102,0-6818) fuzzy-if(winWidget&&browserIsFission,0-96,0-1109) == iframe-scrolling-attr-1.html iframe-scrolling-attr-ref.html # fission: Bug 1717856
-pref(apz.allow_zooming,true) fuzzy-if(gtkWidget,0-1,0-80) fuzzy-if(winWidget,0-4,0-170) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-140,0-6818) fuzzy-if(winWidget&&browserIsFission,0-96,0-1109) == iframe-scrolling-attr-2.html iframe-scrolling-attr-ref.html # fission: Bug 1717856
+pref(apz.allow_zooming,true) fuzzy-if(gtkWidget,0-1,0-80) fuzzy-if(winWidget,0-4,0-170) fuzzy-if(winWidget&&fission,0-96,0-1109) == iframe-scrolling-attr-1.html iframe-scrolling-attr-ref.html # fission: Bug 1717856
+pref(apz.allow_zooming,true) fuzzy-if(gtkWidget,0-1,0-80) fuzzy-if(winWidget,0-4,0-170) fuzzy-if(winWidget&&fission,0-96,0-1109) == iframe-scrolling-attr-2.html iframe-scrolling-attr-ref.html # fission: Bug 1717856
 pref(apz.allow_zooming,true) fuzzy(0-1,0-2) fuzzy-if(geckoview,0-1,0-15) fuzzy-if(gtkWidget,0-1,0-48) fuzzy-if(winWidget,0-4,0-108) fuzzy-if(winWidget&&fission,0-92,0-1280) == frame-scrolling-attr-1.html frame-scrolling-attr-ref.html
-pref(apz.allow_zooming,true) fuzzy(0-1,0-2) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-102,0-2420) fuzzy-if(geckoview,0-1,0-88) fuzzy-if(gtkWidget,0-1,0-48) fuzzy-if(winWidget,0-4,0-108) fuzzy-if(winWidget&&fission,0-92,0-1920) == frame-scrolling-attr-2.html frame-scrolling-attr-ref.html
+pref(apz.allow_zooming,true) fuzzy(0-1,0-2) fuzzy-if(geckoview,0-1,0-88) fuzzy-if(gtkWidget,0-1,0-48) fuzzy-if(winWidget,0-4,0-108) fuzzy-if(winWidget&&fission,0-92,0-1920) == frame-scrolling-attr-2.html frame-scrolling-attr-ref.html
 == move-item.html move-item-ref.html # bug 1125750
 == fractional-scroll-area.html?top=-0.4&outerBottom=100&innerBottom=200 fractional-scroll-area.html?top=0&outerBottom=100&innerBottom=200
 == fractional-scroll-area.html?top=0.4&outerBottom=100&innerBottom=200 fractional-scroll-area.html?top=0&outerBottom=100&innerBottom=200
diff --git a/layout/reftests/selection/reftest.list b/layout/reftests/selection/reftest.list
index a7d9ba1739..a807c345da 100644
--- a/layout/reftests/selection/reftest.list
+++ b/layout/reftests/selection/reftest.list
@@ -34,7 +34,7 @@ fuzzy(0-1,0-1200) == addrange-2.html addrange-ref.html
 == splitText-normalize.html splitText-normalize-ref.html
 == modify-range.html modify-range-ref.html
 == dom-mutations.html dom-mutations-ref.html
-fuzzy-if(!OSX,0-1,0-2138) == trailing-space-1.html trailing-space-1-ref.html
+fuzzy-if(!cocoaWidget,0-1,0-2138) == trailing-space-1.html trailing-space-1-ref.html
 != invalidation-1-ref.html invalidation-2-ref.html
 == invalidation-1a.html invalidation-1-ref.html
 == invalidation-1b.html invalidation-1-ref.html
@@ -50,7 +50,7 @@ fuzzy-if(!OSX,0-1,0-2138) == trailing-space-1.html trailing-space-1-ref.html
 == invalidation-2f.html invalidation-2-ref.html
 fuzzy(0-7,0-4) needs-focus == rtl-selection-with-decoration.html rtl-selection-with-decoration-ref.html
 needs-focus == semitransparent-decoration-line.html semitransparent-decoration-line-ref.html
-fuzzy-if(OSX,0-1,0-6) fuzzy-if(Android,0-188,0-39) needs-focus == writing-mode.html writing-mode-ref.html
+fuzzy-if(cocoaWidget,0-1,0-6) fuzzy-if(Android,0-188,0-39) needs-focus == writing-mode.html writing-mode-ref.html
 needs-focus fuzzy(0-5,0-1) == 1478604.html 1478604-ref.html # !webrender: Seems like an antialiasing+invalidation issue.
 
 needs-focus fuzzy(0-3,0-13) == disabled-1.html disabled-1-ref.html
diff --git a/layout/reftests/svg/as-image/reftest.list b/layout/reftests/svg/as-image/reftest.list
index fe56ae0489..6349a94e88 100644
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@@ -36,12 +36,12 @@ fails-if(useDrawSnapshot) == background-scale-with-viewbox-1.html background-sca
 == canvas-drawImage-scale-1b.html lime100x100-ref.html
 == canvas-drawImage-scale-1c.html lime100x100-ref.html
 
-fuzzy(0-192,0-2112) == canvas-drawImage-scale-2a.html canvas-drawImage-scale-2-ref.html
-fuzzy(0-192,0-2112) == canvas-drawImage-scale-2b.html canvas-drawImage-scale-2-ref.html
+fuzzy(0-192,0-2151) == canvas-drawImage-scale-2a.html canvas-drawImage-scale-2-ref.html
+fuzzy(0-192,0-2151) == canvas-drawImage-scale-2b.html canvas-drawImage-scale-2-ref.html
 
-fuzzy-if(winWidget,0-1,0-10000) fuzzy-if(azureSkia,0-1,0-10000) fuzzy-if(Android,0-1,0-10000) == canvas-drawImage-alpha-1.html canvas-drawImage-alpha-1-ref.html
+fuzzy(0-1,0-10000) == canvas-drawImage-alpha-1.html canvas-drawImage-alpha-1-ref.html
 #Same as scale-2a but with globalAlpha:
-fuzzy(0-1,0-2) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-40000) fuzzy-if(azureSkia,0-1,0-40000) fuzzy-if(winWidget&&!remoteCanvas,0-1,0-39900) fuzzy-if(remoteCanvas&&!swgl,1-73,600-40000) fuzzy-if(Android&&device,0-48,0-39989) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2-ref.html
+fuzzy(0-1,0-40000) fuzzy-if(winWidget&&!swgl,1-73,600-40000) fuzzy-if(Android&&device,0-48,0-39989) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2-ref.html
 
 == canvas-drawImage-slice-1a.html lime100x100-ref.html
 == canvas-drawImage-slice-1b.html lime100x100-ref.html
@@ -107,7 +107,7 @@ random == img-and-image-1.html img-and-image-1-ref.svg # bug 645267
 # More complex <img> tests
 == img-blobURI-1.html lime100x100-ref.html
 skip == img-blobURI-2.html lime100x100-ref.html
-fuzzy-if(d2d,0-16,0-10) == img-content-outside-viewBox-1.html img-content-outside-viewBox-1-ref.html # d2d is bug 1074161
+fuzzy-if(winWidget,0-16,0-10) == img-content-outside-viewBox-1.html img-content-outside-viewBox-1-ref.html # winWidget is bug 1074161
 == img-display-none-1.html about:blank
 == img-dyn-1.html img-dyn-1-ref.html
 == img-foreignObject-1.html lime100x100-ref.html
@@ -169,10 +169,10 @@ fuzzy(0-255,0-10) == img-novb-width-slice-1.html img-novb-width-all-1-ref.html
 == svg-image-simple-3.svg lime100x100.svg
 
 # tests for <svg> files that include themselves as an <image>
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-1) == svg-image-recursive-1a.svg  svg-image-recursive-1-ref.svg
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-1) == svg-image-recursive-1b.svg  svg-image-recursive-1-ref.svg
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-1) == svg-image-recursive-2a.svg  svg-image-recursive-2-ref.svg
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-1) == svg-image-recursive-2b.html svg-image-recursive-2-ref.svg
+fuzzy-if(winWidget,0-1,0-1) == svg-image-recursive-1a.svg  svg-image-recursive-1-ref.svg
+fuzzy-if(winWidget,0-1,0-1) == svg-image-recursive-1b.svg  svg-image-recursive-1-ref.svg
+fuzzy-if(winWidget,0-1,0-1) == svg-image-recursive-2a.svg  svg-image-recursive-2-ref.svg
+fuzzy-if(winWidget,0-1,0-1) == svg-image-recursive-2b.html svg-image-recursive-2-ref.svg
 
 # tests for external resources vs. data URIs in SVG as an image
 == svg-image-datauri-1.html            lime100x100.svg
diff --git a/layout/reftests/svg/filters/css-filters/reftest.list b/layout/reftests/svg/filters/css-filters/reftest.list
index f204de98cd..3d659e0072 100644
--- a/layout/reftests/svg/filters/css-filters/reftest.list
+++ b/layout/reftests/svg/filters/css-filters/reftest.list
@@ -5,7 +5,7 @@
 == blur.svg blur-ref.svg
 == blur-calc.html blur-calc-ref.html
 == blur-calc-negative.html blur-calc-negative-ref.html
-fuzzy-if(cocoaWidget,0-1,0-2) skip-if(d2d) == blur-cap-large-radius-on-software.html blur-cap-large-radius-on-software-ref.html
+fuzzy-if(cocoaWidget,0-1,0-2) skip-if(winWidget) == blur-cap-large-radius-on-software.html blur-cap-large-radius-on-software-ref.html
 fuzzy-if(!useDrawSnapshot,2-5,4764-8168) fuzzy-if(Android&&device&&!swgl,5-5,8574-8574) == blur-clip-rect.html ../feGaussianBlur-4-ref.svg
 == blur-em-radius.html blur-em-radius-ref.html
 == blur-invalid-radius.html blur-invalid-radius-ref.html
@@ -30,42 +30,42 @@ fails-if(useDrawSnapshot) == blur-zoomed-page.html blur-zoomed-page-ref.html
 == drop-shadow-negative-offset.html drop-shadow-negative-offset-ref.html
 == filter-on-huge-bbox.html pass.svg
 fuzzy(0-1,0-44) fuzzy-if(winWidget,0-1,0-198) == filter-on-outer-svg.html pass.svg
-fuzzy(0-1,0-10000) fuzzy-if(d2d,0-1,0-10000) == grayscale.html grayscale-ref.html
-fuzzy(0-1,0-10000) fuzzy-if(d2d,0-1,0-10000) == grayscale-one.html grayscale-one-ref.html
-fuzzy(0-1,0-10000) fuzzy-if(d2d,0-1,0-10000) == grayscale-over-one.html grayscale-over-one-ref.html
-fuzzy(0-1,0-10000) fuzzy-if(d2d,0-1,0-10000) == grayscale-percent.html grayscale-percent-ref.html
+fuzzy(0-1,0-10000) == grayscale.html grayscale-ref.html
+fuzzy(0-1,0-10000) == grayscale-one.html grayscale-one-ref.html
+fuzzy(0-1,0-10000) == grayscale-over-one.html grayscale-over-one-ref.html
+fuzzy(0-1,0-10000) == grayscale-percent.html grayscale-percent-ref.html
 fuzzy(0-1,0-10000) == grayscale-zero.html grayscale-zero-ref.html
 == hue-rotate.html hue-rotate-ref.html
 == hue-rotate-360.html hue-rotate-360-ref.html
 == hue-rotate-grad.html hue-rotate-grad-ref.html
-fuzzy-if(!useDrawSnapshot&&!geckoview,2-2,7500-7500) fuzzy-if(d2d,0-2,0-7500) == hue-rotate-multichannel.html hue-rotate-multichannel-ref.html
+fuzzy-if(!useDrawSnapshot&&!geckoview,2-2,7500-7500) fuzzy-if(winWidget,0-2,0-7500) == hue-rotate-multichannel.html hue-rotate-multichannel-ref.html
 == hue-rotate-negative.html hue-rotate-negative-ref.html
 == hue-rotate-over-360.html hue-rotate-over-360-ref.html
 == hue-rotate-rad.html hue-rotate-rad-ref.html
 == hue-rotate-turn.html hue-rotate-turn-ref.html
 == hue-rotate-zero.html hue-rotate-zero-ref.html
-fuzzy(0-1,0-10000) fuzzy-if(d2d,0-1,0-10000) == invert.html invert-ref.html
+fuzzy(0-1,0-10000) == invert.html invert-ref.html
 fuzzy(0-1,0-10000) == invert-half.html invert-half-ref.html
 == invert-one.html invert-one-ref.html
 == invert-over-one.html invert-over-one-ref.html
-fuzzy(0-1,0-10000) fuzzy-if(d2d,0-1,0-10000) == invert-percent.html invert-percent-ref.html
+fuzzy(0-1,0-10000) == invert-percent.html invert-percent-ref.html
 == invert-zero.html invert-zero-ref.html
-fuzzy-if(!useDrawSnapshot&&!geckoview,1-1,10000-10000) fuzzy-if(d2d,0-1,0-10000) == opacity.html opacity-ref.html
+fuzzy-if(!useDrawSnapshot&&!geckoview,1-1,10000-10000) fuzzy-if(winWidget,0-1,0-10000) == opacity.html opacity-ref.html
 == opacity-one.html opacity-one-ref.html
 == opacity-over-one.html opacity-over-one-ref.html
 fuzzy(0-1,0-10000) == opacity-over-one-translucent-source.html opacity-over-one-translucent-source-ref.html
-fuzzy-if(!useDrawSnapshot&&!geckoview,1-1,10000-10000) fuzzy-if(d2d,0-1,0-10000) == opacity-percent.html opacity-percent-ref.html
+fuzzy-if(!useDrawSnapshot&&!geckoview,1-1,10000-10000) fuzzy-if(winWidget,0-1,0-10000) == opacity-percent.html opacity-percent-ref.html
 == opacity-zero.html opacity-zero-ref.html
 == saturate.html saturate-ref.html
-fuzzy-if(!useDrawSnapshot&&!geckoview,1-1,10000-10000) fuzzy-if(d2d,0-1,0-10000) == saturate-desaturate.html saturate-desaturate-ref.html
+fuzzy-if(!useDrawSnapshot&&!geckoview,1-1,10000-10000) fuzzy-if(winWidget,0-1,0-10000) == saturate-desaturate.html saturate-desaturate-ref.html
 == saturate-extreme.html saturate-extreme-ref.html
 == saturate-one.html saturate-one-ref.html
 == saturate-percent.html saturate-percent-ref.html
-fuzzy-if(!useDrawSnapshot&&!geckoview,1-1,10000-10000) fuzzy-if(d2d,0-1,0-10000) == saturate-zero.html saturate-zero-ref.html
-fuzzy(0-1,0-10000) fuzzy-if(d2d,0-1,0-10000) == sepia.html sepia-ref.html
-fuzzy(0-1,0-10000) fuzzy-if(d2d,0-1,0-10000) == sepia-one.html sepia-one-ref.html
-fuzzy(0-1,0-10000) fuzzy-if(d2d,0-1,0-10000) == sepia-over-one.html sepia-over-one-ref.html
-fuzzy(0-1,0-10000) fuzzy-if(d2d,0-1,0-10000) == sepia-percent.html sepia-percent-ref.html
+fuzzy-if(!useDrawSnapshot&&!geckoview,1-1,10000-10000) fuzzy-if(winWidget,0-1,0-10000) == saturate-zero.html saturate-zero-ref.html
+fuzzy(0-1,0-10000) == sepia.html sepia-ref.html
+fuzzy(0-1,0-10000) == sepia-one.html sepia-one-ref.html
+fuzzy(0-1,0-10000) == sepia-over-one.html sepia-over-one-ref.html
+fuzzy(0-1,0-10000) == sepia-percent.html sepia-percent-ref.html
 == sepia-zero.html sepia-zero-ref.html
 
 fuzzy(0-2,0-125000) == scale-filtered-content-01.html scale-filtered-content-01-ref.html
diff --git a/layout/reftests/svg/filters/reftest.list b/layout/reftests/svg/filters/reftest.list
index 9975eb190d..f6b43420a5 100644
--- a/layout/reftests/svg/filters/reftest.list
+++ b/layout/reftests/svg/filters/reftest.list
@@ -39,7 +39,7 @@ fuzzy(0-1,0-10000) == feComposite-2.svg feComposite-2-ref.svg
 == feDisplacementMap-2.svg feDisplacementMap-2-ref.svg
 
 fuzzy(0-1,0-1600) == feFlood-1.svg feFlood-1-ref.svg
-skip-if(d2d) fuzzy(0-1,0-6400) == feFlood-2.svg feFlood-2-ref.svg
+skip-if(winWidget) fuzzy(0-1,0-6400) == feFlood-2.svg feFlood-2-ref.svg
 
 fuzzy(0-2,0-6404) fuzzy-if(Android&&device&&!swgl,6-6,6400-6400) == feGaussianBlur-1.svg feGaussianBlur-1-ref.svg
 fuzzy(0-2,0-304) == feGaussianBlur-2.svg feGaussianBlur-2-ref.svg
@@ -47,7 +47,7 @@ fuzzy(0-2,0-304) == feGaussianBlur-2.svg feGaussianBlur-2-ref.svg
 fuzzy-if(!useDrawSnapshot,2-5,4764-8168) fuzzy-if(Android&&device&&!swgl,5-5,8574-8574) == feGaussianBlur-4.svg feGaussianBlur-4-ref.svg
 fuzzy-if(geckoview,0-4,0-200) == feGaussianBlur-5.svg feGaussianBlur-5-ref.svg
 == feGaussianBlur-6.svg feGaussianBlur-6-ref.svg
-skip-if(d2d) == feGaussianBlur-cap-large-directional-radius-on-software.html feGaussianBlur-cap-large-directional-radius-on-software-ref.html
+skip-if(winWidget) == feGaussianBlur-cap-large-directional-radius-on-software.html feGaussianBlur-cap-large-directional-radius-on-software-ref.html
 
 != feImage-1.svg about:blank # (Make sure our image renders at all)
 == feImage-1.svg feImage-1-ref.svg
@@ -107,7 +107,7 @@ fuzzy(0-1,0-400) == feDisplacementMap-alpha-01.svg pass.svg
 fuzzy(0-2,0-500) == feDisplacementMap-colour-01.svg feDisplacementMap-colour-01-ref.svg
 == feDisplacementMap-scale-01.svg pass.svg
 
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-2,0-25) fuzzy-if(!useDrawSnapshot,55-98,14033-16467) == feDropShadow-01.svg feDropShadow-01-ref.svg
+fuzzy-if(winWidget,0-2,0-25) fuzzy-if(!useDrawSnapshot,55-98,14033-16467) == feDropShadow-01.svg feDropShadow-01-ref.svg
 
 == feFlood-color-01.svg pass.svg
 
@@ -124,7 +124,7 @@ fuzzy-if(!useDrawSnapshot||(winWidget&&isCoverageBuild),20-21,5540-5647) == feGa
 
 fuzzy(0-1,0-219) == feDiffuseLighting-1.svg feDiffuseLighting-1-ref.svg
 
-fuzzy(0-2,0-2659) skip-if(d2d) == feSpecularLighting-1.svg feSpecularLighting-1-ref.svg
+fuzzy(0-2,0-2659) skip-if(winWidget) == feSpecularLighting-1.svg feSpecularLighting-1-ref.svg
 
 == filter-lighting-region.svg filter-lighting-region-ref.svg
 
diff --git a/layout/reftests/svg/filters/svg-filter-chains/reftest.list b/layout/reftests/svg/filters/svg-filter-chains/reftest.list
index 12ddf9d8bb..7076e70f25 100644
--- a/layout/reftests/svg/filters/svg-filter-chains/reftest.list
+++ b/layout/reftests/svg/filters/svg-filter-chains/reftest.list
@@ -11,6 +11,6 @@ fuzzy(0-5,0-20300) fuzzy-if(Android&&device&&!swgl,5-5,21751-21751) == default-s
 == intersecting-filter-regions.svg intersecting-filter-regions-ref.svg
 fuzzy-if(!useDrawSnapshot,9-9,5168-5536) fuzzy-if(!useDrawSnapshot&&swgl,7-7,13170-13184) fuzzy-if(Android&&device&&!swgl,8-8,12391-12391) == long-chain.svg simple-chain-ref.svg
 fuzzy-if(!useDrawSnapshot,9-9,5168-5536) fuzzy-if(!useDrawSnapshot&&swgl,7-7,13170-13184) fuzzy-if(Android&&device&&!swgl,8-8,12391-12391) == multiple-primitives-per-filter.svg simple-chain-ref.svg
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-173) fuzzy-if(!useDrawSnapshot||(winWidget&&isCoverageBuild),9-9,5128-5496) fuzzy-if(!useDrawSnapshot&&swgl,7-7,12820-12830) fuzzy-if(Android&&device&&!swgl,8-8,12355-12355) == second-filter-uses-SourceAlpha.svg second-filter-uses-SourceAlpha-ref.svg
+fuzzy-if(winWidget,0-1,0-173) fuzzy-if(!useDrawSnapshot||(winWidget&&isCoverageBuild),9-9,5128-5496) fuzzy-if(!useDrawSnapshot&&swgl,7-7,12820-12830) fuzzy-if(Android&&device&&!swgl,8-8,12355-12355) == second-filter-uses-SourceAlpha.svg second-filter-uses-SourceAlpha-ref.svg
 fuzzy-if(!useDrawSnapshot,9-9,5168-5536) fuzzy-if(!useDrawSnapshot&&swgl,7-7,13170-13180) fuzzy-if(Android&&device&&!swgl,8-8,12391-12391) == second-filter-uses-SourceGraphic.svg simple-chain-ref.svg
 == simple-chain.svg simple-chain-ref.svg
diff --git a/layout/reftests/svg/moz-only/reftest.list b/layout/reftests/svg/moz-only/reftest.list
index ce73d4119c..c6ee4d296c 100644
--- a/layout/reftests/svg/moz-only/reftest.list
+++ b/layout/reftests/svg/moz-only/reftest.list
@@ -1,6 +1,6 @@
 # Tests for zooming with the full page zoom UI
-random-if(d2d) == feImage-zoom-01a.svg          feImage-zoom-01-ref.svg
-random-if(d2d) == feImage-zoom-01b.svg          feImage-zoom-01-ref.svg
+random-if(winWidget) == feImage-zoom-01a.svg          feImage-zoom-01-ref.svg
+random-if(winWidget) == feImage-zoom-01b.svg          feImage-zoom-01-ref.svg
 == foreignObject-zoom-01.svg                    pass.svg
 == zoom-invalidation-01.svg                     pass.svg
 == replaced-element-zoom-01.html                pass.svg
diff --git a/layout/reftests/svg/reftest.list b/layout/reftests/svg/reftest.list
index 3504084b5d..5f1da97375 100644
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@@ -37,11 +37,11 @@ needs-focus == autofocus-02b.svg pass.svg
 == baseline-middle-01.svg pass.svg
 
 == blend-color-burn.svg blend-color-burn-ref.svg
-fuzzy-if(winWidget&&gpuProcess&&!d2d,0-1,0-1600) == blend-color-dodge.svg blend-color-dodge-ref.svg
+== blend-color-dodge.svg blend-color-dodge-ref.svg
 # == blend-color.svg blend-color-ref.svg
 == blend-darken.svg blend-darken-ref.svg
 == blend-difference.svg blend-difference-ref.svg
-fuzzy(0-1,0-1600) fuzzy-if(geckoview,0-5,0-254) == blend-exclusion.svg blend-exclusion-ref.svg
+fuzzy(0-1,0-1600) fuzzy-if(Android,0-5,0-254) == blend-exclusion.svg blend-exclusion-ref.svg
 # == blend-hard-light.svg blend-hard-light-ref.svg
 # == blend-hue.svg blend-hue-ref.svg
 == blend-layer-blend.svg blend-layer-blend-ref.svg
@@ -164,7 +164,7 @@ fuzzy(0-1,0-10000) == dynamic-filter-contents-01b.svg dynamic-filter-contents-01
 == dynamic-pattern-contents-01.svg pass.svg
 == dynamic-pattern-contents-02.svg pass.svg
 == dynamic-rect-01.svg dynamic-rect-01-ref.svg
-fuzzy-if(d2d&&layersGPUAccelerated,0-3,0-1200) == dynamic-rect-02.svg dynamic-rect-02-ref.svg # bug 776038 for Win7, Win8
+fuzzy-if(winWidget,0-3,0-1200) == dynamic-rect-02.svg dynamic-rect-02-ref.svg # bug 776038 for Win7, Win8
 == dynamic-rect-03.svg dynamic-rect-03-ref.svg
 == dynamic-rect-04.xhtml pass.svg
 == dynamic-rect-05.svg pass.svg
@@ -176,8 +176,8 @@ fuzzy-if(d2d&&layersGPUAccelerated,0-3,0-1200) == dynamic-rect-02.svg dynamic-re
 == dynamic-stroke-width-01.svg pass.svg
 == dynamic-switch-01.svg pass.svg
 == dynamic-text-01.svg dynamic-text-01-ref.svg
-fuzzy-if(d2d&&layersGPUAccelerated,0-3,0-12739) == dynamic-text-02.svg dynamic-text-02-ref.svg # bug 776038 for Win7, Win8
-fuzzy-if(d2d&&layersGPUAccelerated,0-2,0-10539) == dynamic-text-03.svg dynamic-text-03-ref.svg # bug 776038 for Win7
+fuzzy-if(winWidget,0-3,0-12739) == dynamic-text-02.svg dynamic-text-02-ref.svg # bug 776038 for Win7, Win8
+fuzzy-if(winWidget,0-2,0-10539) == dynamic-text-03.svg dynamic-text-03-ref.svg # bug 776038 for Win7
 == dynamic-text-04.svg dynamic-text-04-ref.svg
 == dynamic-text-05.svg pass.svg
 == dynamic-text-06.svg pass.svg
@@ -226,7 +226,7 @@ skip pref(security.fileuri.strict_origin_policy,true) == filter-extref-different
 == filter-foreignObject-01.svg pass.svg
 == filter-in-mask-01.svg pass.svg
 == filter-invalidation-01.svg pass.svg
-fuzzy(0-71,0-821) fails-if(winWidget) fuzzy-if(OSX&&!swgl,1-1,216-458) == filter-on-continuation-box-01.html filter-on-continuation-box-ref.html
+fuzzy(0-71,0-821) fails-if(winWidget) fuzzy-if(cocoaWidget&&!swgl,1-1,216-458) == filter-on-continuation-box-01.html filter-on-continuation-box-ref.html
 == filter-result-01.svg filter-result-01-ref.svg
 == filter-scaled-01.svg pass.svg
 fuzzy(0-1,0-500) == filter-scaled-02.html filter-scaled-02-ref.html
@@ -333,7 +333,7 @@ fuzzy(0-1,0-6400) == mask-type-04.svg mask-type-01-ref.svg
 
 fuzzy(0-3,0-448000) == nesting-invalid-01.svg nesting-invalid-01-ref.svg
 
-fuzzy(0-2,0-1000) == non-scaling-stroke-01.svg non-scaling-stroke-01-ref.svg # bug 1074161 for Win7 and OSX 10.8
+fuzzy(0-2,0-1000) == non-scaling-stroke-01.svg non-scaling-stroke-01-ref.svg
 fuzzy(0-51,0-900) fuzzy-if(Android,0-51,0-4090) fails-if(useDrawSnapshot) == non-scaling-stroke-02.svg non-scaling-stroke-02-ref.svg
 == non-scaling-stroke-03.svg non-scaling-stroke-03-ref.svg
 
@@ -350,7 +350,7 @@ fuzzy(0-51,0-900) fuzzy-if(Android,0-51,0-4090) fails-if(useDrawSnapshot) == non
 == objectBoundingBox-and-pattern-03.svg objectBoundingBox-and-pattern-03-ref.svg
 
 == opacity-and-gradient-01.svg pass.svg
-skip-if(d2d) fuzzy(0-1,0-200000) == opacity-and-gradient-02.svg opacity-and-gradient-02-ref.svg
+skip-if(winWidget) fuzzy(0-1,0-200000) == opacity-and-gradient-02.svg opacity-and-gradient-02-ref.svg
 == opacity-and-pattern-01.svg pass.svg
 fuzzy(0-1,0-10000) == opacity-and-transform-01.svg opacity-and-transform-01-ref.svg
 
@@ -369,11 +369,11 @@ fuzzy(0-7,0-214) == outline.html outline-ref.html # Bug 1503525
 == paint-on-maskLayer-1a.html paint-on-maskLayer-1-ref.html
 == paint-on-maskLayer-1b.html paint-on-maskLayer-1-ref.html
 == paint-on-maskLayer-1c.html paint-on-maskLayer-1-ref.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-16,0-5) == paint-order-01.svg paint-order-01-ref.svg
+fuzzy-if(winWidget,0-16,0-5) == paint-order-01.svg paint-order-01-ref.svg
 == paint-order-02.svg paint-order-02-ref.svg
 == paint-order-03.svg paint-order-03-ref.svg
 
-#fuzzy(0-23,0-60) fails-if(d2d) == path-01.svg path-01-ref.svg
+#fuzzy(0-23,0-60) fails-if(winWidget) == path-01.svg path-01-ref.svg
 == path-02.svg pass.svg
 == path-04.svg pass.svg
 == path-05.svg pass.svg
@@ -494,7 +494,7 @@ random-if(gtkWidget) != text-language-01.xhtml text-language-01-ref.xhtml # Fail
 == text-layout-03.svg text-layout-03-ref.svg
 == text-layout-04.svg text-layout-04-ref.svg
 == text-layout-05.svg text-layout-05-ref.svg
-fuzzy-if(cocoaWidget&&layersGPUAccelerated,0-1,0-3) == text-layout-06.svg text-layout-06-ref.svg
+fuzzy-if(cocoaWidget,0-1,0-3) == text-layout-06.svg text-layout-06-ref.svg
 == text-layout-07.svg text-layout-07-ref.svg
 == text-layout-08.svg text-layout-08-ref.svg
 == text-layout-09.svg pass.svg
@@ -630,7 +630,7 @@ fails-if(Android) != mask-resource.html about:blank # The image the test uses is
 == 1570363-1.html 1570363-1-ref.html
 
 fuzzy(0-1,0-150) == mask-opacity-invalidation-1.html mask-opacity-invalidation-1-ref.html # clip-path mask/opacity optimization
-skip-if(Android) skip-if(cocoaWidget) skip-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)) == transform-animation-on-path.html transform-animation-on-path-ref.html #Bug 1638909
+skip-if(Android) skip-if(cocoaWidget) skip-if(winWidget) == transform-animation-on-path.html transform-animation-on-path-ref.html #Bug 1638909
 
 fuzzy(0-20,0-110) == 1792313.svg 1792313-ref.svg
 pref(svg.use-element.recursive-clone-limit.enabled,1) != about:blank explosive-use.svg
diff --git a/layout/reftests/svg/sizing/reftest.list b/layout/reftests/svg/sizing/reftest.list
index 789d551147..5bd3ada14f 100644
--- a/layout/reftests/svg/sizing/reftest.list
+++ b/layout/reftests/svg/sizing/reftest.list
@@ -89,7 +89,7 @@
 == standalone--auto-auto--0-pct.svg     pass-empty.svg
 == standalone--auto-auto--0-px.svg      pass-empty.svg
 == standalone--auto-auto--pct-0.svg     pass-empty.svg
-fuzzy-if(d2d,0-1,0-400) == standalone--auto-auto--pct-pct.svg   pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--auto-auto--pct-pct.svg   pass-pct-pct.xhtml
 == standalone--auto-auto--pct-px.svg    pass-pct-px.xhtml
 == standalone--auto-auto--px-0.svg      pass-empty.svg
 == standalone--auto-auto--px-pct.svg    pass-px-pct.xhtml
@@ -98,12 +98,12 @@ fuzzy-if(d2d,0-1,0-400) == standalone--auto-auto--pct-pct.svg   pass-pct-pct.xht
 == standalone--auto-pct--0-0.svg        pass-empty.svg
 == standalone--auto-pct--0-pct.svg      pass-empty.svg
 == standalone--auto-pct--0-px.svg       pass-empty.svg
-fuzzy-if(d2d,0-1,0-400) == standalone--auto-pct--pct-0.svg      pass-pct-pct.xhtml
-fuzzy-if(d2d,0-1,0-400) == standalone--auto-pct--pct-pct.svg    pass-pct-pct.xhtml
-fuzzy-if(d2d,0-1,0-400) == standalone--auto-pct--pct-px.svg     pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--auto-pct--pct-0.svg      pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--auto-pct--pct-pct.svg    pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--auto-pct--pct-px.svg     pass-pct-pct.xhtml
 == standalone--auto-pct--px-0.svg       pass-px-pct.xhtml
 == standalone--auto-pct--px-pct.svg     pass-px-pct.xhtml
-fuzzy-if(d2d,0-1,0-1000) == standalone--auto-pct--px-px.svg      pass-pct-height-square.xhtml # intrinsic ratio!
+fuzzy-if(winWidget,0-1,0-1000) == standalone--auto-pct--px-px.svg      pass-pct-height-square.xhtml # intrinsic ratio!
 
 == standalone--auto-px--0-0.svg         pass-empty.svg
 == standalone--auto-px--0-pct.svg       pass-empty.svg
@@ -126,24 +126,24 @@ fuzzy-if(d2d,0-1,0-1000) == standalone--auto-pct--px-px.svg      pass-pct-height
 == standalone--pct-0--px-px.svg         pass-empty.svg
 
 == standalone--pct-auto--0-0.svg        pass-empty.svg
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-auto--0-pct.svg      pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-auto--0-pct.svg      pass-pct-pct.xhtml
 == standalone--pct-auto--0-px.svg       pass-pct-px.xhtml
 == standalone--pct-auto--pct-0.svg      pass-empty.svg
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-auto--pct-pct.svg    pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-auto--pct-pct.svg    pass-pct-pct.xhtml
 == standalone--pct-auto--pct-px.svg     pass-pct-px.xhtml
 == standalone--pct-auto--px-0.svg       pass-empty.svg
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-auto--px-pct.svg     pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-auto--px-pct.svg     pass-pct-pct.xhtml
 == standalone--pct-auto--px-px.svg      pass-pct-width-square.xhtml # intrinsic ratio!
 
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-pct--0-0.svg         pass-pct-pct.xhtml
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-pct--0-pct.svg       pass-pct-pct.xhtml
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-pct--0-px.svg        pass-pct-pct.xhtml
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-pct--pct-0.svg       pass-pct-pct.xhtml
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-pct--pct-pct.svg     pass-pct-pct.xhtml
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-pct--pct-px.svg      pass-pct-pct.xhtml
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-pct--px-0.svg        pass-pct-pct.xhtml
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-pct--px-pct.svg      pass-pct-pct.xhtml
-fuzzy-if(d2d,0-1,0-400) == standalone--pct-pct--px-px.svg       pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-pct--0-0.svg         pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-pct--0-pct.svg       pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-pct--0-px.svg        pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-pct--pct-0.svg       pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-pct--pct-pct.svg     pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-pct--pct-px.svg      pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-pct--px-0.svg        pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-pct--px-pct.svg      pass-pct-pct.xhtml
+fuzzy-if(winWidget,0-1,0-400) == standalone--pct-pct--px-px.svg       pass-pct-pct.xhtml
 
 == standalone--pct-px--0-0.svg          pass-pct-px.xhtml
 == standalone--pct-px--0-pct.svg        pass-pct-px.xhtml
@@ -260,7 +260,7 @@ fuzzy-if(d2d,0-1,0-400) == standalone--pct-pct--px-px.svg       pass-pct-pct.xht
 # coverage.
 
 == inline--display-block--01.xhtml inline--display-block--01-ref.xhtml
-fuzzy-if(OSX,0-1,0-10) == inline--display-inline--01.xhtml inline--display-inline--01-ref.xhtml
+fuzzy-if(cocoaWidget,0-1,0-10) == inline--display-inline--01.xhtml inline--display-inline--01-ref.xhtml
 == inline--display-inline-block--01.xhtml inline--display-inline-block--01-ref.xhtml
 == inline--float-left--01.xhtml            inline--float-left--01-ref.xhtml
 == inline--float-right--01.xhtml           inline--float-right--01-ref.xhtml
diff --git a/layout/reftests/svg/smil/container/reftest.list b/layout/reftests/svg/smil/container/reftest.list
index c492817d3f..b0126efc1f 100644
--- a/layout/reftests/svg/smil/container/reftest.list
+++ b/layout/reftests/svg/smil/container/reftest.list
@@ -5,10 +5,10 @@
 random == enveloped-tree-1.xhtml enveloped-tree-1-ref.xhtml # bug 470868
 fuzzy(0-1,0-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) == deferred-anim-1.xhtml deferred-anim-1-ref.xhtml # bug 470868, bug 585484
-random-if(cocoaWidget&&layersGPUAccelerated) == deferred-tree-1.xhtml deferred-tree-1-ref.xhtml # bug 470868
-random-if(cocoaWidget&&layersGPUAccelerated) fuzzy(0-1,0-530) == deferred-tree-2a.xhtml deferred-tree-2-ref.xhtml # bug 470868
-random-if(cocoaWidget&&layersGPUAccelerated) fuzzy(0-1,0-530) == deferred-tree-2b.xhtml deferred-tree-2-ref.xhtml # bug 470868
+random-if(cocoaWidget||winWidget) == deferred-anim-1.xhtml deferred-anim-1-ref.xhtml # bug 470868, bug 585484
+random-if(cocoaWidget) == deferred-tree-1.xhtml deferred-tree-1-ref.xhtml # bug 470868
+random-if(cocoaWidget) fuzzy(0-1,0-530) == deferred-tree-2a.xhtml deferred-tree-2-ref.xhtml # bug 470868
+random-if(cocoaWidget) fuzzy(0-1,0-530) == deferred-tree-2b.xhtml deferred-tree-2-ref.xhtml # bug 470868
 fuzzy(0-1,0-410) == deferred-tree-3a.xhtml deferred-tree-3-ref.xhtml
 fuzzy(0-1,0-110) == deferred-tree-3b.xhtml deferred-tree-3-ref.xhtml
 fuzzy(0-1,0-110) == deferred-tree-3c.xhtml deferred-tree-3-ref.xhtml
diff --git a/layout/reftests/svg/smil/reftest.list b/layout/reftests/svg/smil/reftest.list
index 1ec28de14a..0f1c5541c3 100644
--- a/layout/reftests/svg/smil/reftest.list
+++ b/layout/reftests/svg/smil/reftest.list
@@ -237,7 +237,7 @@ skip == anim-text-x-y-dx-dy-01.svg anim-text-x-y-dx-dy-01-ref.svg # bug 579588
 # Test we don't rely on HasAttr to see if an attribute has been set
 == anim-rect-rxry-1.svg anim-rect-rxry-1-ref.svg
 fuzzy(0-1,0-350) == anim-pattern-attr-presence-01.svg anim-pattern-attr-presence-01-ref.svg
-fuzzy-if(cocoaWidget&&layersGPUAccelerated,0-1,0-2) == anim-gradient-attr-presence-01.svg anim-gradient-attr-presence-01-ref.svg
+fuzzy-if(cocoaWidget,0-1,0-2) == anim-gradient-attr-presence-01.svg anim-gradient-attr-presence-01-ref.svg
 
 == api-sanity-1.svg lime.svg
 
diff --git a/layout/reftests/svg/svg-integration/clip-path/reftest.list b/layout/reftests/svg/svg-integration/clip-path/reftest.list
index 82d4c813f5..d60f61dab0 100644
--- a/layout/reftests/svg/svg-integration/clip-path/reftest.list
+++ b/layout/reftests/svg/svg-integration/clip-path/reftest.list
@@ -32,7 +32,7 @@ fuzzy-if(!useDrawSnapshot,35-70,696-800) == clip-path-circle-013.html clip-path-
 fuzzy-if(!useDrawSnapshot,34-70,696-925) == clip-path-circle-014.html clip-path-circle-007-ref.html
 fuzzy-if(!useDrawSnapshot,34-70,696-925) == clip-path-circle-015.html clip-path-circle-008-ref.html
 fuzzy-if(!useDrawSnapshot,34-70,696-925) == clip-path-circle-016.html clip-path-circle-009-ref.html
-fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-16,0-9) fuzzy-if(!useDrawSnapshot,34-70,696-920) == clip-path-circle-017.html clip-path-circle-007-ref.html
+fuzzy-if(winWidget,0-16,0-9) fuzzy-if(!useDrawSnapshot,34-70,696-920) == clip-path-circle-017.html clip-path-circle-007-ref.html
 fuzzy-if(!useDrawSnapshot,35-70,696-800) == clip-path-circle-018.html clip-path-circle-010-ref.html
 fuzzy-if(!useDrawSnapshot,35-70,696-800) == clip-path-circle-019.html clip-path-circle-002-ref.html
 fuzzy-if(!useDrawSnapshot,35-70,696-800) == clip-path-circle-020.html clip-path-circle-002-ref.html
diff --git a/layout/reftests/svg/text/reftest.list b/layout/reftests/svg/text/reftest.list
index 8b62546713..14b3c68b34 100644
--- a/layout/reftests/svg/text/reftest.list
+++ b/layout/reftests/svg/text/reftest.list
@@ -2,10 +2,10 @@ fuzzy-if(winWidget,47-127,221-254) == simple.svg simple-ref.html
 == simple-2.svg simple.svg
 fuzzy-if(winWidget,47-127,221-254) == simple-underline.svg simple-underline-ref.html
 == simple-underline-scaled.svg simple-underline-scaled-ref.svg
-fuzzy-if(winWidget,47-166,255-318) fuzzy-if(OSX,0-1,0-1) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html
+fuzzy-if(winWidget,47-166,255-318) fuzzy-if(cocoaWidget,0-1,0-1) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html
 fuzzy-if(winWidget,47-139,181-204) == simple-anchor-end-rtl.svg simple-anchor-end-rtl-ref.html
 fuzzy-if(winWidget,47-137,181-250) == simple-anchor-end.svg simple-anchor-end-ref.html
-fuzzy-if(dwrite,0-104,0-131) fuzzy-if(cocoaWidget,0-143,0-124) fuzzy-if(!(gtkWidget||geckoview),79-200,59-319) == simple-anchor-middle-bidi.svg simple-anchor-middle-bidi-ref.html
+fuzzy-if(winWidget,0-104,0-131) fuzzy-if(cocoaWidget,0-143,0-124) fuzzy-if(!(gtkWidget||geckoview),79-200,59-319) == simple-anchor-middle-bidi.svg simple-anchor-middle-bidi-ref.html
 fuzzy-if(winWidget,47-138,188-207) == simple-anchor-middle-rtl.svg simple-anchor-middle-rtl-ref.html
 fuzzy(0-111,0-81) fuzzy-if(winWidget,47-181,221-257) == simple-anchor-middle.svg simple-anchor-middle-ref.html
 fuzzy-if(winWidget,47-138,260-319) == simple-bidi.svg simple-bidi-ref.html
@@ -25,7 +25,7 @@ fuzzy-if(winWidget,47-138,260-319) == simple-bidi.svg simple-bidi-ref.html
 == simple-dx-rtl-2.svg simple-dx-rtl-2-ref.svg
 
 == simple-fill-color-dynamic.svg simple-fill-color-dynamic-ref.svg
-fuzzy-if(winWidget,47-129,221-254) fuzzy-if(OSX,23-65,195-196) == simple-fill-color.svg simple-fill-color-ref.html
+fuzzy-if(winWidget,47-129,221-254) fuzzy-if(cocoaWidget,23-65,195-196) == simple-fill-color.svg simple-fill-color-ref.html
 == simple-fill-gradient.svg simple-fill-gradient-ref.svg
 == simple-fill-none.svg simple.svg
 == simple-pointer-events.svg simple.svg
@@ -133,7 +133,7 @@ fuzzy(0-4,0-100) == textLength-3.svg textLength-3-ref.svg
 == textLength-6.svg textLength-6-ref.svg
 
 # text-shadow
-fuzzy(0-127,0-5) fuzzy-if(Android,0-127,0-12) == text-shadow.svg text-shadow-ref.svg
+== text-shadow.svg text-shadow-ref.svg
 
 # vertical text
 == vertical-01.svg vertical-01-ref.svg
@@ -173,7 +173,7 @@ fuzzy(0-127,0-5) fuzzy-if(Android,0-127,0-12) == text-shadow.svg text-shadow-ref
 == dynamic-dominant-baseline.svg dynamic-dominant-baseline-ref.svg
 == dynamic-multiple-x.svg dynamic-multiple-x-ref.svg
 fuzzy(0-1,0-200) == dynamic-non-scaling-stroke.svg dynamic-non-scaling-stroke-ref.svg #Bug 885316
-fuzzy(0-127,0-5) fuzzy-if(Android,0-127,0-41) == dynamic-text-shadow.svg text-shadow-ref.svg
+== dynamic-text-shadow.svg text-shadow-ref.svg
 
 # text and masks
 fuzzy-if(winWidget,0-50,0-224) == mask-applied.svg mask-applied-ref.svg
@@ -202,7 +202,7 @@ fuzzy(0-1,0-600) needs-focus == selectSubString-2.svg selectSubString-2-ref.svg
 fuzzy(0-1,0-250) needs-focus == selectSubString-3.svg selectSubString-3-ref.svg
 fuzzy-if(!geckoview,0-1,0-237) needs-focus fuzzy-if(winWidget,55-148,200-254) == simple-selection.svg simple-selection-ref.html
 fuzzy(0-1,0-100) needs-focus fuzzy-if(winWidget,55-148,200-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
-fuzzy(0-1,0-50) needs-focus fuzzy-if(winWidget,55-148,200-254) fuzzy-if(OSX,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
+fuzzy(0-1,0-50) needs-focus fuzzy-if(winWidget,55-148,200-254) fuzzy-if(cocoaWidget,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
 fuzzy(0-1,0-150) needs-focus fuzzy-if(winWidget,125-148,221-254) == simple-underline-selection.svg simple-underline-selection-ref.html # Bug 1392106
 fuzzy(0-1,0-300) needs-focus fuzzy-if(Android13,0-3,0-926) fuzzy-if(winWidget,134-152,432-501) == multiple-text-selection.svg multiple-text-selection-ref.html # Bug 1392106
 needs-focus == multiple-chunks-selection.svg multiple-chunks-selection-ref.svg
diff --git a/layout/reftests/table-anonymous-boxes/reftest.list b/layout/reftests/table-anonymous-boxes/reftest.list
index 03468ebb1a..2d95873173 100644
--- a/layout/reftests/table-anonymous-boxes/reftest.list
+++ b/layout/reftests/table-anonymous-boxes/reftest.list
@@ -27,7 +27,7 @@ fuzzy(0-1,0-6) == 339388-1b.html 339388-1-ref.html
 == 372641-1c.xhtml 372641-1-ref.xhtml
 == 372649-1.html 372649-1-ref.html
 == 373379-1.html 373379-1-ref.html
-random-if(d2d) == 394402-1a.html 394402-1-ref.html # bug 586833
+random-if(winWidget) == 394402-1a.html 394402-1-ref.html # bug 586833
 == 394402-1b.html 394402-1-ref.html # bug 586833
 == 398095-1.html 398095-1-ref.html
 == 407115-1.html 407115-1-ref.html
diff --git a/layout/reftests/table-overflow/bug785684-x-ref.html b/layout/reftests/table-overflow/bug785684-x-ref.html
index f54122f124..5dd831f1cb 100644
--- a/layout/reftests/table-overflow/bug785684-x-ref.html
+++ b/layout/reftests/table-overflow/bug785684-x-ref.html
@@ -26,7 +26,6 @@
  .clip {
     overflow:hidden;
     width: 300px;
-    height: 20px;
     box-sizing: border-box;
  }
   </style>
diff --git a/layout/reftests/table-overflow/bug785684-y-ref.html b/layout/reftests/table-overflow/bug785684-y-ref.html
index 5033b56e04..9bf3bb4e71 100644
--- a/layout/reftests/table-overflow/bug785684-y-ref.html
+++ b/layout/reftests/table-overflow/bug785684-y-ref.html
@@ -26,7 +26,6 @@
  .clip {
     overflow:hidden;
     width: 300px;
-    height: 20px;
     box-sizing: border-box;
  }
   </style>
diff --git a/layout/reftests/table-overflow/reftest.list b/layout/reftests/table-overflow/reftest.list
index 7b11d4f5f7..5aeffc5285 100644
--- a/layout/reftests/table-overflow/reftest.list
+++ b/layout/reftests/table-overflow/reftest.list
@@ -1,6 +1,7 @@
 defaults pref(layout.tables.scrollable-cells,true)
 
-skip-if(ThreadSanitizer) == bug785684-x.html bug785684-x-ref.html
-== bug785684-y.html bug785684-y-ref.html
+# Android: Tests assume non-overlay scrollbars
+fails-if(Android) skip-if(ThreadSanitizer) == bug785684-x.html bug785684-x-ref.html
+fails-if(Android) == bug785684-y.html bug785684-y-ref.html
 == table-caption-scroll.html table-caption-scroll-ref.html
 == table-cell-block-overflow.html table-cell-block-overflow-ref.html
diff --git a/layout/reftests/text-overflow/reftest.list b/layout/reftests/text-overflow/reftest.list
index 6c5f982c87..99e7739b08 100644
--- a/layout/reftests/text-overflow/reftest.list
+++ b/layout/reftests/text-overflow/reftest.list
@@ -4,7 +4,7 @@ fuzzy(0-47,0-6) == marker-basic.html marker-basic-ref.html # Bug 1128229
 == marker-string.html marker-string-ref.html
 fuzzy(0-47,0-18) == bidi-simple.html bidi-simple-ref.html
 skip-if(!gtkWidget) fuzzy-if(gtkWidget,0-124,0-289) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing
-fuzzy-if(Android,0-24,0-4000) fuzzy-if(cocoaWidget,0-1,0-40) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-149,0-1836) == scroll-rounding.html scroll-rounding-ref.html # bug 760264
+fuzzy-if(Android,0-24,0-4000) fuzzy-if(cocoaWidget,0-1,0-40) == scroll-rounding.html scroll-rounding-ref.html # bug 760264
 fuzzy(0-16,0-454) fuzzy-if(winWidget,25-85,406-499) fuzzy-if(cocoaWidget,0-7,0-265) fuzzy-if(Android,0-3,0-466) == anonymous-block.html anonymous-block-ref.html # gtkWidget:bug 1309103, fuzzy: subpixel aa
 fuzzy(0-47,0-3) == false-marker-overlap.html false-marker-overlap-ref.html
 == visibility-hidden.html visibility-hidden-ref.html
diff --git a/layout/reftests/text/reftest.list b/layout/reftests/text/reftest.list
index 983d66946e..1402cc7ad7 100644
--- a/layout/reftests/text/reftest.list
+++ b/layout/reftests/text/reftest.list
@@ -58,7 +58,7 @@ skip == subpixel-glyphs-x-1a.html subpixel-glyphs-x-1b.html
 # inconsistencies.  On those platforms we just test that glyph positions are
 # subpixel.
 # D2D/DirectWrite results depend on the rendering mode chosen, so considering this as random for now.
-skip-if(!(d2d||cocoaWidget)) random-if(d2d) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
+skip-if(!(winWidget||cocoaWidget)) random-if(winWidget) != subpixel-glyphs-x-2a.html subpixel-glyphs-x-2b.html
 == subpixel-glyphs-x-3a.html subpixel-glyphs-x-3b.html
 # No platforms do subpixel positioning vertically
 fuzzy-if(Android,0-19,0-2) == subpixel-glyphs-y-1a.html subpixel-glyphs-y-1b.html
@@ -77,7 +77,7 @@ pref(intl.icu4x.segmenter.enabled,false) == wordbreak-1.html wordbreak-1-ref.htm
 == wordbreak-3.html wordbreak-3-ref.html
 == wordbreak-4b.html wordbreak-4b-ref.html
 == wordbreak-5.html wordbreak-5-ref.html
-fails-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)) == wordbreak-6.html wordbreak-6-ref.html # Bug 1258239
+fails-if(winWidget) == wordbreak-6.html wordbreak-6-ref.html # Bug 1258239
 == wordbreak-7a.html wordbreak-7a-ref.html
 fails == wordbreak-7b.html wordbreak-7b-ref.html # bug 479829
 == wordbreak-8.html wordbreak-8-ref.html
diff --git a/layout/reftests/text/webkit-text-security-1.html b/layout/reftests/text/webkit-text-security-1.html
index 19ffaf5b49..95cdeff992 100644
--- a/layout/reftests/text/webkit-text-security-1.html
+++ b/layout/reftests/text/webkit-text-security-1.html
@@ -130,7 +130,7 @@ input type="email": <input class="test" type="email" value="a@example.org"><br>
 <!--input type="week": <input class="test" type="week" value="12:00:00"><br>-->
 <!--input type="file": <input class="test" type="file"><br>-->
 <!--input type="image": <input class="test" type="image"><br>-->
-select: <select class="test"><option>A</option><option>BB</option></select><br>
+select: <select style="appearance: none" class="test"><option>A</option><option>BB</option></select><br>
 SVG: <svg height="30px" class="test"><text y="20">SVG Text</text></svg><br>
 
 Ordered list, first item empty: <ol class="test"><li></li><li>a</li><li>bb</li></ol>
diff --git a/layout/reftests/transform-3d/reftest.list b/layout/reftests/transform-3d/reftest.list
index 12587f51a8..affea05d0b 100644
--- a/layout/reftests/transform-3d/reftest.list
+++ b/layout/reftests/transform-3d/reftest.list
@@ -24,8 +24,8 @@ fuzzy(0-16,0-100) == preserve3d-5a.html preserve3d-5-ref.html
 == preserve3d-6a.html preserve3d-6-ref.html
 == preserve3d-table.html preserve3d-table-ref.html
 == scale3d-z.html scalez-1-ref.html
-fuzzy-if(winWidget,0-143,0-689) fuzzy-if(OSX,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) == scale3d-all.html scale3d-1-ref.html # subpixel AA
-fuzzy-if(winWidget,0-143,0-689) fuzzy-if(OSX,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) == scale3d-all-separate.html scale3d-1-ref.html # subpixel AA
+fuzzy-if(winWidget,0-143,0-689) fuzzy-if(cocoaWidget,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) == scale3d-all.html scale3d-1-ref.html # subpixel AA
+fuzzy-if(winWidget,0-143,0-689) fuzzy-if(cocoaWidget,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) == scale3d-all-separate.html scale3d-1-ref.html # subpixel AA
 == scale3d-xz.html scale3d-1-ref.html
 == translatez-1a.html translatez-1-ref.html
 != translatez-1b.html translatez-1-ref.html
@@ -38,14 +38,14 @@ fuzzy(0-1,0-6) == rotate3d-2a.html rotatey-1-ref.html
 != backface-visibility-1a.html about:blank
 == backface-visibility-1b.html about:blank
 == backface-visibility-1c.html about:blank
-fuzzy-if(winWidget&&!layersGPUAccelerated,0-1,0-251) fuzzy-if(useDrawSnapshot,64-64,1438-1438) == backface-visibility-2.html backface-visibility-2-ref.html
+fuzzy-if(useDrawSnapshot,64-64,1438-1438) == backface-visibility-2.html backface-visibility-2-ref.html
 == backface-visibility-3.html backface-visibility-3-ref.html
 == perspective-clipping-1.html perspective-clipping-1-ref.html
 == perspective-clipping-2.html perspective-clipping-2-ref.html
 != perspective-origin-1a.html rotatex-perspective-1a.html
 fuzzy(0-1,0-3) == perspective-origin-1b.html perspective-origin-1a.html
-fuzzy(0-3,0-99) random-if(Android&&!browserIsRemote) == perspective-origin-2a.html perspective-origin-2-ref.html # subpixel AA, bug 732568
-fuzzy-if(winWidget&&!layersGPUAccelerated,0-1,0-61) == perspective-origin-3a.html perspective-origin-3-ref.html
+fuzzy(0-3,0-99) == perspective-origin-2a.html perspective-origin-2-ref.html # subpixel AA, bug 732568
+== perspective-origin-3a.html perspective-origin-3-ref.html
 == perspective-origin-4a.html perspective-origin-4-ref.html
 == perspective-zindex.html green-rect.html
 == perspective-zindex-2.html green-rect.html
@@ -57,13 +57,13 @@ fuzzy-if(winWidget&&!layersGPUAccelerated,0-1,0-61) == perspective-origin-3a.htm
 == sorting-3a.html green-rect.html
 # Different, but equivalent (for the given transform) transform origins
 fuzzy(0-1,0-4) == rotatex-transformorigin-1a.html rotatex-transformorigin-1-ref.html
-fuzzy-if((gtkWidget&&layersOMTC)||(winWidget&&!layersGPUAccelerated),0-1,0-86) == overflow-hidden-1a.html overflow-hidden-1-ref.html
+fuzzy-if(gtkWidget,0-1,0-86) == overflow-hidden-1a.html overflow-hidden-1-ref.html
 == transform-style-flat-1a.html transform-style-flat-1-ref.html
 == willchange-containing-block.html?willchange willchange-containing-block.html?ref
 != willchange-containing-block.html?willchange willchange-containing-block.html?noblock
 fuzzy(0-3,0-304) == scroll-perspective-1.html scroll-perspective-1-ref.html
 # Bugs
-fails-if(!layersGPUAccelerated) fails-if(useDrawSnapshot) fuzzy-if(!useDrawSnapshot,0-60,0-826) == 1035611-1.html 1035611-1-ref.html # Bug 1072898 for !layersGPUAccelerated failures
+fails-if(useDrawSnapshot) fuzzy-if(!useDrawSnapshot,0-60,0-826) == 1035611-1.html 1035611-1-ref.html
 random-if(swgl&&Android) != 1157984-1.html about:blank # Bug 1157984
 fuzzy(0-220,0-660) == animate-cube-radians.html animate-cube-radians-ref.html # subpixel AA
 fuzzy(0-240,0-400) == animate-cube-radians-zoom.html animate-cube-radians-zoom-ref.html
@@ -71,7 +71,7 @@ fuzzy(0-240,0-400) == animate-cube-radians-zoom.html animate-cube-radians-zoom-r
 fuzzy(0-240,0-660) == animate-cube-degrees.html animate-cube-degrees-ref.html # subpixel AA
 fuzzy(0-240,0-400) fails-if(useDrawSnapshot) == animate-cube-degrees-zoom.html animate-cube-degrees-zoom-ref.html
 != animate-cube-degrees-ref.html animate-cube-degrees-zoom-ref.html
-fuzzy-if(gtkWidget,0-128,0-100) fuzzy-if(Android||(gtkWidget&&layersGPUAccelerated),0-143,0-100) fuzzy-if(winWidget||OSX,0-141,0-100) == preserves3d-nested.html preserves3d-nested-ref.html
+fuzzy-if(gtkWidget,0-128,0-100) fuzzy-if(Android||gtkWidget,0-143,0-100) fuzzy-if(winWidget||cocoaWidget,0-141,0-100) == preserves3d-nested.html preserves3d-nested-ref.html
 fuzzy(0-255,0-153) == animate-preserve3d-parent.html animate-preserve3d-ref.html # intermittently fuzzy on Mac
 fuzzy(0-255,0-153) == animate-preserve3d-child.html animate-preserve3d-ref.html # intermittently fuzzy on Mac, bug 1461311 for Android
 == animate-backface-hidden.html about:blank
diff --git a/layout/reftests/transform/reftest.list b/layout/reftests/transform/reftest.list
index 86f8002ce1..f96c75e5f0 100644
--- a/layout/reftests/transform/reftest.list
+++ b/layout/reftests/transform/reftest.list
@@ -172,7 +172,7 @@ test-pref(layout.animation.prerender.partial.jank,true) test-pref(layout.animati
 skip test-pref(layout.animation.prerender.partial.jank,true) test-pref(layout.animation.prerender.partial,true) test-pref(layout.animation.prerender.viewport-ratio-limit,"1.125") == partial-prerender-translate-12.html partial-prerender-translate-2-ref.html # bug 1666692 for WebRender
 # This reftest heavily depends on layout.animation.prerender.viewport-ratio-limit
 # and reftest viewport size (800, 1000).
-skip-if(Android) test-pref(layout.animation.prerender.partial,true) test-pref(layout.animation.prerender.viewport-ratio-limit,"1.125") fuzzy-if(!layersGPUAccelerated,0-75,0-2683) == partial-prerender-expansion-rotate.html partial-prerender-expansion-ref.html
+skip-if(Android) test-pref(layout.animation.prerender.partial,true) test-pref(layout.animation.prerender.viewport-ratio-limit,"1.125") == partial-prerender-expansion-rotate.html partial-prerender-expansion-ref.html
 skip-if(useDrawSnapshot) test-pref(layout.animation.prerender.partial,true) test-pref(layout.animation.prerender.viewport-ratio-limit,"1.125") pref(dom.meta-viewport.enabled,true) pref(apz.allow_zooming,true) == partial-prerender-expansion-with-resolution-1.html partial-prerender-expansion-with-resolution-ref.html
 skip test-pref(layout.animation.prerender.partial,true) test-pref(layout.animation.prerender.viewport-ratio-limit,"1.125") pref(dom.meta-viewport.enabled,true) pref(apz.allow_zooming,true) == partial-prerender-expansion-with-resolution-2.html partial-prerender-expansion-with-resolution-ref.html # bug 1650039 for WebRender
 test-pref(layout.animation.prerender.partial.jank,true) test-pref(layout.animation.prerender.partial,true) test-pref(layout.animation.prerender.viewport-ratio-limit,"1.125") fuzzy-if(Android,0-255,0-400) == partial-prerender-in-svg-1.html partial-prerender-in-svg-1-ref.html
diff --git a/layout/reftests/webm-video/reftest.list b/layout/reftests/webm-video/reftest.list
index 04307a1cef..2327b477fc 100644
--- a/layout/reftests/webm-video/reftest.list
+++ b/layout/reftests/webm-video/reftest.list
@@ -5,7 +5,7 @@ fails-if(Android) skip-if(gtkWidget) == aspect-ratio-2a.xhtml aspect-ratio-2-ref
 fails-if(Android) skip-if(gtkWidget) == aspect-ratio-2b.xhtml aspect-ratio-2-ref.html
 == aspect-ratio-3a.xhtml aspect-ratio-3-ref.xhtml
 == aspect-ratio-3b.xhtml aspect-ratio-3-ref.xhtml
-fails-if(Android) random-if(layersGPUAccelerated) == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html
+fails-if(Android) random == encoded-aspect-ratio-1.html encoded-aspect-ratio-1-ref.html
 fails-if(Android) == basic-1.xhtml basic-1-ref.html
 == canvas-1a.xhtml basic-1-ref.html
 fails-if(Android) == canvas-1b.xhtml basic-1-ref.html
@@ -43,15 +43,15 @@ fuzzy(0-5,0-111556) == webm-alpha-2.html webm-alpha-2-ref.html
 # wouldn't be fair of us to make a W3C testsuite implicitly depend on any
 # particular (non-spec-mandated) video codec.
 defaults test-pref(gfx.ycbcr.accurate-conversion,true)
-fails-if(layersGPUAccelerated) == object-fit-contain-webm-001.html object-fit-contain-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures
-fails-if(layersGPUAccelerated) == object-fit-contain-webm-002.html object-fit-contain-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures
-fails-if(layersGPUAccelerated) == object-fit-cover-webm-001.html object-fit-cover-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures
-fails-if(layersGPUAccelerated) == object-fit-cover-webm-002.html object-fit-cover-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures
-fails-if(layersGPUAccelerated) == object-fit-fill-webm-001.html object-fit-fill-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures
-fails-if(layersGPUAccelerated) == object-fit-fill-webm-002.html object-fit-fill-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures
-fails-if(layersGPUAccelerated) == object-fit-none-webm-001.html object-fit-none-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures
-fails-if(layersGPUAccelerated) == object-fit-none-webm-002.html object-fit-none-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures
-fails-if(layersGPUAccelerated) == object-fit-scale-down-webm-001.html object-fit-scale-down-webm-001-ref.html # Bug 1083516 for layersGPUAccelerated failures
-fails-if(layersGPUAccelerated) == object-fit-scale-down-webm-002.html object-fit-scale-down-webm-002-ref.html # Bug 1083516 for layersGPUAccelerated failures
-fails == object-position-webm-001.html object-position-webm-001-ref.html # Bug 1098417 for across-the-board failure, Bug 1083516 for layersGPUAccelerated failures
-fails == object-position-webm-002.html object-position-webm-002-ref.html # Bug 1098417 for across-the-board failure, Bug 1083516 for layersGPUAccelerated failures
+fails == object-fit-contain-webm-001.html object-fit-contain-webm-001-ref.html # Bug 1083516
+fails == object-fit-contain-webm-002.html object-fit-contain-webm-002-ref.html # Bug 1083516
+fails == object-fit-cover-webm-001.html object-fit-cover-webm-001-ref.html # Bug 1083516
+fails == object-fit-cover-webm-002.html object-fit-cover-webm-002-ref.html # Bug 1083516
+fails == object-fit-fill-webm-001.html object-fit-fill-webm-001-ref.html # Bug 1083516
+fails == object-fit-fill-webm-002.html object-fit-fill-webm-002-ref.html # Bug 1083516
+fails == object-fit-none-webm-001.html object-fit-none-webm-001-ref.html # Bug 1083516
+fails == object-fit-none-webm-002.html object-fit-none-webm-002-ref.html # Bug 1083516
+fails == object-fit-scale-down-webm-001.html object-fit-scale-down-webm-001-ref.html # Bug 1083516
+fails == object-fit-scale-down-webm-002.html object-fit-scale-down-webm-002-ref.html # Bug 1083516
+fails == object-position-webm-001.html object-position-webm-001-ref.html # Bug 1098417 for across-the-board failure, Bug 1083516
+fails == object-position-webm-002.html object-position-webm-002-ref.html # Bug 1098417 for across-the-board failure, Bug 1083516
diff --git a/layout/reftests/writing-mode/reftest.list b/layout/reftests/writing-mode/reftest.list
index a9de1ad2cb..6519b4b7e4 100644
--- a/layout/reftests/writing-mode/reftest.list
+++ b/layout/reftests/writing-mode/reftest.list
@@ -16,7 +16,7 @@ fuzzy-if(gtkWidget,0-255,0-2) fuzzy-if(winWidget||Android,0-4,0-8704) == 1083848
 == 1090168-1.html 1090168-1-ref.html
 != 1090168-1.html 1090168-1-notref.html
 == 1090168-2.html 1090168-2-ref.html
-fuzzy-if(azureSkia,0-255,0-2700) == 1090168-3.html 1090168-3-ref.html # bug 1230357 mark fuzzy for skia.
+fuzzy-if(!winWidget,0-255,0-2700) == 1090168-3.html 1090168-3-ref.html # bug 1230357 mark fuzzy for skia.
 == 1091058-1.html 1091058-1-ref.html
 random-if(useDrawSnapshot) == 1094434-1.html 1094434-1-ref.html
 == 1094434-2.html 1094434-2-ref.html
diff --git a/layout/reftests/xul/reftest.list b/layout/reftests/xul/reftest.list
index 3e811bc179..e84926335a 100644
--- a/layout/reftests/xul/reftest.list
+++ b/layout/reftests/xul/reftest.list
@@ -3,7 +3,7 @@
 == chrome://reftest/content/xul/menuitem-key.xhtml chrome://reftest/content/xul/menuitem-key-ref.xhtml
 # accesskeys are not normally displayed on Mac, so set a pref to enable them
 pref(ui.key.menuAccessKey,18) == chrome://reftest/content/xul/accesskey.xhtml chrome://reftest/content/xul/accesskey-ref.xhtml
-fuzzy-if(xulRuntime.widgetToolkit=="gtk",0-1,0-11) fuzzy-if(winWidget,0-1,0-1) == chrome://reftest/content/xul/tree-row-outline-1.xhtml chrome://reftest/content/xul/tree-row-outline-1-ref.xhtml # win8: bug 1254832
+fuzzy-if(gtkWidget,0-1,0-11) fuzzy-if(winWidget,0-1,0-1) == chrome://reftest/content/xul/tree-row-outline-1.xhtml chrome://reftest/content/xul/tree-row-outline-1-ref.xhtml # win8: bug 1254832
 skip-if(!cocoaWidget) == chrome://reftest/content/xul/mac-tab-toolbar.xhtml chrome://reftest/content/xul/mac-tab-toolbar-ref.xhtml
 != chrome://reftest/content/xul/tree-row-outline-1.xhtml chrome://reftest/content/xul/tree-row-outline-1-notref.xhtml
 == chrome://reftest/content/xul/text-crop.xhtml chrome://reftest/content/xul/text-crop-ref.xhtml
diff --git a/layout/reftests/z-index/reftest.list b/layout/reftests/z-index/reftest.list
index 3e0d60cc63..b90b515a14 100644
--- a/layout/reftests/z-index/reftest.list
+++ b/layout/reftests/z-index/reftest.list
@@ -4,9 +4,9 @@
 fuzzy(0-1,0-1500) == stacking-context-perspective.html stacking-context-yes.html
 == stacking-context-backface-visibility.html stacking-context-no.html
 
-fails-if(Android&&!asyncPan) != overlayscrollbar-sorting-ref-visible.html overlayscrollbar-sorting-ref-hidden.html
-random-if(transparentScrollbars) == overlayscrollbar-sorting-1.html overlayscrollbar-sorting-ref-visible.html
+!= overlayscrollbar-sorting-ref-visible.html overlayscrollbar-sorting-ref-hidden.html
+random-if(gtkWidget) == overlayscrollbar-sorting-1.html overlayscrollbar-sorting-ref-visible.html
 == overlayscrollbar-sorting-2.html overlayscrollbar-sorting-ref-visible.html
 == overlayscrollbar-sorting-3.html overlayscrollbar-sorting-ref-hidden.html
 == overlayscrollbar-sorting-4.html overlayscrollbar-sorting-ref-hidden.html
-random-if(transparentScrollbars) == overlayscrollbar-sorting-5.html overlayscrollbar-sorting-ref-visible.html
+random-if(gtkWidget) == overlayscrollbar-sorting-5.html overlayscrollbar-sorting-ref-visible.html
author	Daniel Baumann <daniel.baumann@progress-linux.org>	2024-04-19 01:13:33 +0000
committer	Daniel Baumann <daniel.baumann@progress-linux.org>	2024-04-19 01:13:33 +0000
commit	086c044dc34dfc0f74fbe41f4ecb402b2cd34884 (patch)
tree	a4f824bd33cb075dd5aa3eb5a0a94af221bbe83a /layout/reftests
parent	Adding debian version 124.0.1-1. (diff)
download	firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.tar.xz firefox-086c044dc34dfc0f74fbe41f4ecb402b2cd34884.zip