Bug 1715515 - Part 1. Switch Windows 32 and mingwclang tests to WebRender. r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D117287
2021-06-21 12:46:32 +00:00 · 2021-06-21 12:46:32 +00:00 · 98f810e4e4
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@ -364,6 +364,7 @@ tags = fullscreen
 [browser_newTabDrop.js]
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_newWindowDrop.js]
+skip-if = os == "win" && os_version == "6.1" && webrender # bug 1715862
 # DO NOT ADD MORE TESTS HERE. USE A TOPICAL DIRECTORY INSTEAD.
 [browser_newwindow_focus.js]
 skip-if = os == "linux" && !e10s # Bug 1263254 - Perma fails on Linux without e10s for some reason.
--- a/browser/components/extensions/test/browser/browser.ini
+++ b/browser/components/extensions/test/browser/browser.ini
@ -46,6 +46,7 @@ support-files =
  ../../../../../toolkit/components/reader/test/readerModeArticle.html
 skip-if =
  fission && os == "linux" && asan  # Bug 1713895 - new Fission platform triage
+  os == "win" && os_version == "6.1" && webrender # Bug 1717249

 [browser_ExtensionControlledPopup.js]
 [browser_ext_addon_debugging_netmonitor.js]
--- a/browser/modules/test/browser/browser.ini
+++ b/browser/modules/test/browser/browser.ini
@ -5,6 +5,7 @@ prefs =
  telemetry.number_of_site_origin.min_interval=0

 [browser_BrowserWindowTracker.js]
+skip-if = webrender && os = "win" && os_version = "6.1" # bug 1715860
 [browser_ContentSearch.js]
 support-files =
  contentSearchBadImage.xml
--- a/dom/canvas/crashtests/crashtests.list
+++ b/dom/canvas/crashtests/crashtests.list
@ -13,7 +13,7 @@ load 745818-large-source.html
 load 767337-1.html
 load 779426.html
 skip-if(ThreadSanitizer) load 780392-1.html
-skip-if(ThreadSanitizer) skip-if(gtkWidget&&isDebugBuild) load 789933-1.html # bug 1155252 for linux
+skip-if(ThreadSanitizer) skip-if(gtkWidget&&isDebugBuild) skip-if(winWidget&&(!is64Bit)) load 789933-1.html # bug 1155252 for linux
 skip-if(ThreadSanitizer) load 794463-1.html
 skip-if(ThreadSanitizer) load 802926-1.html
 skip-if(ThreadSanitizer) skip-if(winWidget&&isDebugBuild&&/^Windows\x20NT\x206\.1/.test(http.oscpu)) load 844280.html # intermittent OOMs on Win7 debug
--- a/dom/canvas/test/chrome/chrome.ini
+++ b/dom/canvas/test/chrome/chrome.ini
@ -7,4 +7,5 @@ skip-if =
  os == 'android'
  os == 'linux' && swgl  # Bug 1693807
  os == 'win' && ccov # Bug 1705410
+  os == 'win' && bits == 32 && webrender
 support-files = ../file_drawWindow_source.html ../file_drawWindow_common.js
--- a/gfx/layers/apz/test/mochitest/mochitest.ini
+++ b/gfx/layers/apz/test/mochitest/mochitest.ini
@ -110,6 +110,7 @@
 [test_group_hittest-2.html]
  skip-if =
    toolkit == 'android'  # mouse events not supported on mobile
+    os == 'win' && bits == 32 && webrender
    xorigin  # Hangs
 [test_group_zoomToFocusedInput.html]
 [test_group_scroll_snap.html]
--- a/gfx/tests/reftest/reftest.list
+++ b/gfx/tests/reftest/reftest.list
@ -12,7 +12,7 @@ fuzzy(0-100,0-30) == 1149923.html 1149923-ref.html # use fuzzy due to few distor
 == 1429411.html 1429411-ref.html
 fuzzy-if(winWidget,0-1,0-4) == 1435143.html 1435143-ref.html
 == 1444904.html 1444904-ref.html
-fuzzy-if(winWidget&&webrender,90-95,1000-1100) fuzzy-if(cocoaWidget&&swgl,1-1,1-1) == 1451168.html 1451168-ref.html
+fuzzy-if(winWidget&&webrender,46-95,1000-1100) fuzzy-if(cocoaWidget&&swgl,1-1,1-1) == 1451168.html 1451168-ref.html
 == 1461313.html 1461313-ref.html
 fuzzy(5-32,21908-26621) fuzzy-if(!useDrawSnapshot&&webrender,0-5,0-1060) fuzzy-if(useDrawSnapshot&&webrender,32-32,26350-26350) == 1463802.html 1463802-ref.html
 fuzzy(0-11,0-4) fails-if(useDrawSnapshot) == 1474722.html 1474722-ref.html
@ -24,9 +24,9 @@ fuzzy-if(!useDrawSnapshot&&webrender,2-7,17500-36908) == 1523776.html 1523776-re
 == bug1523410-translate-scale-snap.html bug1523410-translate-scale-snap-ref.html
 == 1523080.html 1523080-ref.html
 == 1616444-same-color-different-paths.html 1616444-same-color-different-paths-ref.html
-skip-if(!asyncPan||!webrender||Android) fuzzy-if(winWidget,94-94,3415-3419) fuzzy-if(cocoaWidget,24-24,1190-1200) pref(apz.allow_zooming,true) == picture-caching-on-async-zoom.html picture-caching-on-async-zoom.html?ref
+skip-if(!asyncPan||!webrender||Android) fuzzy-if(winWidget,54-94,2713-3419) fuzzy-if(cocoaWidget,24-24,1190-1200) pref(apz.allow_zooming,true) == picture-caching-on-async-zoom.html picture-caching-on-async-zoom.html?ref
 pref(apz.allow_zooming,true) fails-if(useDrawSnapshot) == 1662062-1-no-blurry.html 1662062-1-ref.html
 # Bug 1715676: nsBulletFrame has been removed and the new rendering does not use PushRoundedRect that this test is for:
 # == 1681610.html 1681610-ref.html
-skip-if(!webrender||geckoview) fuzzy-if(!useDrawSnapshot&&webrender&&!geckoview,0-255,0-61) fuzzy-if(useDrawSnapshot&&webrender,0-215,0-3601) == 1687157-1.html 1687157-1-ref.html
+skip-if(!webrender||geckoview) fuzzy-if(!useDrawSnapshot,0-255,0-667) fuzzy-if(useDrawSnapshot,0-255,0-3601) == 1687157-1.html 1687157-1-ref.html
 skip-if(!webrender) fuzzy-if(webrender,64-99,512-520) == 1696439-1.html 1696439-1-ref.html
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@ -340,7 +340,7 @@ load 629035-1.html
 load 629908-1.html
 load 635329.html
 load 636229-1.html
-== 640272.html 640272-ref.html
+skip-if(webrender) == 640272.html 640272-ref.html # Bug 1700265
 load 645193.html
 load 645572-1.html
 load 650475.xhtml
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@ -653,7 +653,7 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 372063-1.html 372063-1-r
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 372553-1.html 372553-1-ref.html # Bug 1392106
 == 372632-1.html 372632-1-ref.html
 == 372768-1.html 372768-1-ref.html
-fuzzy-if(webrender&&winWidget,83-92,1-2) == 373295-1.html 373295-1-ref.html
+fuzzy-if(webrender&&winWidget,46-92,1-2) == 373295-1.html 373295-1-ref.html
 == 373298-1.html 373298-1-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 373381-1.html 373381-1-ref.html # Bug 1392106
 fuzzy-if(skiaContent&&!Android,0-2,0-40) == 373381-2.html 373381-2-ref.html
@ -924,7 +924,7 @@ fuzzy-if(winWidget,0-123,0-1600) fuzzy-if(webrender&&swgl,0-1,0-39) == 409659-1a
 fuzzy-if(winWidget,0-123,0-1900) fuzzy-if(webrender&&swgl,0-1,0-39) == 409659-1d.html 409659-1-ref.html  # Bug 1128229
 == 410621-1.html 410621-1-ref.html
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 411059-1.html 411059-1-ref.html # Bug 1392106
-fuzzy-if(webrender&&winWidget,127-129,652-770) == 411334-1.xml 411334-1-ref.xml
+fuzzy-if(webrender&&winWidget,46-129,652-770) == 411334-1.xml 411334-1-ref.xml
 == 411367-2.html 411367-2-ref.html
 == 411367-3.html 411367-3-ref.html
 == 411585-1.html 411585-1-ref.html
@ -1144,13 +1144,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
-fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&webrender&&!winWidget) == 446100-1a.html about:blank
-fails-if(Android) fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&webrender&&!winWidget) == 446100-1b.html about:blank
-fails-if(Android) fails-if(usesRepeatResampling) fails-if(webrender&&!winWidget) fails-if(useDrawSnapshot) == 446100-1c.html about:blank
-fails-if(usesRepeatResampling) fails-if(webrender&&!winWidget) fails-if(useDrawSnapshot) == 446100-1d.html about:blank
-fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&webrender&&!winWidget) == 446100-1e.html about:blank
+fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&webrender&&!winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&webrender) == 446100-1a.html about:blank
+fails-if(Android) fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&webrender&&!winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&webrender) == 446100-1b.html about:blank
+fails-if(Android) fails-if(usesRepeatResampling) fails-if(webrender&&!winWidget) fails-if(useDrawSnapshot) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&webrender) == 446100-1c.html about:blank
+fails-if(usesRepeatResampling) fails-if(webrender&&!winWidget) fails-if(useDrawSnapshot) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&webrender) == 446100-1d.html about:blank
+fails-if(usesRepeatResampling) fails-if(!useDrawSnapshot&&webrender&&!winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&webrender) == 446100-1e.html about:blank
 == 446100-1f.html about:blank
-fails-if(usesRepeatResampling) fails-if(Android) fails-if(!useDrawSnapshot&&webrender&&!winWidget) == 446100-1g.html about:blank
+fails-if(usesRepeatResampling) fails-if(Android) fails-if(!useDrawSnapshot&&webrender&&!winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&webrender) == 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
@ -1766,7 +1766,7 @@ test-pref(font.minimum-size.x-western,32) fuzzy-if(Android,0-45,0-324) == 935056
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 936670-1.svg 936670-1-ref.svg # Bug 1392106
 == 941940-1.html 941940-1-ref.html
 fails == 942017.html 942017-ref.html # bug 942017
-fuzzy-if(Android,0-1,0-1) fuzzy-if(skiaContent,0-2,0-160000) fuzzy-if(d2d&&!webrender,1-1,215-215) fuzzy-if(winWidget&&isDebugBuild&&layersGPUAccelerated&&!is64Bit,1-1,175-175) == 942672-1.html 942672-1-ref.html
+fuzzy-if(Android,0-1,0-1) fuzzy-if(skiaContent,0-2,0-160000) fuzzy-if(d2d&&!webrender,1-1,215-215) fuzzy-if(winWidget&&isDebugBuild&&layersGPUAccelerated&&!is64Bit,1-1,12-175) == 942672-1.html 942672-1-ref.html
 == 953334-win32-clipping.html 953334-win32-clipping-ref.html
 fuzzy-if(skiaContent,0-1,0-5) == 956513-1.svg 956513-1-ref.svg
 == 944291-1.html 944291-1-ref.html
@ -2062,7 +2062,7 @@ fuzzy-if(winWidget&&!webrender,0-104,0-1423) == 1513423-1.html 1513423-1-ref.htm
 fuzzy-if(winWidget&&!webrender,0-89,0-1420) == 1513423-2.html 1513423-2-ref.html
 == 1513423-3.html 1513423-3-ref.html
 pref(layout.accessiblecaret.enabled,true) == 1517385.html 1517385-ref.html
-fuzzy-if(!webrender,1-5,66-547) fuzzy-if(geckoview&&!webrender,1-2,64-141) fuzzy-if(winWidget&&swgl,1-1,16-16) fuzzy-if(cocoaWidget&&swgl,1-1,32-32) fuzzy-if(useDrawSnapshot&&webrender,3-3,459-459) == 1529992-1.html 1529992-1-ref.html
+fuzzy-if(!webrender,1-5,66-547) fuzzy-if(geckoview&&!webrender,1-2,64-141) fuzzy-if(winWidget&&swgl,1-1,12-16) fuzzy-if(cocoaWidget&&swgl,1-1,32-32) fuzzy-if(useDrawSnapshot&&webrender,3-3,459-459) == 1529992-1.html 1529992-1-ref.html
 fuzzy-if(!webrender,0-6,0-34) fuzzy-if(Android,9-14,44-60) fails-if(!useDrawSnapshot&&webrender) == 1529992-2.html 1529992-2-ref.html
 == 1535040-1.html 1535040-1-ref.html
 == 1545360-1.xhtml 1545360-1-ref.xhtml
--- a/layout/reftests/css-blending/reftest.list
+++ b/layout/reftests/css-blending/reftest.list
@ -24,7 +24,7 @@ fuzzy-if(azureSkia||gtkWidget,0-2,0-9600) fuzzy-if(appleSilicon,1-1,11200-11200)
 == background-blending-darken.html background-blending-darken-ref.svg
 == background-blending-difference.html background-blending-difference-ref.svg
 fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)||skiaContent,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(cocoaWidget||d2d||swgl||/^Windows\x20NT\x206\.1/.test(http.oscpu),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(webrender&&!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,1-1,11200-11200) fuzzy-if(swgl&&!Android,1-1,8000-9600) == background-blending-luminosity.html background-blending-luminosity-ref.svg
--- a/layout/reftests/font-features/reftest.list
+++ b/layout/reftests/font-features/reftest.list
@ -120,4 +120,4 @@ random-if(cocoaWidget) == subsuper-nofallback.html subsuper-nofallback-ref2.html
 == subsuper-fallback-size.html subsuper-fallback-size-ref.html

 # GPOS spacing adjustments in vertical mode -- subsetted opentype/cff test font fails to load on Win7
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(winWidget&&webrender&&!swgl,0-1,0-70) fuzzy-if(webrender&&winWidget&&swgl,0-1,0-372) == 1376231-vertical-gpos-adjustments.html 1376231-vertical-gpos-adjustments-ref.html
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(winWidget&&webrender&&!swgl&&!/^Windows\x20NT\x206\.1/.test(http.oscpu),0-1,0-70) fuzzy-if(webrender&&winWidget&&swgl&&!/^Windows\x20NT\x206\.1/.test(http.oscpu),0-1,0-372) == 1376231-vertical-gpos-adjustments.html 1376231-vertical-gpos-adjustments-ref.html
--- a/layout/reftests/image-element/reftest.list
+++ b/layout/reftests/image-element/reftest.list
@ -5,9 +5,9 @@ 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&&!(webrender&&winWidget)) fails-if(cocoaWidget) fails-if(remoteCanvas&&swgl&&winWidget) == canvas-outside-document-invalidate-02.html about:blank # See bug 666800
+fails-if(azureSkia&&!(webrender&&winWidget)) fails-if(cocoaWidget) fails-if(remoteCanvas&&swgl&&winWidget) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)&&webrender) == 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(webrender&&winWidget,117-129,47-54) == element-paint-simple.html element-paint-simple-ref.html
+fuzzy-if(webrender&&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
@ -21,7 +21,7 @@ fuzzy-if(d2d,0-255,0-24) fuzzy-if(!useDrawSnapshot&&webrender,255-255,56-72) ==
 # For !nativeThemePref: element() uses fallback / skia in WebRender, which antialiases differently from WR.
 # For !nativeThemePref+Windows+WebRender: bug 1496542, the scrollframe snaps differently.
 # For the rest: -ref the scrollframe is active and layerized differently with APZ.
-fuzzy-if(asyncPan,0-2,0-140) fuzzy-if(skiaContent,0-24,0-106) fuzzy-if(winWidget&&!layersGPUAccelerated,149-149,1203-1203) fuzzy-if(webrender&&geckoview,0-7,0-1321) fuzzy-if(!useDrawSnapshot&&webrender&&!nativeThemePref,1-48,20-68) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-53,0-1204) fuzzy-if(webrender&&winWidget,134-222,1197-1588) == element-paint-native-widget.html element-paint-native-widget-ref.html
+fuzzy-if(asyncPan,0-2,0-140) fuzzy-if(skiaContent,0-24,0-106) fuzzy-if(winWidget&&!layersGPUAccelerated,149-149,1203-1203) fuzzy-if(webrender&&geckoview,0-7,0-1321) fuzzy-if(!useDrawSnapshot&&webrender&&!nativeThemePref,1-48,20-68) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-53,0-1204) fuzzy-if(webrender&&winWidget,47-222,1197-1588) == element-paint-native-widget.html element-paint-native-widget-ref.html

 fails-if(usesRepeatResampling&&!(webrender&&winWidget)) == element-paint-subimage-sampling-restriction.html about:blank
 == element-paint-clippath.html element-paint-clippath-ref.html
--- a/layout/reftests/svg/as-image/reftest.list
+++ b/layout/reftests/svg/as-image/reftest.list
@ -46,7 +46,7 @@ fuzzy(0-1,0-2) fuzzy-if(skiaContent&&!remoteCanvas,0-1,0-529) fuzzy-if(remoteCan

 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
 #Same as scale-2a but with globalAlpha:
-fuzzy(0-1,0-2) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-7018) fuzzy-if(azureSkia,0-1,0-40000) fuzzy-if(webrender&&winWidget&&!remoteCanvas,1-1,32679-39838) fuzzy-if(remoteCanvas&&webrender&&!swgl,1-73,32679-40000) == canvas-drawImage-alpha-2.html canvas-drawImage-alpha-2-ref.html
+fuzzy(0-1,0-2) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-1,0-7018) fuzzy-if(azureSkia,0-1,0-40000) fuzzy-if(webrender&&winWidget&&!remoteCanvas,0-1,0-39838) fuzzy-if(remoteCanvas&&webrender&&!swgl,1-73,32679-40000) == 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
--- a/layout/reftests/svg/reftest.list
+++ b/layout/reftests/svg/reftest.list
@ -407,7 +407,7 @@ fuzzy-if(skiaContent||webrender,0-72,0-1255) == pattern-transformed-01.svg patte

 == radialGradient-basic-01.svg pass.svg
 == radialGradient-basic-02.svg pass.svg
-fuzzy(0-1,0-3) fuzzy-if(winWidget,0-32,0-223) fuzzy-if(winWidget&&webrender&&!swgl,96-96,21684-21684) == radialGradient-basic-03.svg radialGradient-basic-03-ref.html
+fuzzy(0-1,0-3) fuzzy-if(winWidget,0-32,0-223) fuzzy-if(winWidget&&webrender&&!swgl&&!/^Windows\x20NT\x206\.1/.test(http.oscpu),96-96,21684-21684) == radialGradient-basic-03.svg radialGradient-basic-03-ref.html
 == radialGradient-basic-04.svg pass.svg
 == radialGradient-fr-01.svg pass.svg
 fuzzy(0-1,0-3235) fuzzy-if(winWidget,0-1,0-7030) == radialGradient-fr-02.svg radialGradient-fr-02-ref.svg
@ -596,16 +596,16 @@ pref(layout.css.devPixelsPerPx,"1.0") == svg-blurry-with-subpixel-position.html
 == overflow-visible-image.html overflow-visible-image-ref.html

 # Shadow DOM id tracking.
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-1.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-2.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-3.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-4.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-5.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-6.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-7.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-8.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-9.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-10.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR
+skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-1.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR, bug 1717061 for Win 7
+skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-2.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR, bug 1717061 for Win 7
+skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-3.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR, bug 1717061 for Win 7
+skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-4.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR, bug 1717061 for Win 7
+skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-5.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR, bug 1717061 for Win 7
+skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-6.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR, bug 1717061 for Win 7
+skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-7.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR, bug 1717061 for Win 7
+skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-8.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR, bug 1717061 for Win 7
+skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-9.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR, bug 1717061 for Win 7
+skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) skip-if(geckoview&&webrender) == fragid-shadow-10.html fragid-shadow-ref.html # Bug 1392106, bug 1560367 for GV+WR, bug 1717061 for Win 7

 == mask-resource.html mask-resource-ref.html
 fails-if(Android) != mask-resource.html about:blank # The image the test uses is not on Android
--- a/layout/reftests/svg/text/reftest.list
+++ b/layout/reftests/svg/text/reftest.list
@ -1,14 +1,14 @@
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&winWidget,122-127,221-254) == simple.svg simple-ref.html # Bug 1392106
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&winWidget,47-127,221-254) == simple.svg simple-ref.html # Bug 1392106
 == simple-2.svg simple.svg
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&winWidget,122-127,221-254) == simple-underline.svg simple-underline-ref.html # Bug 1392106
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&winWidget,47-127,221-254) == simple-underline.svg simple-underline-ref.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == simple-underline-scaled.svg simple-underline-scaled-ref.svg # Bug 1392106
-fuzzy-if(webrender&&winWidget,119-166,255-318) fuzzy-if(webrender&&OSX,0-1,0-1) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html
-fuzzy-if(webrender&&winWidget,117-139,182-204) == simple-anchor-end-rtl.svg simple-anchor-end-rtl-ref.html
-fuzzy-if(webrender&&winWidget,119-137,220-250) == simple-anchor-end.svg simple-anchor-end-ref.html
+fuzzy-if(webrender&&winWidget,47-166,255-318) fuzzy-if(webrender&&OSX,0-1,0-1) == simple-anchor-end-bidi.svg simple-anchor-end-bidi-ref.html
+fuzzy-if(webrender&&winWidget,47-139,181-204) == simple-anchor-end-rtl.svg simple-anchor-end-rtl-ref.html
+fuzzy-if(webrender&&winWidget,47-137,181-250) == simple-anchor-end.svg simple-anchor-end-ref.html
 fuzzy-if(skiaContent&&dwrite,0-104,0-131) fuzzy-if(cocoaWidget,0-143,0-124) fuzzy-if(webrender&&!(gtkWidget||geckoview),79-200,59-319) == simple-anchor-middle-bidi.svg simple-anchor-middle-bidi-ref.html
-fuzzy-if(webrender&&winWidget,132-138,188-207) == simple-anchor-middle-rtl.svg simple-anchor-middle-rtl-ref.html
-fuzzy-if(skiaContent,0-111,0-81) fuzzy-if(webrender&&winWidget,122-181,221-257) == simple-anchor-middle.svg simple-anchor-middle-ref.html
-fuzzy-if(webrender&&winWidget,132-138,261-319) == simple-bidi.svg simple-bidi-ref.html
+fuzzy-if(webrender&&winWidget,47-138,188-207) == simple-anchor-middle-rtl.svg simple-anchor-middle-rtl-ref.html
+fuzzy-if(skiaContent,0-111,0-81) fuzzy-if(webrender&&winWidget,47-181,221-257) == simple-anchor-middle.svg simple-anchor-middle-ref.html
+fuzzy-if(webrender&&winWidget,47-138,260-319) == simple-bidi.svg simple-bidi-ref.html
 == simple-bidi-2.svg simple-bidi.svg

 == simple-dx.svg simple.svg
@ -25,12 +25,12 @@ random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == simple-dx-anchor-end-bid
 == simple-dx-rtl-2.svg simple-dx-rtl-2-ref.svg

 == simple-fill-color-dynamic.svg simple-fill-color-dynamic-ref.svg
-fuzzy-if(webrender&&winWidget,125-129,221-254) fuzzy-if(webrender&&OSX,23-65,195-196) == simple-fill-color.svg simple-fill-color-ref.html
+fuzzy-if(webrender&&winWidget,47-129,221-254) fuzzy-if(webrender&&OSX,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

-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&winWidget,122-127,221-254) == simple-multiple-dx.svg simple-multiple-dx-ref.html # Bug 1392106
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&winWidget,47-127,221-254) == simple-multiple-dx.svg simple-multiple-dx-ref.html # Bug 1392106
 == simple-multiple-dx-2.svg simple-multiple-dx.svg
 == simple-multiple-dx-anchor-end-bidi.svg simple-multiple-dx-anchor-end-bidi-ref.svg
 == simple-multiple-dx-anchor-middle-bidi.svg simple-multiple-dx-anchor-middle-bidi-ref.svg
@ -43,7 +43,7 @@ fuzzy-if(skiaContent,0-1,0-2) == simple-multiple-dx-anchor-middle-rtl.svg simple
 == simple-multiple-dx-rtl.svg simple-multiple-dx-rtl-ref.svg
 == simple-multiple-dx-rtl-2.svg simple-multiple-dx-rtl.svg

-fuzzy-if(webrender&&winWidget,132-138,183-206) == simple-rtl.svg simple-rtl-ref.html
+fuzzy-if(webrender&&winWidget,47-138,183-206) == simple-rtl.svg simple-rtl-ref.html
 == simple-rtl-2.svg simple-rtl.svg
 == simple-transform-rotate.svg simple-transform-rotate-ref.svg

@ -199,9 +199,9 @@ needs-focus == deselectAll.svg deselectAll-ref.svg
 fuzzy-if(skiaContent,0-1,0-250) needs-focus == selectSubString.svg selectSubString-ref.svg
 fuzzy-if(skiaContent,0-1,0-600) needs-focus == selectSubString-2.svg selectSubString-2-ref.svg
 fuzzy-if(skiaContent,0-1,0-250) needs-focus == selectSubString-3.svg selectSubString-3-ref.svg
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&!geckoview,0-1,0-237) needs-focus fuzzy-if(webrender&&winWidget,125-148,221-254) == simple-selection.svg simple-selection-ref.html # Bug 1392106
-fuzzy-if(skiaContent,0-1,0-100) needs-focus fuzzy-if(webrender&&winWidget,134-148,261-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
-fuzzy-if(skiaContent,0-1,0-50) needs-focus fuzzy-if(webrender&&winWidget,127-148,221-254) fuzzy-if(webrender&&OSX,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
+random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(webrender&&!geckoview,0-1,0-237) needs-focus fuzzy-if(webrender&&winWidget,55-148,200-254) == simple-selection.svg simple-selection-ref.html # Bug 1392106
+fuzzy-if(skiaContent,0-1,0-100) needs-focus fuzzy-if(webrender&&winWidget,55-148,200-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html
+fuzzy-if(skiaContent,0-1,0-50) needs-focus fuzzy-if(webrender&&winWidget,55-148,200-254) fuzzy-if(webrender&&OSX,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html
 fuzzy-if(skiaContent,0-1,0-150) needs-focus fuzzy-if(webrender&&winWidget,125-148,221-254) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == simple-underline-selection.svg simple-underline-selection-ref.html # Bug 1392106
 fuzzy-if(skiaContent,0-1,0-300) needs-focus fuzzy-if(webrender&&winWidget,134-152,432-501) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == multiple-text-selection.svg multiple-text-selection-ref.html # Bug 1392106
 needs-focus == multiple-chunks-selection.svg multiple-chunks-selection-ref.svg
--- a/layout/reftests/table-bordercollapse/reftest.list
+++ b/layout/reftests/table-bordercollapse/reftest.list
@ -110,11 +110,11 @@ fuzzy-if(appleSilicon,1-1,236-236) == frame_vsides_rules_none.html frame_vsides_
 # Fuzzy because border-collapsed borders are not antialiased, since each segment is painted separately.
 # So get 40 pixels of fuzz, 20 at each beveled corner (because the border width
 # is 20px).
-fuzzy(0-255,0-40) fuzzy-if(!useDrawSnapshot&&webrender,52-52,40-526) fuzzy-if(appleSilicon,52-52,9760-9760) fails-if(geckoview&&webrender) == border-style-outset-becomes-groove.html border-style-outset-becomes-groove-ref.html
+fuzzy(0-255,0-40) fuzzy-if(!useDrawSnapshot&&webrender,51-52,40-526) fuzzy-if(appleSilicon,52-52,9760-9760) fails-if(geckoview&&webrender) == border-style-outset-becomes-groove.html border-style-outset-becomes-groove-ref.html
 # Fuzzy because border-collapsed borders are not antialiased, since each segment is painted separately.
 # So get 40 pixels of fuzz, 20 at each beveled corner (because the border width
 # is 20px).
-fuzzy(0-255,0-40) fuzzy-if(!useDrawSnapshot&&webrender,52-52,40-526) fuzzy-if(appleSilicon,52-52,9760-9760) fails-if(geckoview&&webrender) == border-style-inset-becomes-ridge.html border-style-inset-becomes-ridge-ref.html
+fuzzy(0-255,0-40) fuzzy-if(!useDrawSnapshot&&webrender,51-52,40-526) fuzzy-if(appleSilicon,52-52,9760-9760) fails-if(geckoview&&webrender) == border-style-inset-becomes-ridge.html border-style-inset-becomes-ridge-ref.html
 fuzzy(0-2,0-11000) == 1324524.html 1324524-ref.html
 == 1384602-1a.html 1384602-1-ref.html
 == 1384602-1b.html 1384602-1-ref.html
--- a/layout/reftests/text-overflow/reftest.list
+++ b/layout/reftests/text-overflow/reftest.list
@ -5,7 +5,7 @@ fuzzy-if(Android,0-16,0-244) fuzzy-if(webrender,0-47,0-6) == marker-basic.html m
 fuzzy-if(webrender,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(0-16,0-454) fails-if(gtkWidget) fuzzy-if(webrender&&winWidget,49-85,406-499) fuzzy-if(!webrender&&cocoaWidget&&!nativeThemePref,0-2,0-493) fuzzy-if(webrender&&cocoaWidget&&!nativeThemePref,0-7,0-265) fuzzy-if(Android&&!nativeThemePref,0-3,0-466) skip-if(cocoaWidget&&!isDebugBuild&&verify) == anonymous-block.html anonymous-block-ref.html # gtkWidget:bug 1309103, fuzzy: subpixel aa
+fuzzy(0-16,0-454) fails-if(gtkWidget) fuzzy-if(webrender&&winWidget,25-85,406-499) fuzzy-if(!webrender&&cocoaWidget&&!nativeThemePref,0-2,0-493) fuzzy-if(webrender&&cocoaWidget&&!nativeThemePref,0-7,0-265) fuzzy-if(Android&&!nativeThemePref,0-3,0-466) skip-if(cocoaWidget&&!isDebugBuild&&verify) == anonymous-block.html anonymous-block-ref.html # gtkWidget:bug 1309103, fuzzy: subpixel aa
 fuzzy-if(webrender,0-47,0-3) == false-marker-overlap.html false-marker-overlap-ref.html
 == visibility-hidden.html visibility-hidden-ref.html
 fuzzy-if(asyncPan&&!layersGPUAccelerated,0-102,0-1724) fuzzy-if(gtkWidget,0-10,0-8) fuzzy-if(webrender,0-47,0-24) == block-padding.html block-padding-ref.html
--- a/layout/xul/reftest/reftest.list
+++ b/layout/xul/reftest/reftest.list
@ -11,4 +11,4 @@ fails-if(useDrawSnapshot) != chrome://reftest/content/xul/reftest/scrollbar-mark
 fails-if(useDrawSnapshot) != chrome://reftest/content/xul/reftest/scrollbar-marks2.html chrome://reftest/content/xul/reftest/scrollbar-marks-ref.html
 fails-if(useDrawSnapshot) != chrome://reftest/content/xul/reftest/scrollbar-marks2.html chrome://reftest/content/xul/reftest/scrollbar-marks.html
 # This test is fuzzy as the marks cannot be positioned exactly as the real ones are measured in dev pixels.
-fuzzy(0-10,0-75) fuzzy-if(winWidget&&isDebugBuild&&layersGPUAccelerated&&!is64Bit,1-1,102-102) == chrome://reftest/content/xul/reftest/scrollbar-marks-overlay.html chrome://reftest/content/xul/reftest/scrollbar-marks-overlay-ref.html
+fuzzy(0-10,0-102) fuzzy-if(winWidget&&isDebugBuild&&layersGPUAccelerated&&!is64Bit,1-1,102-102) == chrome://reftest/content/xul/reftest/scrollbar-marks-overlay.html chrome://reftest/content/xul/reftest/scrollbar-marks-overlay-ref.html
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@ -167,12 +167,12 @@ mochitest-browser-chrome:
            macosx.*64/debug: 16
            windows10-64-ccov.*/.*: 14
            windows10.*-asan/opt: 9
-            windows10-32/debug: 12
+            windows10-32-qr/debug: 12
            default: 7
    max-run-time:
        by-test-platform:
            linux.*64-ccov.*/.*: 9000
-            windows7-32/debug: 5400
+            windows7-32-qr/debug: 5400
            windows10-64/debug: 5400
            macosx.*64(-qr)?/debug: 5400
            windows10-64-ccov.*/.*: 10800
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@ -164,6 +164,8 @@ reftest:
            linux1804-64-qr/debug: ['webrender-sw', 'fission', 'wayland', 'noqr']
            linux1804-64-asan-qr/opt: ['webrender-sw', 'fission', 'wayland', 'noqr']
            windows10-64-qr/debug: ['webrender-sw', 'fission', 'noqr']
+            windows10-32(?:-shippable)?-qr/opt: ['webrender-sw', 'fission', 'noqr']
+            windows7-32(?:-shippable)?-qr/opt: ['webrender-sw', 'fission', 'noqr']
            macosx101.*64-qr/debug: ['webrender-sw', 'fission', 'noqr']
            android-em-7.0-x86_64-qr/debug: ['webrender-sw', 'fission', 'noqr']
            android-.*/debug-isolated-process: ['fission']
@ -204,7 +206,7 @@ reftest:
                    default: built-projects
    max-run-time:
        by-test-platform:
-            windows10-32-mingwclang/debug: 5400
+            windows10-32-mingwclang-qr/debug: 5400
            windows10-64-ccov.*/.*: 5400
            windows10-64-asan/opt: 5400
            macosx.*64-ccov.*/.*: 5400
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@ -162,40 +162,17 @@ linux1804-64-devedition-qr/opt:
 # Windows platforms (matching /windows.*/)

 # win32
-windows7-32/opt:
+windows7-32-qr/opt:
    build-platform: win32/opt
    test-sets:
        - windows-7-tests

-windows7-32-shippable/opt:
+windows7-32-shippable-qr/opt:
    build-platform: win32-shippable/opt
    test-sets:
        - windows-7-tests

-# win7 qr builds for try purposes
-windows7-32-qr/opt:
-    build-platform: win32/opt
-    test-sets:
-        - windows7-qr-tests
-
-# win10-32 qr builds for try purposes
-windows10-32-qr/debug:
-    build-platform: win32/debug
-    test-sets:
-        - web-platform-tests
-        - windows32-qr-tests
-        - mochitest-webgpu
-        - windows7-qr-tests
-
-windows10-32-qr/opt:
-    build-platform: win32/opt
-    test-sets:
-        - awsy
-        - web-platform-tests
-        - windows-talos
-        - windows32-qr-tests
-
-windows10-32-shippable/opt:
+windows10-32-shippable-qr/opt:
    build-platform: win32-shippable/opt
    test-sets:
        - awsy
@ -208,7 +185,7 @@ windows10-32-shippable/opt:
        - windows32-tests
        - windows-talos

-windows10-32/opt:
+windows10-32-qr/opt:
    build-platform: win32/opt
    test-sets:
        - awsy
@ -220,7 +197,7 @@ windows10-32/opt:
        - windows32-tests
        - windows-talos

-windows10-32/debug:
+windows10-32-qr/debug:
    build-platform: win32/debug
    test-sets:
        - web-platform-tests
@ -339,22 +316,22 @@ windows10-64-shippable-qr/opt:
        - web-platform-tests
        - mochitest-webgpu

-windows10-64-mingwclang/debug:
+windows10-64-mingwclang-qr/debug:
    build-platform: win64-mingwclang/debug
    test-sets:
        - mingwclang-tests-debug

-windows10-64-mingwclang/opt:
+windows10-64-mingwclang-qr/opt:
    build-platform: win64-mingwclang/opt
    test-sets:
        - mingwclang-tests-opt

-windows10-32-mingwclang/debug:
+windows10-32-mingwclang-qr/debug:
    build-platform: win32-mingwclang/debug
    test-sets:
        - mingwclang-win32-tests-debug

-windows10-32-mingwclang/opt:
+windows10-32-mingwclang-qr/opt:
    build-platform: win32-mingwclang/opt
    test-sets:
        - mingwclang-tests-opt
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@ -261,19 +261,6 @@ windows-qr-tests:
    - reftest
    - test-verify

-windows7-qr-tests:
-    - mochitest-browser-chrome
-    - reftest
-
-windows32-qr-tests:
-    - crashtest
-    - marionette
-    - mochitest-chrome-gpu
-    - mochitest-plain
-    - mochitest-plain-gpu
-    - mochitest-media
-    - test-verify
-
 windows-7-tests:
    - mochitest-browser-chrome
    - mochitest-webgpu
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@ -33,10 +33,10 @@ job-defaults:
        requires-signed-builds:
            by-test-platform:
                windows10-64-asan/opt: false    # No XPCShell on ASAN yet
-                windows10-32-mingwclang/opt: false
-                windows10-32-mingwclang/debug: false
-                windows10-64-mingwclang/opt: false
-                windows10-64-mingwclang/debug: false
+                windows10-32-mingwclang-qr/opt: false
+                windows10-32-mingwclang-qr/debug: false
+                windows10-64-mingwclang-qr/opt: false
+                windows10-64-mingwclang-qr/debug: false
                windows.*: true
                default: false

--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@ -69,22 +69,7 @@ LINUX_WORKER_TYPES = {

 # windows worker types keyed by test-platform and virtualization
 WINDOWS_WORKER_TYPES = {
-    "windows7-32": {
-        "virtual": "t-win7-32",
-        "virtual-with-gpu": "t-win7-32-gpu",
-        "hardware": "t-win10-64-1803-hw",
-    },
-    "windows7-32-shippable": {
-        "virtual": "t-win7-32",
-        "virtual-with-gpu": "t-win7-32-gpu",
-        "hardware": "t-win10-64-1803-hw",
-    },
-    "windows7-32-devedition": {  # build only, tests have no value
-        "virtual": "t-win7-32",
-        "virtual-with-gpu": "t-win7-32-gpu",
-        "hardware": "t-win10-64-1803-hw",
-    },
-    "windows10-32-mingwclang": {
+    "windows10-32-mingwclang-qr": {
        "virtual": "t-win10-64",
        "virtual-with-gpu": "t-win10-64-gpu-s",
        "hardware": "t-win10-64-1803-hw",
@ -94,14 +79,14 @@ WINDOWS_WORKER_TYPES = {
        "virtual-with-gpu": "t-win7-32-gpu",
        "hardware": "t-win10-64-1803-hw",
    },
-    "windows10-32": {
-        "virtual": "t-win10-64",
-        "virtual-with-gpu": "t-win10-64-gpu-s",
+    "windows7-32-shippable-qr": {
+        "virtual": "t-win7-32",
+        "virtual-with-gpu": "t-win7-32-gpu",
        "hardware": "t-win10-64-1803-hw",
    },
-    "windows10-32-shippable": {
-        "virtual": "t-win10-64",
-        "virtual-with-gpu": "t-win10-64-gpu-s",
+    "windows7-32-devedition-qr": {  # build only, tests have no value
+        "virtual": "t-win7-32",
+        "virtual-with-gpu": "t-win7-32-gpu",
        "hardware": "t-win10-64-1803-hw",
    },
    "windows10-32-qr": {
@ -109,6 +94,11 @@ WINDOWS_WORKER_TYPES = {
        "virtual-with-gpu": "t-win10-64-gpu-s",
        "hardware": "t-win10-64-1803-hw",
    },
+    "windows10-32-shippable-qr": {
+        "virtual": "t-win10-64",
+        "virtual-with-gpu": "t-win10-64-gpu-s",
+        "hardware": "t-win10-64-1803-hw",
+    },
    "windows10-64": {
        "virtual": "t-win10-64",
        "virtual-with-gpu": "t-win10-64-gpu-s",
@ -154,7 +144,7 @@ WINDOWS_WORKER_TYPES = {
        "virtual-with-gpu": "t-win10-64-gpu-s",
        "hardware": "t-win10-64-1803-hw",
    },
-    "windows10-64-mingwclang": {
+    "windows10-64-mingwclang-qr": {
        "virtual": "t-win10-64",
        "virtual-with-gpu": "t-win10-64-gpu-s",
        "hardware": "t-win10-64-1803-hw",
@ -1414,13 +1404,13 @@ def handle_tier(config, tasks):
                "linux1804-64-shippable-qr/opt",
                "linux1804-64-asan/opt",
                "linux1804-64-tsan/opt",
-                "windows7-32/debug",
-                "windows7-32/opt",
-                "windows7-32-devedition/opt",
-                "windows7-32-shippable/opt",
-                "windows10-32/debug",
-                "windows10-32/opt",
-                "windows10-32-shippable/opt",
+                "windows7-32-qr/debug",
+                "windows7-32-qr/opt",
+                "windows7-32-devedition-qr/opt",
+                "windows7-32-shippable-qr/opt",
+                "windows10-32-qr/debug",
+                "windows10-32-qr/opt",
+                "windows10-32-shippable-qr/opt",
                "windows10-aarch64/opt",
                "windows10-64/debug",
                "windows10-64/opt",
@ -1482,10 +1472,7 @@ def apply_raptor_tier_optimization(config, tasks):
@transforms.add
 def disable_try_only_platforms(config, tasks):
    """Turns off platforms that should only run on try."""
-    try_only_platforms = (
-        "windows7-32-qr/.*",
-        "windows10-32-qr/.*",
-    )
+    try_only_platforms = ()
    for task in tasks:
        if any(re.match(k + "$", task["test-platform"]) for k in try_only_platforms):
            task["run-on-projects"] = []
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-bg-pos-206.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-bg-pos-206.xht.ini
@ -2,7 +2,7 @@
  expected:
    if (os == "android") and e10s: PASS
    if not webrender and (os == "win") and (bits == 64): FAIL
-    if (os == "win") and (bits == 32): FAIL
+    if not webrender and (os == "win") and (bits == 32): FAIL
  fuzzy:
    if webrender and (os == "win"): maxDifference=92;totalPixels=0-2206
    if swgl and (os == "mac"): maxDifference=1-1;totalPixels=1-1
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht.ini
@ -1,6 +1,6 @@
 [margin-em-inherit-001.xht]
  expected:
    if not webrender and (os == "win"): PASS
-    if webrender and (os == "win") and (bits == 64): PASS
+    if webrender and (os == "win"): PASS
    if (os == 'linux' and os_version == '18.04'): PASS
    FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-repeat-space-6.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-repeat-space-6.html.ini
@ -0,0 +1,3 @@
+[background-repeat-space-6.html]
+  fuzzy:
+    if webrender and os == "win" and os_version == "10.0" and processor == "x86": maxDifference=1-1;totalPixels=981-981
--- a/testing/web-platform/meta/css/css-backgrounds/background-repeat-space-7.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-repeat-space-7.html.ini
@ -0,0 +1,3 @@
+[background-repeat-space-7.html]
+  fuzzy:
+    if webrender and os == "win" and os_version == "10.0" and processor == "x86": maxDifference=1-1;totalPixels=981-981
--- a/testing/web-platform/meta/css/css-backgrounds/background-repeat/background-repeat-round.xht.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-repeat/background-repeat-round.xht.ini
@ -1,7 +1,4 @@
 [background-repeat-round.xht]
  expected:
-    if webrender and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if webrender and (os == 'linux' and os_version == '18.04'): PASS # Bug 1599915
-    if webrender and (os == 'mac'): PASS
-    if webrender and (os == 'android'): PASS
+    if webrender: PASS
    FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-size/background-size-contain.xht.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-size/background-size-contain.xht.ini
@ -1,7 +1,4 @@
 [background-size-contain.xht]
  expected:
-    if webrender and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if webrender and (os == 'linux' and os_version == '18.04'): PASS # Bug 1599915
-    if webrender and (os == 'mac'): PASS
-    if webrender and (os == 'android'): PASS
+    if webrender: PASS
    FAIL
--- a/testing/web-platform/meta/css/css-images/object-position-png-001c.html.ini
+++ b/testing/web-platform/meta/css/css-images/object-position-png-001c.html.ini
@ -1,6 +1,6 @@
 [object-position-png-001c.html]
  fuzzy:
-    if swgl: maxDifference=0-1;totalPixels=290-300
+    if webrender: maxDifference=0-1;totalPixels=290-300
  expected:
    if webrender: PASS
    FAIL
--- a/testing/web-platform/meta/css/css-images/object-position-png-002c.html.ini
+++ b/testing/web-platform/meta/css/css-images/object-position-png-002c.html.ini
@ -1,6 +1,6 @@
 [object-position-png-002c.html]
  fuzzy:
-    if swgl: maxDifference=0-1;totalPixels=290-300
+    if webrender: maxDifference=0-1;totalPixels=290-300
  expected:
    if webrender: PASS
    FAIL
--- a/testing/web-platform/meta/css/css-transforms/group/svg-transform-nested-009.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/group/svg-transform-nested-009.html.ini
@ -1,7 +1,4 @@
 [svg-transform-nested-009.html]
  expected:
-    if webrender and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if webrender and (os == 'linux' and os_version == '18.04'): PASS # Bug 1599915
-    if webrender and (os == 'mac'): PASS
-    if webrender and (os == 'android'): PASS
+    if webrender: PASS
    FAIL
--- a/testing/web-platform/meta/css/css-transforms/perspective-split-by-zero-w.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/perspective-split-by-zero-w.html.ini
@ -2,3 +2,4 @@
  expected:
    if not webrender and (os == "linux"): FAIL
    if not webrender and (os == "win"): FAIL
+    if webrender and (os == "win") and (bits == 32): FAIL # Bug 1717064
--- a/testing/web-platform/meta/css/filter-effects/filter-contrast-002.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/filter-contrast-002.html.ini
@ -1,3 +1,3 @@
 [filter-contrast-002.html]
  expected:
-    if webrender and not swgl and (os == "win"): FAIL
+    if webrender and not swgl and (os == "win") and (bits == "64"): FAIL
--- a/testing/web-platform/meta/css/filter-effects/svg-mutation-function-to-url.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/svg-mutation-function-to-url.html.ini
@ -1,6 +1,7 @@
 [svg-mutation-function-to-url.html]
  expected:
    if swgl: PASS
+    if (os == "win") and (bits == 32) and webrender: PASS
    if (os == "android") and webrender and not debug: ["PASS", "FAIL"]
    if (os == "android") and webrender and debug: ["PASS", "FAIL"]
    if (os == "mac") and webrender: PASS
--- a/testing/web-platform/meta/css/filter-effects/svg-mutation-single-to-multiple-001.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/svg-mutation-single-to-multiple-001.html.ini
@ -1,6 +1,7 @@
 [svg-mutation-single-to-multiple-001.html]
  expected:
    if swgl: PASS
+    if (os == "win") and bits == 32 and webrender: PASS
    if webrender and (os == "linux"): ["PASS", "FAIL"]
    if webrender and (os == "mac"): ["PASS", "FAIL"]
    if webrender and (os == "android"): ["PASS", "FAIL"]
--- a/testing/web-platform/meta/css/filter-effects/svg-mutation-url-to-function.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/svg-mutation-url-to-function.html.ini
@ -6,4 +6,5 @@
    if webrender and (os == "mac") and debug: ["PASS", "FAIL"]
    if webrender and (os == "mac") and not debug: PASS
    if webrender and (os == "linux"): ["PASS", "FAIL"]
+    if webrender and (os == "win") and bits == 32: PASS
    FAIL
--- a/testing/web-platform/meta/css/filter-effects/svg-shorthand-hue-rotate-001.html.ini
+++ b/testing/web-platform/meta/css/filter-effects/svg-shorthand-hue-rotate-001.html.ini
@ -1,6 +1,7 @@
 [svg-shorthand-hue-rotate-001.html]
  expected:
    if swgl: PASS
+    if webrender and (os == "win") and bits == 32: PASS
    if webrender and (os == "mac"): PASS
    if webrender and (os == "linux"): PASS
    if webrender and (os == "android"): PASS
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/masking/mask-image-3i.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/masking/mask-image-3i.html.ini
@ -1,3 +1,3 @@
 [mask-image-3i.html]
  expected:
-    if webrender and not swgl and (os == "win"): FAIL
+    if webrender and not swgl and (os == "win") and bits == "64": FAIL
--- a/testing/web-platform/meta/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-blob.tentative.html.ini
+++ b/testing/web-platform/meta/html/canvas/element/manual/drawing-images-to-the-canvas/image-orientation/drawImage-from-blob.tentative.html.ini
@ -5,3 +5,4 @@
    FAIL
  fuzzy:
    if swgl: maxDifference=2-13;totalPixels=778-901
+    if webrender and os == "win": maxDifference=0-14;totalPixels=0-897
--- a/testing/web-platform/meta/mathml/relations/css-styling/color-001.html.ini
+++ b/testing/web-platform/meta/mathml/relations/css-styling/color-001.html.ini
@ -1,3 +1,3 @@
 [color-001.html]
  expected:
-    if webrender and not swgl and (os == "win"): FAIL
+    if webrender and not swgl and (os == "win") and (bits == 64): FAIL
--- a/testing/web-platform/meta/mathml/relations/css-styling/color-002.html.ini
+++ b/testing/web-platform/meta/mathml/relations/css-styling/color-002.html.ini
@ -1,3 +1,3 @@
 [color-002.html]
  expected:
-    if webrender and not swgl and (os == "win"): FAIL
+    if webrender and not swgl and (os == "win") and (bits == "64"): FAIL
--- a/testing/web-platform/meta/mathml/relations/css-styling/color-003.html.ini
+++ b/testing/web-platform/meta/mathml/relations/css-styling/color-003.html.ini
@ -1,3 +1,3 @@
 [color-003.html]
  expected:
-    if webrender and not swgl and (os == "win"): FAIL
+    if webrender and not swgl and (os == "win") and (bits == "64"): FAIL
--- a/toolkit/modules/tests/browser/browser.ini
+++ b/toolkit/modules/tests/browser/browser.ini
@ -26,6 +26,7 @@ skip-if = debug || os = "linux"
 [browser_Geometry.js]
 [browser_InlineSpellChecker.js]
 [browser_Troubleshoot.js]
+skip-if = webrender && os = "win" && os_version = "6.1" # bug 1715857
 [browser_web_channel.js]
 support-files =
  file_web_channel.html
--- a/toolkit/mozapps/extensions/test/browser/browser.ini
+++ b/toolkit/mozapps/extensions/test/browser/browser.ini
@ -40,6 +40,10 @@ generated-files =
  addons/browser_theme.xpi
  addons/options_signed.xpi

+skip-if =
+  fission && os == "linux" && asan  # Bug 1713895 - new Fission platform triage
+  os == "win" && os_version == "6.1" && webrender # Bug 1717250
+
 [browser_about_debugging_link.js]
 [browser_addon_list_reordering.js]
 [browser_bug572561.js]
--- a/xpcom/string/crashtests/crashtests.list
+++ b/xpcom/string/crashtests/crashtests.list
@ -1,3 +1,3 @@
 load 394275-1.html
 load 395651-1.html
-skip-if(webrender&&gtkWidget) load 1113005.html # Bug 1683062
+skip-if(webrender&&(gtkWidget||winWidget)) load 1113005.html # Bug 1683062