Merge branch 'main' into f34

5 files changed, 117 insertions, 71 deletions

diff --git a/firefox-tests-reftest.patch b/firefox-tests-reftest.patch
index 0da234d..09973ae 100644
--- a/firefox-tests-reftest.patch
+++ b/firefox-tests-reftest.patch
@@ -1,24 +1,24 @@
 diff -U0 firefox-87.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest firefox-87.0/dom/canvas/test/reftest/filters/reftest.list
 --- firefox-87.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest	2021-03-18 14:48:29.000000000 +0100
-+++ firefox-87.0/dom/canvas/test/reftest/filters/reftest.list	2021-03-23 13:12:40.346486220 +0100
++++ firefox-87.0/dom/canvas/test/reftest/filters/reftest.list	2021-03-24 14:36:18.231122500 +0100
 @@ -21 +21 @@
 -== units-ex.html ref.html
 +fuzzy-if(gtkWidget,0-255,0-100) == units-ex.html ref.html
 diff -U0 firefox-87.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest firefox-87.0/dom/html/reftests/autofocus/reftest.list
 --- firefox-87.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest	2021-03-18 14:48:34.000000000 +0100
-+++ firefox-87.0/dom/html/reftests/autofocus/reftest.list	2021-03-23 13:12:40.346486220 +0100
++++ firefox-87.0/dom/html/reftests/autofocus/reftest.list	2021-03-24 14:36:18.231122500 +0100
 @@ -7 +7 @@
 -fuzzy-if(gtkWidget,0-18,0-1) needs-focus == textarea-load.html textarea-ref.html # One anti-aliased corner.
 +fuzzy-if(gtkWidget,0-56,0-2) needs-focus == textarea-load.html textarea-ref.html # One anti-aliased corner.
 diff -U0 firefox-87.0/dom/html/reftests/reftest.list.firefox-tests-reftest firefox-87.0/dom/html/reftests/reftest.list
 --- firefox-87.0/dom/html/reftests/reftest.list.firefox-tests-reftest	2021-03-18 14:48:34.000000000 +0100
-+++ firefox-87.0/dom/html/reftests/reftest.list	2021-03-23 13:12:40.346486220 +0100
++++ firefox-87.0/dom/html/reftests/reftest.list	2021-03-24 14:36:18.231122500 +0100
 @@ -46 +46 @@
 -skip-if(isCoverageBuild) pref(layout.css.image-orientation.initial-from-image,true) fuzzy(0-2,0-830) == bug917595-iframe-1.html    bug917595-1-ref.html
 +fuzzy-if(gtkWidget,0-2,0-847) skip-if(isCoverageBuild) pref(layout.css.image-orientation.initial-from-image,true) == bug917595-iframe-1.html    bug917595-1-ref.html
 diff -U0 firefox-87.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest firefox-87.0/dom/media/test/reftest/reftest.list
 --- firefox-87.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest	2021-03-18 14:48:36.000000000 +0100
-+++ firefox-87.0/dom/media/test/reftest/reftest.list	2021-03-23 13:12:40.346486220 +0100
++++ firefox-87.0/dom/media/test/reftest/reftest.list	2021-03-24 14:36:18.231122500 +0100
 @@ -1,6 +0,0 @@
 -skip-if(Android) fuzzy-if(OSX,0-80,0-76800) fuzzy-if(winWidget,0-62,0-76799) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-70,0-644) HTTP(..) == short.mp4.firstframe.html short.mp4.firstframe-ref.html
 -skip-if(Android) fuzzy-if(OSX,0-87,0-76797) fuzzy-if(winWidget,0-60,0-76797) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-60,0-1810) HTTP(..) == short.mp4.lastframe.html short.mp4.lastframe-ref.html
@@ -28,13 +28,13 @@ diff -U0 firefox-87.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest
 -skip-if(Android) skip-if(MinGW) skip-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) fuzzy(0-10,0-778536) == image-10bits-rendering-90-video.html image-10bits-rendering-90-ref.html
 diff -U0 firefox-87.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest firefox-87.0/dom/media/webvtt/test/reftest/reftest.list
 --- firefox-87.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest	2021-03-18 14:48:35.000000000 +0100
-+++ firefox-87.0/dom/media/webvtt/test/reftest/reftest.list	2021-03-23 13:12:40.347486249 +0100
++++ firefox-87.0/dom/media/webvtt/test/reftest/reftest.list	2021-03-24 14:36:18.231122500 +0100
 @@ -2 +2 @@
 -skip-if(Android) fuzzy-if(winWidget,0-170,0-170) == vtt_overlapping_time.html vtt_overlapping_time-ref.html
 +fuzzy-if(gtkWidget,0-100,0-190) skip-if(Android) fuzzy-if(winWidget,0-170,0-170) == vtt_overlapping_time.html vtt_overlapping_time-ref.html
 diff -U0 firefox-87.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest firefox-87.0/gfx/layers/apz/test/reftest/reftest.list
 --- firefox-87.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest	2021-03-18 14:48:37.000000000 +0100
-+++ firefox-87.0/gfx/layers/apz/test/reftest/reftest.list	2021-03-23 16:23:39.251184841 +0100
++++ firefox-87.0/gfx/layers/apz/test/reftest/reftest.list	2021-03-24 14:36:18.231122500 +0100
 @@ -6,6 +6,6 @@
 -fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&&gtkWidget&&!swgl,7-8,24-32) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html
 -fuzzy-if(Android,0-4,0-5) fuzzy-if(webrender&&gtkWidget,28-30,28-32) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
@@ -53,18 +53,20 @@ diff -U0 firefox-87.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-ref
 +# On desktop, even more fuzz is needed because thumb scaling is not exactly proportional: making the page twice as long
 diff -U0 firefox-87.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest firefox-87.0/image/test/reftest/downscaling/reftest.list
 --- firefox-87.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest	2021-03-18 14:48:42.000000000 +0100
-+++ firefox-87.0/image/test/reftest/downscaling/reftest.list	2021-03-23 16:22:50.403715121 +0100
++++ firefox-87.0/image/test/reftest/downscaling/reftest.list	2021-03-24 17:32:06.375032327 +0100
 @@ -92 +91,0 @@
 -fuzzy(0-17,0-3221) fuzzy-if(gtkWidget&&!webrender,4-4,2616-2616) fuzzy-if(gtkWidget&&!webrender&&!layersGPUAccelerated,0-0,0-0) fuzzy-if(gtkWidget&&webrender,0-0,0-0) skip-if(Android) == downscale-moz-icon-1.html downscale-moz-icon-1-ref.html # gtkWidget Bug 1592059: regular is 2616, no-accel is 0, qr passes with 0
+@@ -181 +179,0 @@
+-fuzzy(0-53,0-6391) fuzzy-if(gtkWidget&&webrender,18-19,5502-5568) fails-if(/^Windows\x20NT\x205\.1/.test(http.oscpu)) skip-if(Android) == downscale-moz-icon-1.html downscale-moz-icon-1-ref.html # gtkWidget Bug 1592059
 diff -U0 firefox-87.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/abs-pos/reftest.list
 --- firefox-87.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest	2021-03-18 14:48:54.000000000 +0100
-+++ firefox-87.0/layout/reftests/abs-pos/reftest.list	2021-03-23 13:12:40.347486249 +0100
++++ firefox-87.0/layout/reftests/abs-pos/reftest.list	2021-03-24 14:36:18.232122476 +0100
 @@ -54 +54 @@
 -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-100,0-160) fuzzy-if(Android,0-9,0-185) == scrollframe-2.html scrollframe-2-ref.html #bug 756530
 diff -U0 firefox-87.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/async-scrolling/reftest.list
 --- firefox-87.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/async-scrolling/reftest.list	2021-03-23 13:12:40.347486249 +0100
++++ firefox-87.0/layout/reftests/async-scrolling/reftest.list	2021-03-24 14:36:18.232122476 +0100
 @@ -27 +27 @@
 -fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&&gtkWidget,32-33,28-32) fuzzy-if(webrender&&cocoaWidget,21-21,44-44) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html # Bug 1604338
 +fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&&gtkWidget,30-50,30-50) fuzzy-if(webrender&&cocoaWidget,21-21,44-44) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html # Bug 1604338
@@ -113,7 +115,7 @@ diff -U0 firefox-87.0/layout/reftests/async-scrolling/reftest.list.firefox-tests
 +fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,13-13,4-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,16-16,44-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
 diff -U0 firefox-87.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/bidi/reftest.list
 --- firefox-87.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/layout/reftests/bidi/reftest.list	2021-03-23 13:12:40.347486249 +0100
++++ firefox-87.0/layout/reftests/bidi/reftest.list	2021-03-24 14:36:18.232122476 +0100
 @@ -33,2 +33,2 @@
 -fuzzy-if(Android,0-1,0-6) fuzzy-if(cocoaWidget,0-1,0-2) == mixedChartype-02.html mixedChartype-02-ref.html
 -fuzzy-if(Android,0-1,0-6) fuzzy-if(cocoaWidget,0-1,0-2) == mixedChartype-02-j.html mixedChartype-02-ref.html
@@ -138,13 +140,13 @@ diff -U0 firefox-87.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest fi
 +fuzzy(0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3a-rtl.html brackets-3a-rtl-ref.html # Bug 1392106
 diff -U0 firefox-87.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/border-radius/reftest.list
 --- firefox-87.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/border-radius/reftest.list	2021-03-23 13:12:40.347486249 +0100
++++ firefox-87.0/layout/reftests/border-radius/reftest.list	2021-03-24 14:36:18.232122476 +0100
 @@ -54 +54 @@
 -fuzzy-if(Android,0-8,0-469) fuzzy-if(skiaContent,0-21,0-76) fuzzy-if(winWidget,0-144,0-335) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical, bug 1392106
 +fuzzy-if(gtkWidget,0-80,0-300) fuzzy-if(Android,0-8,0-469) fuzzy-if(winWidget,0-144,0-335) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == clipping-6.html clipping-6-ref.html # PaintedLayer and MaskLayer with transforms that aren't identical, bug 1392106
 diff -U0 firefox-87.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/bugs/reftest.list
 --- firefox-87.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/bugs/reftest.list	2021-03-23 13:12:40.347486249 +0100
++++ firefox-87.0/layout/reftests/bugs/reftest.list	2021-03-24 14:36:18.232122476 +0100
 @@ -464 +463,0 @@
 -== 341043-1a.html 341043-1-ref.html
 @@ -553 +552 @@
@@ -185,7 +187,7 @@ diff -U0 firefox-87.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest fi
 +fuzzy(0-30,0-2) fuzzy-if(winWidget&&webrender,0-31,0-3) fuzzy-if(geckoview&&webrender,0-93,0-87) == 1562733-rotated-nastaliq-2.html 1562733-rotated-nastaliq-2-ref.html
 diff -U0 firefox-87.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/canvas/reftest.list
 --- firefox-87.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/layout/reftests/canvas/reftest.list	2021-03-23 13:12:40.347486249 +0100
++++ firefox-87.0/layout/reftests/canvas/reftest.list	2021-03-24 14:36:18.232122476 +0100
 @@ -51,2 +50,0 @@
 -!= text-font-lang.html text-font-lang-notref.html
 -
@@ -194,7 +196,7 @@ diff -U0 firefox-87.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest
 +fuzzy-if(gtkWidget,0-255,0-2304) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-small-caps-1.html text-small-caps-1-ref.html # Bug 1392106
 diff -U0 firefox-87.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/css-break/reftest.list
 --- firefox-87.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/css-break/reftest.list	2021-03-23 13:12:40.347486249 +0100
++++ firefox-87.0/layout/reftests/css-break/reftest.list	2021-03-24 14:36:18.232122476 +0100
 @@ -1,3 +1,3 @@
 -== box-decoration-break-1.html box-decoration-break-1-ref.html
 -fuzzy(0-1,0-20) fuzzy-if(skiaContent,0-1,0-700) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html
@@ -204,13 +206,13 @@ diff -U0 firefox-87.0/layout/reftests/css-break/reftest.list.firefox-tests-refte
 +skip-if(verify) fuzzy(0-73,0-264) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html # Bug 1386543, bug 1392106
 diff -U0 firefox-87.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/css-placeholder/reftest.list
 --- firefox-87.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/layout/reftests/css-placeholder/reftest.list	2021-03-23 13:12:40.347486249 +0100
++++ firefox-87.0/layout/reftests/css-placeholder/reftest.list	2021-03-24 14:36:18.232122476 +0100
 @@ -5 +5 @@
 -fuzzy-if(gtkWidget&&nativeThemePref,255-255,1376-1881) == css-simple-styling.html css-simple-styling-ref.html # gtkWidget, Bug 1600749
 +fuzzy-if(gtkWidget&&nativeThemePref,255-255,1300-1881) == css-simple-styling.html css-simple-styling-ref.html # gtkWidget, Bug 1600749
 diff -U0 firefox-87.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/css-ruby/reftest.list
 --- firefox-87.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/layout/reftests/css-ruby/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/css-ruby/reftest.list	2021-03-24 14:36:18.232122476 +0100
 @@ -17,4 +17,4 @@
 -== relative-positioning-2.html relative-positioning-2-ref.html
 -== ruby-position-horizontal.html ruby-position-horizontal-ref.html
@@ -228,13 +230,13 @@ diff -U0 firefox-87.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftes
 +fuzzy-if(gtkWidget,0-255,0-219) pref(layout.css.ruby.intercharacter.enabled,true) == ruby-intercharacter-2.htm ruby-intercharacter-2-ref.htm
 diff -U0 firefox-87.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/first-letter/reftest.list
 --- firefox-87.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/first-letter/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/first-letter/reftest.list	2021-03-24 14:36:18.232122476 +0100
 @@ -64 +64 @@
 -fails-if(winWidget||cocoaWidget) fails-if(geckoview) == 617869-1.html 617869-1-ref.html # Bug 1558513 for GV
 +fuzzy-if(gtkWidget,0-260,0-900) fails-if(winWidget||cocoaWidget) fails-if(geckoview) == 617869-1.html 617869-1-ref.html # Bug 1558513 for GV
 diff -U0 firefox-87.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/font-face/reftest.list
 --- firefox-87.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest	2021-03-18 14:48:54.000000000 +0100
-+++ firefox-87.0/layout/reftests/font-face/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/font-face/reftest.list	2021-03-24 14:36:18.232122476 +0100
 @@ -9 +9 @@
 -== name-override-simple-1.html name-override-simple-1-ref.html
 +fuzzy-if(gtkWidget,0-112,0-107) == name-override-simple-1.html name-override-simple-1-ref.html
@@ -266,7 +268,7 @@ diff -U0 firefox-87.0/layout/reftests/font-face/reftest.list.firefox-tests-refte
 +# Currently Windows 7 and macOS all fail on
 diff -U0 firefox-87.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/font-matching/reftest.list
 --- firefox-87.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/font-matching/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/font-matching/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -124 +124 @@
 -random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-2.html italic-oblique-ref.html # Bug 1392106
 +fuzzy-if(gtkWidget,0-104,0-1836) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-2.html italic-oblique-ref.html # Bug 1392106
@@ -280,31 +282,31 @@ diff -U0 firefox-87.0/layout/reftests/font-matching/reftest.list.firefox-tests-r
 +fuzzy-if(gtkWidget,0-104,0-1836) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-9.html italic-oblique-ref.html # Bug 1392106
 diff -U0 firefox-87.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/forms/fieldset/reftest.list
 --- firefox-87.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/forms/fieldset/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/forms/fieldset/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -8 +8 @@
 -fuzzy-if(winWidget&&!layersGPUAccelerated,0-142,0-276) == positioned-container-1.html positioned-container-1-ref.html
 +fuzzy-if(gtkWidget,0-100,0-305) fuzzy-if(winWidget&&!layersGPUAccelerated,0-142,0-276) == positioned-container-1.html positioned-container-1-ref.html
 diff -U0 firefox-87.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/forms/input/checkbox/reftest.list
 --- firefox-87.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest	2021-03-18 14:48:54.000000000 +0100
-+++ firefox-87.0/layout/reftests/forms/input/checkbox/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/forms/input/checkbox/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -18 +18 @@
 -skip-if(OSX||winWidget) fails-if(geckoview&&webrender) fuzzy-if(gtkWidget&&nativeThemePref,25-25,32-32) fails-if(Android&&nativeThemePref) == checkbox-clamp-02.html checkbox-clamp-02-ref.html
 +skip-if(OSX||winWidget) fails-if(geckoview&&webrender) fuzzy-if(gtkWidget&&nativeThemePref,12-25,25-32) fails-if(Android) == checkbox-clamp-02.html checkbox-clamp-02-ref.html
 diff -U0 firefox-87.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/forms/input/radio/reftest.list
 --- firefox-87.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/layout/reftests/forms/input/radio/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/forms/input/radio/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -9 +9 @@
 -skip-if(OSX||winWidget||Android) fuzzy-if(gtkWidget&&nativeThemePref,24-24,16-16) == radio-clamp-02.html radio-clamp-02-ref.html # gtkWidget, Bug 1599622
 +skip-if(OSX||winWidget||Android) fuzzy-if(gtkWidget&&nativeThemePref,10-24,16-16) == radio-clamp-02.html radio-clamp-02-ref.html # gtkWidget, Bug 1599622
 diff -U0 firefox-87.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/forms/placeholder/reftest.list
 --- firefox-87.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/layout/reftests/forms/placeholder/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/forms/placeholder/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -21 +21 @@
 -fuzzy-if(winWidget,0-160,0-10) fuzzy-if(Android,0-160,0-41) fuzzy-if(asyncPan&&!layersGPUAccelerated,0-146,0-317) fuzzy-if(OSX==1010&&browserIsRemote,0-1,0-8) == placeholder-6.html placeholder-overflow-ref.html
 +fuzzy-if(gtkWidget,0-255,0-341) fuzzy-if(winWidget,0-160,0-10) fuzzy-if(Android,0-160,0-41) fuzzy-if(OSX==1010&&browserIsRemote,0-1,0-8) == placeholder-6.html placeholder-overflow-ref.html
 diff -U0 firefox-87.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/forms/textbox/reftest.list
 --- firefox-87.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/layout/reftests/forms/textbox/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/forms/textbox/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -4 +4 @@
 -fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(webrender) == chrome://reftest/content/forms/textbox/accesskey-2.xhtml chrome://reftest/content/forms/textbox/accesskey-2-ref.xhtml
 +fuzzy-if(gtkWidget,0-1,0-21) fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(webrender) == chrome://reftest/content/forms/textbox/accesskey-2.xhtml chrome://reftest/content/forms/textbox/accesskey-2-ref.xhtml
@@ -313,18 +315,18 @@ diff -U0 firefox-87.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-r
 +fuzzy-if(gtkWidget,0-1,0-21) fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(webrender&&!Android) == chrome://reftest/content/forms/textbox/accesskey-4.xhtml chrome://reftest/content/forms/textbox/accesskey-4-ref.xhtml
 diff -U0 firefox-87.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/high-contrast/reftest.list
 --- firefox-87.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/layout/reftests/high-contrast/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/high-contrast/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -22 +22 @@
 -fuzzy-if(cocoaWidget,255-255,1495-1495) fuzzy-if(winWidget,255-255,353-353) fuzzy-if(Android,255-255,700-700) == backplate-bg-image-010.html backplate-bg-image-010-ref.html
 +fuzzy-if(gtkWidget,255-255,0-1495) fuzzy-if(cocoaWidget,255-255,1495-1495) fuzzy-if(winWidget,255-255,353-353) fuzzy-if(Android,255-255,700-700) == backplate-bg-image-010.html backplate-bg-image-010-ref.html
 diff -U0 firefox-87.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/indic-shaping/reftest.list
 --- firefox-87.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/layout/reftests/indic-shaping/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/indic-shaping/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -12 +11,0 @@
 -fuzzy-if(gtkWidget,255-255,46-46) == gujarati-3b.html gujarati-3-ref.html # gtkWidget, Bug 1600777
 diff -U0 firefox-87.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/mathml/reftest.list
 --- firefox-87.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/mathml/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/mathml/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -26 +26 @@
 -random-if(smallScreen&&Android) fuzzy(0-255,0-200) fuzzy-if(geckoview&&webrender,201-216,312-316) fuzzy-if(webrender&&winWidget,114-255,245-361) fuzzy-if(webrender&&OSX,79-153,307-314) == mirror-op-1.html mirror-op-1-ref.html
 +random-if(smallScreen&&Android) fuzzy(0-255,0-350) fuzzy-if(geckoview&&webrender,201-216,312-316) fuzzy-if(webrender&&winWidget,114-255,245-361) fuzzy-if(webrender&&OSX,79-153,307-314) == mirror-op-1.html mirror-op-1-ref.html
@@ -337,7 +339,7 @@ diff -U0 firefox-87.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest
 -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)
 diff -U0 firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest.list
 --- firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest	2021-03-18 14:49:01.000000000 +0100
-+++ firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -1,4 +1,4 @@
 -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
@@ -349,7 +351,7 @@ diff -U0 firefox-87.0/layout/reftests/position-dynamic-changes/relative/reftest.
 +fuzzy-if(gtkWidget,0-103,0-637) fuzzy-if(cocoaWidget,0-1,0-3) == move-top-left-table.html move-top-left-table-ref.html # Bug 688545
 diff -U0 firefox-87.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/position-sticky/reftest.list
 --- firefox-87.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest	2021-03-18 14:48:54.000000000 +0100
-+++ firefox-87.0/layout/reftests/position-sticky/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/position-sticky/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -53,3 +53,2 @@
 -fuzzy-if(Android,0-4,0-4) fuzzy-if(webrender&&gtkWidget,16-17,28-32) fuzzy-if(webrender&&cocoaWidget,8-8,38-42) skip-if(!asyncPan) == transformed-2.html transformed-2-ref.html # Bug 1604644
 -skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&&gtkWidget,29-30,28-32) fuzzy-if(webrender&&cocoaWidget,15-16,44-44) == nested-sticky-1.html nested-sticky-1-ref.html # Bug 1604644
@@ -358,7 +360,7 @@ diff -U0 firefox-87.0/layout/reftests/position-sticky/reftest.list.firefox-tests
 +skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,15-16,44-44) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-4,0-104) == nested-sticky-2.html nested-sticky-2-ref.html # Bug 1604644
 diff -U0 firefox-87.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/reftest-sanity/reftest.list
 --- firefox-87.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/reftest-sanity/reftest.list	2021-03-23 13:12:40.348486280 +0100
++++ firefox-87.0/layout/reftests/reftest-sanity/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -131,6 +131,6 @@
 -pref(font.default.x-western,"serif") == font-serif.html font-default.html
 -pref(font.default.x-western,"serif") != font-sans-serif.html font-default.html
@@ -374,7 +376,7 @@ diff -U0 firefox-87.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-
 +#fails pref(font.default.x-western,0) == font-serif.html font-default.html
 diff -U0 firefox-87.0/layout/reftests/svg/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/svg/reftest.list
 --- firefox-87.0/layout/reftests/svg/reftest.list.firefox-tests-reftest	2021-03-18 14:49:01.000000000 +0100
-+++ firefox-87.0/layout/reftests/svg/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/svg/reftest.list	2021-03-24 14:36:18.233122452 +0100
 @@ -475 +475 @@
 -random-if(winWidget) fuzzy-if(Android,0-10,0-2) == text-gradient-02.svg text-gradient-02-ref.svg # see bug 590101
 +random-if(winWidget) fuzzy-if(gtkWidget,0-20,0-10) fuzzy-if(Android,0-10,0-2) == text-gradient-02.svg text-gradient-02-ref.svg # see bug 590101
@@ -388,13 +390,13 @@ diff -U0 firefox-87.0/layout/reftests/svg/reftest.list.firefox-tests-reftest fir
 +fuzzy(0-255,0-237) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-layout-09.svg pass.svg # Bug 1392106
 diff -U0 firefox-87.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/svg/smil/style/reftest.list
 --- firefox-87.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/layout/reftests/svg/smil/style/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/svg/smil/style/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -70 +70 @@
 -random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy-if(gtkWidget,255-255,1520-1520) == anim-css-font-1.svg  anim-css-font-1-ref.svg # Windows: Bug 1392106 Linux: Bug 1599619
 +random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == anim-css-font-1.svg  anim-css-font-1-ref.svg # Windows: Bug 1392106 Linux: Bug 1599619
 diff -U0 firefox-87.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/svg/svg-integration/reftest.list
 --- firefox-87.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest	2021-03-18 14:49:01.000000000 +0100
-+++ firefox-87.0/layout/reftests/svg/svg-integration/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/svg/svg-integration/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -50 +50 @@
 -fuzzy-if(Android,0-4,0-10) == box-decoration-break-01.xhtml box-decoration-break-01-ref.xhtml
 +fuzzy-if(gtkWidget,0-5,0-11) fuzzy-if(Android,0-4,0-10) == box-decoration-break-01.xhtml box-decoration-break-01-ref.xhtml
@@ -403,7 +405,7 @@ diff -U0 firefox-87.0/layout/reftests/svg/svg-integration/reftest.list.firefox-t
 +fuzzy(0-67,0-254) == box-decoration-break-03.xhtml box-decoration-break-01-ref.xhtml
 diff -U0 firefox-87.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/svg/text/reftest.list
 --- firefox-87.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/svg/text/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/svg/text/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -203,2 +203,2 @@
 -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
@@ -411,7 +413,7 @@ diff -U0 firefox-87.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftes
 +fuzzy-if(skiaContent,0-1,0-70) 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
 diff -U0 firefox-87.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/tab-size/reftest.list
 --- firefox-87.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest	2021-03-18 14:49:01.000000000 +0100
-+++ firefox-87.0/layout/reftests/tab-size/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/tab-size/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -2,6 +2,6 @@
 -== tab-size-8.html            spaces-8.html
 -== tab-size-4.html            spaces-4.html
@@ -427,7 +429,7 @@ diff -U0 firefox-87.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftes
 +fuzzy-if(gtkWidget,0-255,0-63) == tab-size-1.html            spaces-1.html
 diff -U0 firefox-87.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/text-decoration/reftest.list
 --- firefox-87.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/layout/reftests/text-decoration/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/text-decoration/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -1,2 +1,2 @@
 -fuzzy-if(webrender&&gtkWidget,0-208,0-12) == complex-decoration-style-quirks.html complex-decoration-style-quirks-ref.html
 -fuzzy-if(webrender&&gtkWidget,0-208,0-12) == complex-decoration-style-standards.html complex-decoration-style-standards-ref.html
@@ -435,7 +437,7 @@ diff -U0 firefox-87.0/layout/reftests/text-decoration/reftest.list.firefox-tests
 +fuzzy-if(gtkWidget,0-255,0-40) == complex-decoration-style-standards.html complex-decoration-style-standards-ref.html
 diff -U0 firefox-87.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/text-overflow/reftest.list
 --- firefox-87.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest	2021-03-18 14:49:01.000000000 +0100
-+++ firefox-87.0/layout/reftests/text-overflow/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/text-overflow/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -6 +6 @@
 -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
 +skip-if(!gtkWidget) fuzzy-if(gtkWidget,0-255,0-400) == bidi-simple-scrolled.html bidi-simple-scrolled-ref.html # Fails on Windows and OSX due to anti-aliasing
@@ -444,7 +446,7 @@ diff -U0 firefox-87.0/layout/reftests/text-overflow/reftest.list.firefox-tests-r
 +fuzzy-if(gtkWidget,0-255,0-294) == float-edges-1.html float-edges-1-ref.html
 diff -U0 firefox-87.0/layout/reftests/text/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/text/reftest.list
 --- firefox-87.0/layout/reftests/text/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/text/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/text/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -192 +192 @@
 -fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1320665-cmap-format-13.html 1320665-cmap-format-13-ref.html # see bug 1320665 comments 8-9
 +fuzzy-if(gtkWidget,0-255,0-1071) fails-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1320665-cmap-format-13.html 1320665-cmap-format-13-ref.html # see bug 1320665 comments 8-9
@@ -461,13 +463,13 @@ diff -U0 firefox-87.0/layout/reftests/text/reftest.list.firefox-tests-reftest fi
 +fuzzy-if(gtkWidget,0-5,0-5) == color-opacity-rtl-1.html color-opacity-rtl-1-ref.html
 diff -U0 firefox-87.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/text-transform/reftest.list
 --- firefox-87.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest	2021-03-18 14:48:53.000000000 +0100
-+++ firefox-87.0/layout/reftests/text-transform/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/text-transform/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -15 +15 @@
 -random-if(winWidget) == small-caps-1.html small-caps-1-ref.html # fails if default font supports 'smcp'
 +fuzzy-if(gtkWidget,0-255,0-571) random-if(winWidget) == small-caps-1.html small-caps-1-ref.html # fails if default font supports 'smcp'
 diff -U0 firefox-87.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/transform-3d/reftest.list
 --- firefox-87.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest	2021-03-18 14:49:01.000000000 +0100
-+++ firefox-87.0/layout/reftests/transform-3d/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/transform-3d/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -14 +14 @@
 -fuzzy-if(gtkWidget||winWidget,0-8,0-376) fuzzy-if(Android,0-8,0-441) fuzzy-if(cocoaWidget,0-17,0-4) fuzzy-if(skiaContent,0-16,0-286) fuzzy-if(webrender&&cocoaWidget,0-200,0-310) fuzzy-if(webrender&&winWidget,0-175,0-250) == preserve3d-1a.html preserve3d-1-ref.html
 +fuzzy-if(gtkWidget,0-16,0-394) == preserve3d-1a.html preserve3d-1-ref.html
@@ -486,7 +488,7 @@ diff -U0 firefox-87.0/layout/reftests/transform-3d/reftest.list.firefox-tests-re
 +fuzzy-if(webrender,0-6,0-3500) == 1637067-1.html 1637067-1-ref.html
 diff -U0 firefox-87.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/writing-mode/reftest.list
 --- firefox-87.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest	2021-03-18 14:49:01.000000000 +0100
-+++ firefox-87.0/layout/reftests/writing-mode/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/writing-mode/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -20 +20 @@
 -random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1091058-1.html 1091058-1-ref.html # Bug 1392106
 +fuzzy(0-255,0-315) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1091058-1.html 1091058-1-ref.html # Bug 1392106
@@ -504,7 +506,7 @@ diff -U0 firefox-87.0/layout/reftests/writing-mode/reftest.list.firefox-tests-re
 +fuzzy-if(gtkWidget,0-248,0-8) == 1395926-vertical-upright-gpos-1.html 1395926-vertical-upright-gpos-1-ref.html
 diff -U0 firefox-87.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/writing-mode/tables/reftest.list
 --- firefox-87.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest	2021-03-18 14:48:54.000000000 +0100
-+++ firefox-87.0/layout/reftests/writing-mode/tables/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/writing-mode/tables/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -34 +34 @@
 -== fixed-table-layout-027-vlr.html fixed-table-layout-025-ref.html
 +fuzzy-if(gtkWidget,0-260,0-250) == fixed-table-layout-027-vlr.html fixed-table-layout-025-ref.html
@@ -516,13 +518,13 @@ diff -U0 firefox-87.0/layout/reftests/writing-mode/tables/reftest.list.firefox-t
 -fuzzy-if(Android,0-255,0-38) pref(layout.css.caption-side-non-standard.enabled,true) == table-caption-bottom-1.html table-caption-bottom-1-ref.html
 diff -U0 firefox-87.0/layout/reftests/xul/reftest.list.firefox-tests-reftest firefox-87.0/layout/reftests/xul/reftest.list
 --- firefox-87.0/layout/reftests/xul/reftest.list.firefox-tests-reftest	2021-03-18 14:48:54.000000000 +0100
-+++ firefox-87.0/layout/reftests/xul/reftest.list	2021-03-23 13:12:40.349486310 +0100
++++ firefox-87.0/layout/reftests/xul/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -15 +15 @@
 -random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == chrome://reftest/content/xul/text-small-caps-1.xhtml chrome://reftest/content/xul/text-small-caps-1-ref.xhtml
 +fuzzy-if(gtkWidget,0-255,0-5159) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == chrome://reftest/content/xul/text-small-caps-1.xhtml chrome://reftest/content/xul/text-small-caps-1-ref.xhtml
 diff -U0 firefox-87.0/layout/xul/reftest/reftest.list.firefox-tests-reftest firefox-87.0/layout/xul/reftest/reftest.list
 --- firefox-87.0/layout/xul/reftest/reftest.list.firefox-tests-reftest	2021-03-18 14:48:54.000000000 +0100
-+++ firefox-87.0/layout/xul/reftest/reftest.list	2021-03-23 13:12:40.350486340 +0100
++++ firefox-87.0/layout/xul/reftest/reftest.list	2021-03-24 14:36:18.234122428 +0100
 @@ -14 +14 @@
 -fuzzy(0-10,0-75) == chrome://reftest/content/xul/reftest/scrollbar-marks-overlay.html chrome://reftest/content/xul/reftest/scrollbar-marks-overlay-ref.html
 +fuzzy(0-10,0-90) == chrome://reftest/content/xul/reftest/scrollbar-marks-overlay.html chrome://reftest/content/xul/reftest/scrollbar-marks-overlay-ref.html
diff --git a/firefox-tests-xpcshell.patch b/firefox-tests-xpcshell.patch
index d97182b..d39be81 100644
--- a/firefox-tests-xpcshell.patch
+++ b/firefox-tests-xpcshell.patch
@@ -1,25 +1,25 @@
 diff -U0 firefox-87.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-87.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini
 --- firefox-87.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-03-18 14:48:28.000000000 +0100
-+++ firefox-87.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini	2021-03-24 08:42:32.727231888 +0100
++++ firefox-87.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini	2021-03-24 14:36:18.229122548 +0100
 @@ -9 +8,0 @@
 -[test_appupdateurl.js]
 @@ -27 +25,0 @@
 -[test_sorted_alphabetically.js]
 diff -U0 firefox-87.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-87.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini
 --- firefox-87.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-03-18 14:48:29.000000000 +0100
-+++ firefox-87.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini	2021-03-24 08:42:32.727231888 +0100
++++ firefox-87.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini	2021-03-24 14:36:18.230122524 +0100
 @@ -9 +8,0 @@
 -[test_adb.js]
 diff -U0 firefox-87.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-87.0/netwerk/test/unit_ipc/xpcshell.ini
 --- firefox-87.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell	2021-03-18 14:49:05.000000000 +0100
-+++ firefox-87.0/netwerk/test/unit_ipc/xpcshell.ini	2021-03-24 14:32:31.849567535 +0100
++++ firefox-87.0/netwerk/test/unit_ipc/xpcshell.ini	2021-03-24 14:36:18.230122524 +0100
 @@ -73 +72,0 @@
 -[test_dns_service_wrap.js]
 @@ -112 +110,0 @@
 -[test_trr_httpssvc_wrap.js]
 diff -U0 firefox-87.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-87.0/netwerk/test/unit/xpcshell.ini
 --- firefox-87.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-03-18 14:49:00.000000000 +0100
-+++ firefox-87.0/netwerk/test/unit/xpcshell.ini	2021-03-24 14:30:45.090135351 +0100
++++ firefox-87.0/netwerk/test/unit/xpcshell.ini	2021-03-24 14:36:18.230122524 +0100
 @@ -204 +203,0 @@
 -[test_dns_service.js]
 @@ -228 +226,0 @@
@@ -39,25 +39,27 @@ diff -U0 firefox-87.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell fire
 -[test_odoh.js]
 diff -U0 firefox-87.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-87.0/security/manager/ssl/tests/unit/xpcshell.ini
 --- firefox-87.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell	2021-03-18 14:49:06.000000000 +0100
-+++ firefox-87.0/security/manager/ssl/tests/unit/xpcshell.ini	2021-03-24 08:42:32.728231864 +0100
-@@ -117,2 +116,0 @@
++++ firefox-87.0/security/manager/ssl/tests/unit/xpcshell.ini	2021-03-24 17:36:29.341663052 +0100
+@@ -117,4 +116,0 @@
 -[test_encrypted_client_hello.js]
 -run-sequentially = hardcoded ports
-@@ -182 +179,0 @@
+-[test_encrypted_client_hello_client_only.js]
+-run-sequentially = hardcoded ports
+@@ -182 +177,0 @@
 -[test_oskeystore.js]
 diff -U0 firefox-87.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell firefox-87.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
 --- firefox-87.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell	2021-03-18 14:49:06.000000000 +0100
-+++ firefox-87.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini	2021-03-24 08:42:32.728231864 +0100
++++ firefox-87.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini	2021-03-24 14:36:18.230122524 +0100
 @@ -10 +9,0 @@
 -[test_pkcs11_module.js]
 diff -U0 firefox-87.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-87.0/toolkit/components/commandlines/test/unit/xpcshell.ini
 --- firefox-87.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-03-18 14:51:57.000000000 +0100
-+++ firefox-87.0/toolkit/components/commandlines/test/unit/xpcshell.ini	2021-03-24 08:42:32.728231864 +0100
++++ firefox-87.0/toolkit/components/commandlines/test/unit/xpcshell.ini	2021-03-24 14:36:18.230122524 +0100
 @@ -10 +9,0 @@
 -[test_resolvefile.js]
 diff -U0 firefox-87.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell firefox-87.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
 --- firefox-87.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell	2021-03-18 14:51:46.000000000 +0100
-+++ firefox-87.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini	2021-03-24 08:42:32.728231864 +0100
++++ firefox-87.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini	2021-03-24 14:36:18.230122524 +0100
 @@ -79,2 +78,0 @@
 -[test_ext_downloads_misc.js]
 -skip-if = os == "android" || (os=='linux' && bits==32) || tsan # linux32: bug 1324870, tsan: bug 1612707
@@ -66,11 +68,50 @@ diff -U0 firefox-87.0/toolkit/components/extensions/test/xpcshell/xpcshell-commo
 -skip-if = appname == "thunderbird"
 diff -U0 firefox-87.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-87.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
 --- firefox-87.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-03-18 14:51:47.000000000 +0100
-+++ firefox-87.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini	2021-03-24 08:42:32.728231864 +0100
++++ firefox-87.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini	2021-03-24 14:36:18.230122524 +0100
 @@ -10 +9,0 @@
 -[test_subprocess.js]
 diff -U0 firefox-87.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-87.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
 --- firefox-87.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-03-18 14:51:57.000000000 +0100
-+++ firefox-87.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-03-24 08:42:32.728231864 +0100
++++ firefox-87.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-03-24 17:45:37.009398081 +0100
 @@ -97 +96,0 @@
 -[test_sideloads_after_rebuild.js]
+@@ -112 +110,0 @@
+-[test_startup_scan.js]
+@@ -192,2 +189,0 @@
+-tags = webextensions
+-[test_webextension_theme.js]
+diff -U0 firefox-87.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini.reff firefox-87.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini
+--- firefox-87.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini.reff	2021-03-24 17:42:05.187528580 +0100
++++ firefox-87.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini	2021-03-24 17:42:17.363233673 +0100
+@@ -9,2 +8,0 @@
+-skip-if = toolkit == 'android' # Bug 1567341
+-[test_staticPartition_font.js]
+diff -U0 firefox-87.0/toolkit/components/search/tests/xpcshell/xpcshell.ini.reff firefox-87.0/toolkit/components/search/tests/xpcshell/xpcshell.ini
+--- firefox-87.0/toolkit/components/search/tests/xpcshell/xpcshell.ini.reff	2021-03-24 17:42:51.995394849 +0100
++++ firefox-87.0/toolkit/components/search/tests/xpcshell/xpcshell.ini	2021-03-24 17:44:16.362351417 +0100
+@@ -128 +127,0 @@
+-[test_reload_engines.js]
+@@ -135 +133,0 @@
+-[test_searchSuggest.js]
+@@ -146,2 +143,0 @@
+-[test_settings.js]
+-[test_sort_orders-no-hints.js]
+diff -U0 firefox-87.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini.reff firefox-87.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini
+--- firefox-87.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini.reff	2021-03-24 17:44:37.274844899 +0100
++++ firefox-87.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini	2021-03-24 17:44:42.850709848 +0100
+@@ -4 +3,0 @@
+-[test_DownloadUtils.js]
+diff -U0 firefox-87.0/toolkit/profile/xpcshell/xpcshell.ini.reff firefox-87.0/toolkit/profile/xpcshell/xpcshell.ini
+--- firefox-87.0/toolkit/profile/xpcshell/xpcshell.ini.reff	2021-03-24 17:46:06.873674746 +0100
++++ firefox-87.0/toolkit/profile/xpcshell/xpcshell.ini	2021-03-24 17:46:48.489652405 +0100
+@@ -32,3 +31,0 @@
+-[test_snatch_environment.js]
+-[test_skip_locked_environment.js]
+-[test_snatch_environment_default.js]
+diff -U0 firefox-87.0/browser/extensions/formautofill/test/unit/xpcshell.ini.reff firefox-87.0/browser/extensions/formautofill/test/unit/xpcshell.ini
+--- firefox-87.0/browser/extensions/formautofill/test/unit/xpcshell.ini.reff	2021-03-24 19:28:00.670593333 +0100
++++ firefox-87.0/browser/extensions/formautofill/test/unit/xpcshell.ini	2021-03-24 19:28:10.212361150 +0100
+@@ -80,2 +79,0 @@
+-skip-if = tsan # Times out, bug 1612707
+-[test_sync.js]
diff --git a/firefox.spec b/firefox.spec
index 50e963f..2281626 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -182,7 +182,7 @@ ExcludeArch: ppc64le
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        87.0
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -1079,6 +1079,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Mar 24 2021 Martin Stransky <stransky@redhat.com> - 87.0-2
+- More test fixes
+
 * Tue Mar 23 2021 Martin Stransky <stransky@redhat.com> - 87.0-1
 - Disabled ARM due to build failures
 - Updated to 87.0
diff --git a/run-tests-wayland b/run-tests-wayland
index e526115..28a4800 100755
--- a/run-tests-wayland
+++ b/run-tests-wayland
@@ -75,29 +75,29 @@ if [ $RUN_XPCSHELL_TEST -ne 0 ] ; then
 fi
 
 # Basic render testing
-export TEST_PARAMS=""
+export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true"
 export TEST_FLAVOUR=""
 if [ $RUN_REFTEST -ne 0 ] ; then
-  ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
+  ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
 fi
 if [ $RUN_CRASHTEST -ne 0 ] ; then
-  ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
+  ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
 fi
 if [ $RUN_MOCHITEST -ne 0 ] ; then
-  ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+  ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
 fi
 
 # WebRender testing
 export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
 export TEST_FLAVOUR="-wr"
 if [ $RUN_REFTEST -ne 0 ] ; then
-./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
+./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
 fi
 if [ $RUN_CRASHTEST -ne 0 ] ; then
-./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
+./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
 fi
 if [ $RUN_MOCHITEST -ne 0 ] ; then
-./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
 fi
 
 rm -f  objdir/dist/bin/certutil
diff --git a/run-tests-x11 b/run-tests-x11
index a44e66b..52f6f1b 100755
--- a/run-tests-x11
+++ b/run-tests-x11
@@ -16,18 +16,18 @@ NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
 # Basic render testing
 export TEST_PARAMS=""
 export TEST_FLAVOUR=""
-xvfb-run -s "$X_PARAMS" -n 94 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell
-xvfb-run -s "$X_PARAMS" -n 99 ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
-xvfb-run -s "$X_PARAMS" -n 97 ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
-#xvfb-run -s "$X_PARAMS" -n 98 ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+xvfb-run -s "$X_PARAMS" -n 91 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell
+xvfb-run -s "$X_PARAMS" -n 92 ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
+xvfb-run -s "$X_PARAMS" -n 93 ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
+#xvfb-run -s "$X_PARAMS" -n 94 ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
 
 # WebRender testing
 export TEST_PARAMS="--enable-webrender $TEST_PARAMS"
 export TEST_FLAVOUR="-wr"
-xvfb-run -s "$X_PARAMS" -n 93 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
+xvfb-run -s "$X_PARAMS" -n 95 ./mach xpcshell-test --sequential $TEST_PARAMS 2>&1 | cat - | tee $TEST_DIR/xpcshell-wr
 xvfb-run -s "$X_PARAMS" -n 96 ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR
-xvfb-run -s "$X_PARAMS" -n 94 ./mach crashtest $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
-#xvfb-run -s "$X_PARAMS" -n 95 ./mach mochitest $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
+xvfb-run -s "$X_PARAMS" -n 97 ./mach crashtest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/crashtest$TEST_FLAVOUR
+#xvfb-run -s "$X_PARAMS" -n 98 ./mach mochitest --marionette localhost:$(($(($RANDOM))+2000)) $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR
 
 rm -f  objdir/dist/bin/certutil
 rm -f  objdir/dist/bin/pk12util