Updated to Firefox 89.0

This commit is contained in:
Martin Stransky 2021-06-01 10:15:57 +02:00
parent 1acf4796b3
commit 9dfa7a1527
11 changed files with 345 additions and 844 deletions

View File

@ -1,40 +1,40 @@
diff -U0 firefox-88.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest firefox-88.0/dom/canvas/test/reftest/filters/reftest.list
--- firefox-88.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest 2021-04-15 21:44:27.000000000 +0200
+++ firefox-88.0/dom/canvas/test/reftest/filters/reftest.list 2021-04-19 13:52:26.651141817 +0200
diff -U0 firefox-89.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest firefox-89.0/dom/canvas/test/reftest/filters/reftest.list
--- firefox-89.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest 2021-05-27 22:29:44.000000000 +0200
+++ firefox-89.0/dom/canvas/test/reftest/filters/reftest.list 2021-06-01 09:52:43.600810523 +0200
@@ -21 +21 @@
-== units-ex.html ref.html
+fuzzy-if(gtkWidget,0-255,0-100) == units-ex.html ref.html
diff -U0 firefox-88.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest firefox-88.0/dom/html/reftests/autofocus/reftest.list
--- firefox-88.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest 2021-04-15 21:44:27.000000000 +0200
+++ firefox-88.0/dom/html/reftests/autofocus/reftest.list 2021-04-19 13:52:26.651141817 +0200
diff -U0 firefox-89.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest firefox-89.0/dom/html/reftests/autofocus/reftest.list
--- firefox-89.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest 2021-05-27 22:29:44.000000000 +0200
+++ firefox-89.0/dom/html/reftests/autofocus/reftest.list 2021-06-01 09:52:43.601810543 +0200
@@ -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-88.0/dom/html/reftests/reftest.list.firefox-tests-reftest firefox-88.0/dom/html/reftests/reftest.list
--- firefox-88.0/dom/html/reftests/reftest.list.firefox-tests-reftest 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/dom/html/reftests/reftest.list 2021-04-19 13:52:26.651141817 +0200
diff -U0 firefox-89.0/dom/html/reftests/reftest.list.firefox-tests-reftest firefox-89.0/dom/html/reftests/reftest.list
--- firefox-89.0/dom/html/reftests/reftest.list.firefox-tests-reftest 2021-06-01 09:52:43.601810543 +0200
+++ firefox-89.0/dom/html/reftests/reftest.list 2021-06-01 09:54:06.285502328 +0200
@@ -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-88.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest firefox-88.0/dom/media/test/reftest/reftest.list
--- firefox-88.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/dom/media/test/reftest/reftest.list 2021-04-19 13:52:26.651141817 +0200
-skip-if(isCoverageBuild) fuzzy(0-2,0-830) == bug917595-iframe-1.html bug917595-1-ref.html
+fuzzy-if(gtkWidget,0-2,0-847) skip-if(isCoverageBuild) fuzzy(0-2,0-830) == bug917595-iframe-1.html bug917595-1-ref.html
diff -U0 firefox-89.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest firefox-89.0/dom/media/test/reftest/reftest.list
--- firefox-89.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest 2021-06-01 09:53:07.564300828 +0200
+++ firefox-89.0/dom/media/test/reftest/reftest.list 2021-06-01 09:54:53.023458607 +0200
@@ -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
-skip-if(Android) skip-if(winWidget) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-57,0-4281) fuzzy-if(OSX,55-80,4173-4417) HTTP(..) == bipbop_300_215kbps.mp4.lastframe.html bipbop_300_215kbps.mp4.lastframe-ref.html
-skip-if(Android) skip-if(cocoaWidget) skip-if(winWidget) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-57,0-4281) fuzzy-if(OSX,55-80,4173-4417) HTTP(..) == bipbop_300_215kbps.mp4.lastframe.html bipbop_300_215kbps.mp4.lastframe-ref.html
-skip-if(Android) fuzzy-if(OSX,0-25,0-175921) fuzzy-if(winWidget,0-71,0-179198) fuzzy-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI)),0-255,0-179500) HTTP(..) == gizmo.mp4.seek.html gizmo.mp4.55thframe-ref.html
-skip-if(Android) skip-if(MinGW) skip-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI))) fuzzy(0-10,0-778236) == image-10bits-rendering-video.html image-10bits-rendering-ref.html
-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-88.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest firefox-88.0/dom/media/webvtt/test/reftest/reftest.list
--- firefox-88.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest 2021-04-15 21:44:28.000000000 +0200
+++ firefox-88.0/dom/media/webvtt/test/reftest/reftest.list 2021-04-19 13:52:26.651141817 +0200
diff -U0 firefox-89.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest firefox-89.0/dom/media/webvtt/test/reftest/reftest.list
--- firefox-89.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest 2021-05-27 22:29:44.000000000 +0200
+++ firefox-89.0/dom/media/webvtt/test/reftest/reftest.list 2021-06-01 09:53:07.564300828 +0200
@@ -1,2 +0,0 @@
-skip-if(Android) fuzzy-if((/^Windows\x20NT\x2010\.0/.test(http.oscpu))&&(/^aarch64-msvc/.test(xulRuntime.XPCOMABI)),0-136,0-427680) == vtt_update_display_after_removed_cue.html vtt_update_display_after_removed_cue_ref.html
-skip-if(Android) fuzzy-if(winWidget,0-170,0-170) == vtt_overlapping_time.html vtt_overlapping_time-ref.html
diff -U0 firefox-88.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest firefox-88.0/gfx/layers/apz/test/reftest/reftest.list
--- firefox-88.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest 2021-04-15 21:44:28.000000000 +0200
+++ firefox-88.0/gfx/layers/apz/test/reftest/reftest.list 2021-04-19 14:28:56.488112726 +0200
diff -U0 firefox-89.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest firefox-89.0/gfx/layers/apz/test/reftest/reftest.list
--- firefox-89.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest 2021-05-27 22:29:45.000000000 +0200
+++ firefox-89.0/gfx/layers/apz/test/reftest/reftest.list 2021-06-01 09:53:07.564300828 +0200
@@ -6,6 +6,6 @@
-fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&&gtkWidget,1-8,8-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-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,1-30,4-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
@ -51,22 +51,22 @@ diff -U0 firefox-88.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-ref
@@ -21 +21 @@
-# On desktop, even more fuzz is needed because thumb scaling is not exactly proportional: making the page twice as long
+# On desktop, even more fuzz is needed because thumb scaling is not exactly proportional: making the page twice as long
diff -U0 firefox-88.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest firefox-88.0/image/test/reftest/downscaling/reftest.list
--- firefox-88.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/image/test/reftest/downscaling/reftest.list 2021-04-19 13:52:26.652141847 +0200
diff -U0 firefox-89.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest firefox-89.0/image/test/reftest/downscaling/reftest.list
--- firefox-89.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest 2021-05-27 22:29:45.000000000 +0200
+++ firefox-89.0/image/test/reftest/downscaling/reftest.list 2021-06-01 09:53:07.565300847 +0200
@@ -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-88.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/abs-pos/reftest.list
--- firefox-88.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/abs-pos/reftest.list 2021-04-19 13:52:26.652141847 +0200
diff -U0 firefox-89.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/abs-pos/reftest.list
--- firefox-89.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest 2021-05-27 22:29:47.000000000 +0200
+++ firefox-89.0/layout/reftests/abs-pos/reftest.list 2021-06-01 09:53:07.565300847 +0200
@@ -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-88.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/async-scrolling/reftest.list
--- firefox-88.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest 2021-04-19 13:52:26.652141847 +0200
+++ firefox-88.0/layout/reftests/async-scrolling/reftest.list 2021-04-19 14:22:06.160749705 +0200
diff -U0 firefox-89.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/async-scrolling/reftest.list
--- firefox-89.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/async-scrolling/reftest.list 2021-06-01 09:53:07.565300847 +0200
@@ -27 +27 @@
-fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&&gtkWidget,20-33,14-32) fuzzy-if(webrender&&cocoaWidget,9-21,20-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,9 +113,9 @@ diff -U0 firefox-88.0/layout/reftests/async-scrolling/reftest.list.firefox-tests
+fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,10-10,4-4) fuzzy-if(webrender&&gtkWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,15-16,44-44) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-2.html position-sticky-transformed-in-scrollframe-2-ref.html # Bug 1604338
+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-1.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338
+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-88.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/bidi/reftest.list
--- firefox-88.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/bidi/reftest.list 2021-04-19 14:23:12.313742857 +0200
diff -U0 firefox-89.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/bidi/reftest.list
--- firefox-89.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/bidi/reftest.list 2021-06-01 09:53:07.565300847 +0200
@@ -3 +3 @@
-fuzzy-if(cocoaWidget,0-1,0-1) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == bdi-element.html bdi-element-ref.html # Bug 1392106
+fuzzy(0-1,0-1) fuzzy-if(cocoaWidget,0-1,0-1) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == bdi-element.html bdi-element-ref.html # Bug 1392106
@ -141,15 +141,15 @@ diff -U0 firefox-88.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest fi
+fuzzy(0-254,0-231) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2c-rtl.html brackets-2c-rtl-ref.html # Bug 1392106
+fuzzy(0-1,0-8) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3a-ltr.html brackets-3a-ltr-ref.html # Bug 1392106
+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-88.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/border-radius/reftest.list
--- firefox-88.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/border-radius/reftest.list 2021-04-19 13:52:26.652141847 +0200
diff -U0 firefox-89.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/border-radius/reftest.list
--- firefox-89.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/border-radius/reftest.list 2021-06-01 09:53:07.565300847 +0200
@@ -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-88.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/bugs/reftest.list
--- firefox-88.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/bugs/reftest.list 2021-04-19 14:27:52.647189221 +0200
diff -U0 firefox-89.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/bugs/reftest.list
--- firefox-89.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/bugs/reftest.list 2021-06-01 09:53:07.566300869 +0200
@@ -464 +463,0 @@
-== 341043-1a.html 341043-1-ref.html
@@ -553 +552 @@
@ -188,18 +188,18 @@ diff -U0 firefox-88.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest fi
@@ -2082 +2079 @@
-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
+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-88.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/canvas/reftest.list
--- firefox-88.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/canvas/reftest.list 2021-04-19 13:52:26.652141847 +0200
diff -U0 firefox-89.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/canvas/reftest.list
--- firefox-89.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/canvas/reftest.list 2021-06-01 09:53:07.566300869 +0200
@@ -51,2 +50,0 @@
-!= text-font-lang.html text-font-lang-notref.html
-
@@ -54 +52 @@
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-small-caps-1.html text-small-caps-1-ref.html # Bug 1392106
+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-88.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/css-break/reftest.list
--- firefox-88.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest 2021-04-19 13:52:26.652141847 +0200
+++ firefox-88.0/layout/reftests/css-break/reftest.list 2021-04-19 13:56:26.987380445 +0200
diff -U0 firefox-89.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/css-break/reftest.list
--- firefox-89.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/css-break/reftest.list 2021-06-01 09:53:07.566300869 +0200
@@ -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
@ -207,15 +207,15 @@ diff -U0 firefox-88.0/layout/reftests/css-break/reftest.list.firefox-tests-refte
+fuzzy-if(gtkWidget,0-255,0-4972) == box-decoration-break-1.html box-decoration-break-1-ref.html
+fuzzy-if(gtkWidget,0-255,0-22330) 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
+skip-if(verify) fuzzy(0-75,0-460) fuzzy-if(skiaContent,0-64,0-484) fuzzy-if(Android,0-70,0-1330) 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-88.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/css-placeholder/reftest.list
--- firefox-88.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/css-placeholder/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/css-placeholder/reftest.list
--- firefox-89.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/css-placeholder/reftest.list 2021-06-01 09:53:07.566300869 +0200
@@ -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-88.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/css-ruby/reftest.list
--- firefox-88.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/css-ruby/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/css-ruby/reftest.list
--- firefox-89.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/css-ruby/reftest.list 2021-06-01 09:53:07.566300869 +0200
@@ -17,4 +17,4 @@
-== relative-positioning-2.html relative-positioning-2-ref.html
-== ruby-position-horizontal.html ruby-position-horizontal-ref.html
@ -231,15 +231,15 @@ diff -U0 firefox-88.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftes
@@ -28 +28 @@
-pref(layout.css.ruby.intercharacter.enabled,true) == ruby-intercharacter-2.htm ruby-intercharacter-2-ref.htm
+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-88.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/first-letter/reftest.list
--- firefox-88.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/first-letter/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/first-letter/reftest.list
--- firefox-89.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/first-letter/reftest.list 2021-06-01 09:53:07.566300869 +0200
@@ -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-88.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/font-face/reftest.list
--- firefox-88.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/font-face/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/font-face/reftest.list
--- firefox-89.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/font-face/reftest.list 2021-06-01 09:53:07.566300869 +0200
@@ -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
@ -275,9 +275,9 @@ diff -U0 firefox-88.0/layout/reftests/font-face/reftest.list.firefox-tests-refte
@@ -204 +203 @@
-# Currently Windows 7 and macOS all fail on
+# Currently Windows 7 and macOS all fail on
diff -U0 firefox-88.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/font-matching/reftest.list
--- firefox-88.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/font-matching/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/font-matching/reftest.list
--- firefox-89.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/font-matching/reftest.list 2021-06-01 09:53:07.567300888 +0200
@@ -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
@ -289,59 +289,59 @@ diff -U0 firefox-88.0/layout/reftests/font-matching/reftest.list.firefox-tests-r
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == italic-oblique-9.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-8.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-9.html italic-oblique-ref.html # Bug 1392106
diff -U0 firefox-88.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/forms/fieldset/reftest.list
--- firefox-88.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/forms/fieldset/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/forms/fieldset/reftest.list
--- firefox-89.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/forms/fieldset/reftest.list 2021-06-01 09:53:07.567300888 +0200
@@ -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-88.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/forms/input/checkbox/reftest.list
--- firefox-88.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest 2021-04-19 13:52:26.653141877 +0200
+++ firefox-88.0/layout/reftests/forms/input/checkbox/reftest.list 2021-04-19 14:24:26.567980111 +0200
diff -U0 firefox-89.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/forms/input/checkbox/reftest.list
--- firefox-89.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/forms/input/checkbox/reftest.list 2021-06-01 09:53:07.567300888 +0200
@@ -18 +18 @@
-skip-if((OSX||winWidget)&&nativeThemePref) 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-88.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/forms/input/radio/reftest.list
--- firefox-88.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest 2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/forms/input/radio/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/forms/input/radio/reftest.list
--- firefox-89.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/forms/input/radio/reftest.list 2021-06-01 09:53:07.567300888 +0200
@@ -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-88.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/forms/placeholder/reftest.list
--- firefox-88.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/forms/placeholder/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/forms/placeholder/reftest.list
--- firefox-89.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/forms/placeholder/reftest.list 2021-06-01 09:53:07.567300888 +0200
@@ -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-88.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/forms/textbox/reftest.list
--- firefox-88.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/forms/textbox/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/forms/textbox/reftest.list
--- firefox-89.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/forms/textbox/reftest.list 2021-06-01 09:53:07.567300888 +0200
@@ -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
@@ -8 +8 @@
-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
+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-88.0/layout/reftests/generated-content/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/generated-content/reftest.list
--- firefox-88.0/layout/reftests/generated-content/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/generated-content/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/generated-content/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/generated-content/reftest.list
--- firefox-89.0/layout/reftests/generated-content/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/generated-content/reftest.list 2021-06-01 09:53:07.567300888 +0200
@@ -16 +16 @@
-fuzzy-if(OSX==1010,0-1,0-10) == quotes-001.xml quotes-001-ref.xml
+fuzzy(0-128,0-737) fuzzy-if(OSX==1010,0-1,0-10) == quotes-001.xml quotes-001-ref.xml
diff -U0 firefox-88.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/high-contrast/reftest.list
--- firefox-88.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/high-contrast/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/high-contrast/reftest.list
--- firefox-89.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/high-contrast/reftest.list 2021-06-01 09:53:07.567300888 +0200
@@ -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,0-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-88.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/indic-shaping/reftest.list
--- firefox-88.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/indic-shaping/reftest.list 2021-04-19 13:52:26.653141877 +0200
diff -U0 firefox-89.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/indic-shaping/reftest.list
--- firefox-89.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/indic-shaping/reftest.list 2021-06-01 09:53:07.568300910 +0200
@@ -12 +11,0 @@
-fuzzy-if(gtkWidget,255-255,46-46) == gujarati-3b.html gujarati-3-ref.html # gtkWidget, Bug 1600777
diff -U0 firefox-88.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/mathml/reftest.list
--- firefox-88.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/mathml/reftest.list 2021-04-19 14:23:50.519893996 +0200
diff -U0 firefox-89.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/mathml/reftest.list
--- firefox-89.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/mathml/reftest.list 2021-06-01 09:53:07.568300910 +0200
@@ -26 +26 @@
-random-if(smallScreen&&Android) fuzzy(0-255,0-200) fuzzy-if(geckoview&&webrender,201-216,200-250) fuzzy-if(webrender&&winWidget,114-255,245-361) fuzzy-if(webrender&&OSX,79-153,240-250) == 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
@ -352,9 +352,9 @@ diff -U0 firefox-88.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest
-fuzzy-if(skiaContent,0-1,0-80) fuzzy-if(Android,0-255,0-105) fuzzy-if(gtkWidget,255-255,96-96) skip-if(winWidget) == multiscripts-1.html multiscripts-1-ref.html # Windows: bug 1314684; Android: bug 1392254; Linux: bug 1599638
@@ -256 +254,0 @@
-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-88.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/position-dynamic-changes/relative/reftest.list
--- firefox-88.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest 2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/position-dynamic-changes/relative/reftest.list 2021-04-19 13:52:26.654141907 +0200
diff -U0 firefox-89.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/position-dynamic-changes/relative/reftest.list
--- firefox-89.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/position-dynamic-changes/relative/reftest.list 2021-06-01 09:53:07.568300910 +0200
@@ -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
@ -364,18 +364,18 @@ diff -U0 firefox-88.0/layout/reftests/position-dynamic-changes/relative/reftest.
+fuzzy-if(gtkWidget,0-99,0-1254) fuzzy-if(cocoaWidget,0-1,0-2) == move-top-left.html move-top-left-ref.html # Bug 688545
+fuzzy-if(gtkWidget,0-103,0-637) fuzzy-if(cocoaWidget,0-1,0-3) == move-right-bottom-table.html move-right-bottom-table-ref.html
+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-88.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/position-sticky/reftest.list
--- firefox-88.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest 2021-04-19 13:52:26.654141907 +0200
+++ firefox-88.0/layout/reftests/position-sticky/reftest.list 2021-04-19 14:25:15.862465345 +0200
diff -U0 firefox-89.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/position-sticky/reftest.list
--- firefox-89.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/position-sticky/reftest.list 2021-06-01 09:53:07.568300910 +0200
@@ -53,3 +53,2 @@
-fuzzy-if(Android,0-4,0-4) fuzzy-if(webrender&&gtkWidget,10-17,12-32) fuzzy-if(webrender&&cocoaWidget,7-8,18-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,19-30,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) == nested-sticky-1.html nested-sticky-1-ref.html # Bug 1604644
-skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&&gtkWidget,19-30,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-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
+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) == nested-sticky-1.html nested-sticky-1-ref.html # Bug 1604644
+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-88.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/reftest-sanity/reftest.list
--- firefox-88.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/reftest-sanity/reftest.list 2021-04-19 13:52:26.654141907 +0200
diff -U0 firefox-89.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/reftest-sanity/reftest.list
--- firefox-89.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/reftest-sanity/reftest.list 2021-06-01 09:53:07.568300910 +0200
@@ -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
@ -389,9 +389,9 @@ diff -U0 firefox-88.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-
+#pref(font.default.x-western,"sans-serif") != font-serif.html font-default.html
+#fails pref(font.default.x-western,true) == font-serif.html font-default.html
+#fails pref(font.default.x-western,0) == font-serif.html font-default.html
diff -U0 firefox-88.0/layout/reftests/svg/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/svg/reftest.list
--- firefox-88.0/layout/reftests/svg/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/svg/reftest.list 2021-04-19 13:52:26.654141907 +0200
diff -U0 firefox-89.0/layout/reftests/svg/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/svg/reftest.list
--- firefox-89.0/layout/reftests/svg/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/svg/reftest.list 2021-06-01 09:53:07.568300910 +0200
@@ -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
@ -403,32 +403,32 @@ diff -U0 firefox-88.0/layout/reftests/svg/reftest.list.firefox-tests-reftest fir
@@ -492 +491 @@
-random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == text-layout-09.svg pass.svg # Bug 1392106
+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-88.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/svg/smil/style/reftest.list
--- firefox-88.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest 2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/svg/smil/style/reftest.list 2021-04-19 13:52:26.654141907 +0200
diff -U0 firefox-89.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/svg/smil/style/reftest.list
--- firefox-89.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/svg/smil/style/reftest.list 2021-06-01 09:53:07.568300910 +0200
@@ -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-88.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/svg/svg-integration/reftest.list
--- firefox-88.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/svg/svg-integration/reftest.list 2021-04-19 13:52:26.654141907 +0200
diff -U0 firefox-89.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/svg/svg-integration/reftest.list
--- firefox-89.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/svg/svg-integration/reftest.list 2021-06-01 09:53:07.569300930 +0200
@@ -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
@@ -52 +52 @@
-fuzzy(0-67,0-238) == box-decoration-break-03.xhtml box-decoration-break-01-ref.xhtml
+fuzzy(0-67,0-254) == box-decoration-break-03.xhtml box-decoration-break-01-ref.xhtml
diff -U0 firefox-88.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/svg/text/reftest.list
--- firefox-88.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/svg/text/reftest.list 2021-04-19 13:52:26.654141907 +0200
diff -U0 firefox-89.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/svg/text/reftest.list
--- firefox-89.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/svg/text/reftest.list 2021-06-01 09:53:07.569300930 +0200
@@ -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
+fuzzy-if(skiaContent,0-1,0-120) 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-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-88.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/tab-size/reftest.list
--- firefox-88.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest 2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/tab-size/reftest.list 2021-04-19 13:52:26.654141907 +0200
diff -U0 firefox-89.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/tab-size/reftest.list
--- firefox-89.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/tab-size/reftest.list 2021-06-01 09:53:07.569300930 +0200
@@ -2,6 +2,6 @@
-== tab-size-8.html spaces-8.html
-== tab-size-4.html spaces-4.html
@ -442,26 +442,26 @@ diff -U0 firefox-88.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftes
+fuzzy-if(gtkWidget,0-255,0-371) == tab-size-4-spanoffset.html spaces-4-offset.html
+fuzzy-if(gtkWidget,0-255,0-410) == tab-size-4-multiple.html spaces-4-multiple.html
+fuzzy-if(gtkWidget,0-255,0-63) == tab-size-1.html spaces-1.html
diff -U0 firefox-88.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/text-decoration/reftest.list
--- firefox-88.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest 2021-04-15 21:44:31.000000000 +0200
+++ firefox-88.0/layout/reftests/text-decoration/reftest.list 2021-04-19 13:52:26.654141907 +0200
diff -U0 firefox-89.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/text-decoration/reftest.list
--- firefox-89.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/text-decoration/reftest.list 2021-06-01 09:53:07.569300930 +0200
@@ -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
+fuzzy-if(gtkWidget,0-255,0-40) == complex-decoration-style-quirks.html complex-decoration-style-quirks-ref.html
+fuzzy-if(gtkWidget,0-255,0-40) == complex-decoration-style-standards.html complex-decoration-style-standards-ref.html
diff -U0 firefox-88.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/text-overflow/reftest.list
--- firefox-88.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest 2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/text-overflow/reftest.list 2021-04-19 13:52:26.654141907 +0200
diff -U0 firefox-89.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/text-overflow/reftest.list
--- firefox-89.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/text-overflow/reftest.list 2021-06-01 09:53:07.569300930 +0200
@@ -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
@@ -28 +28 @@
-== float-edges-1.html float-edges-1-ref.html
+fuzzy-if(gtkWidget,0-255,0-294) == float-edges-1.html float-edges-1-ref.html
diff -U0 firefox-88.0/layout/reftests/text/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/text/reftest.list
--- firefox-88.0/layout/reftests/text/reftest.list.firefox-tests-reftest 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/text/reftest.list 2021-04-19 14:25:55.142648846 +0200
diff -U0 firefox-89.0/layout/reftests/text/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/text/reftest.list
--- firefox-89.0/layout/reftests/text/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/text/reftest.list 2021-06-01 09:53:07.569300930 +0200
@@ -190 +190 @@
-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
@ -476,15 +476,15 @@ diff -U0 firefox-88.0/layout/reftests/text/reftest.list.firefox-tests-reftest fi
@@ -366 +366 @@
-== color-opacity-rtl-1.html color-opacity-rtl-1-ref.html
+fuzzy-if(gtkWidget,0-5,0-5) == color-opacity-rtl-1.html color-opacity-rtl-1-ref.html
diff -U0 firefox-88.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/text-transform/reftest.list
--- firefox-88.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest 2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/text-transform/reftest.list 2021-04-19 13:52:26.655141937 +0200
diff -U0 firefox-89.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/text-transform/reftest.list
--- firefox-89.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/text-transform/reftest.list 2021-06-01 09:53:07.569300930 +0200
@@ -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-88.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/transform-3d/reftest.list
--- firefox-88.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest 2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/transform-3d/reftest.list 2021-04-19 13:52:26.655141937 +0200
diff -U0 firefox-89.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/transform-3d/reftest.list
--- firefox-89.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/transform-3d/reftest.list 2021-06-01 09:53:07.570300950 +0200
@@ -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-500) == preserve3d-1a.html preserve3d-1-ref.html
@ -501,9 +501,9 @@ diff -U0 firefox-88.0/layout/reftests/transform-3d/reftest.list.firefox-tests-re
@@ -102 +102 @@
-fuzzy-if(webrender,0-6,0-3117) == 1637067-1.html 1637067-1-ref.html
+fuzzy-if(webrender,0-6,0-3500) == 1637067-1.html 1637067-1-ref.html
diff -U0 firefox-88.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/writing-mode/reftest.list
--- firefox-88.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/writing-mode/reftest.list 2021-04-19 14:26:35.296858677 +0200
diff -U0 firefox-89.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/writing-mode/reftest.list
--- firefox-89.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/writing-mode/reftest.list 2021-06-01 09:53:07.570300950 +0200
@@ -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
@ -519,9 +519,9 @@ diff -U0 firefox-88.0/layout/reftests/writing-mode/reftest.list.firefox-tests-re
@@ -185 +185 @@
-== 1395926-vertical-upright-gpos-1.html 1395926-vertical-upright-gpos-1-ref.html
+fuzzy-if(gtkWidget,0-248,0-8) == 1395926-vertical-upright-gpos-1.html 1395926-vertical-upright-gpos-1-ref.html
diff -U0 firefox-88.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/writing-mode/tables/reftest.list
--- firefox-88.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest 2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/reftests/writing-mode/tables/reftest.list 2021-04-19 13:52:26.655141937 +0200
diff -U0 firefox-89.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/writing-mode/tables/reftest.list
--- firefox-89.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/writing-mode/tables/reftest.list 2021-06-01 09:53:07.570300950 +0200
@@ -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
@ -531,15 +531,15 @@ diff -U0 firefox-88.0/layout/reftests/writing-mode/tables/reftest.list.firefox-t
@@ -77,2 +76,0 @@
-fuzzy-if(Android,0-255,0-38) == table-caption-top-1.html table-caption-top-1-ref.html
-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-88.0/layout/reftests/xul/reftest.list.firefox-tests-reftest firefox-88.0/layout/reftests/xul/reftest.list
--- firefox-88.0/layout/reftests/xul/reftest.list.firefox-tests-reftest 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/layout/reftests/xul/reftest.list 2021-04-19 13:52:26.655141937 +0200
diff -U0 firefox-89.0/layout/reftests/xul/reftest.list.firefox-tests-reftest firefox-89.0/layout/reftests/xul/reftest.list
--- firefox-89.0/layout/reftests/xul/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/reftests/xul/reftest.list 2021-06-01 09:53:07.570300950 +0200
@@ -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-88.0/layout/xul/reftest/reftest.list.firefox-tests-reftest firefox-88.0/layout/xul/reftest/reftest.list
--- firefox-88.0/layout/xul/reftest/reftest.list.firefox-tests-reftest 2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/layout/xul/reftest/reftest.list 2021-04-19 13:52:26.655141937 +0200
diff -U0 firefox-89.0/layout/xul/reftest/reftest.list.firefox-tests-reftest firefox-89.0/layout/xul/reftest/reftest.list
--- firefox-89.0/layout/xul/reftest/reftest.list.firefox-tests-reftest 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/layout/xul/reftest/reftest.list 2021-06-01 09:53:07.570300950 +0200
@@ -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

View File

@ -1,51 +1,51 @@
diff -U0 firefox-88.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini
--- firefox-88.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-04-15 21:44:26.000000000 +0200
+++ firefox-88.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini 2021-04-19 13:48:43.194411557 +0200
diff -U0 firefox-89.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini
--- firefox-89.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:43.000000000 +0200
+++ firefox-89.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini 2021-06-01 09:46:58.663711459 +0200
@@ -9 +8,0 @@
-[test_appupdateurl.js]
@@ -27 +25,0 @@
-[test_sorted_alphabetically.js]
diff -U0 firefox-88.0/browser/extensions/formautofill/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/browser/extensions/formautofill/test/unit/xpcshell.ini
--- firefox-88.0/browser/extensions/formautofill/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/browser/extensions/formautofill/test/unit/xpcshell.ini 2021-04-19 13:48:57.654847093 +0200
diff -U0 firefox-89.0/browser/extensions/formautofill/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/browser/extensions/formautofill/test/unit/xpcshell.ini
--- firefox-89.0/browser/extensions/formautofill/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:43.000000000 +0200
+++ firefox-89.0/browser/extensions/formautofill/test/unit/xpcshell.ini 2021-06-01 09:46:58.663711459 +0200
@@ -80,2 +79,0 @@
-skip-if = tsan # Times out, bug 1612707
-[test_sync.js]
diff -U0 firefox-88.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini
--- firefox-88.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-04-15 21:44:27.000000000 +0200
+++ firefox-88.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini 2021-04-19 13:48:43.194411557 +0200
diff -U0 firefox-89.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini
--- firefox-89.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:43.000000000 +0200
+++ firefox-89.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini 2021-06-01 09:46:58.663711459 +0200
@@ -9 +8,0 @@
-[test_adb.js]
diff -U0 firefox-88.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/netwerk/test/unit_ipc/xpcshell.ini
--- firefox-88.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/netwerk/test/unit_ipc/xpcshell.ini 2021-04-19 13:48:43.194411557 +0200
@@ -74 +73,0 @@
diff -U0 firefox-89.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/netwerk/test/unit_ipc/xpcshell.ini
--- firefox-89.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:48.000000000 +0200
+++ firefox-89.0/netwerk/test/unit_ipc/xpcshell.ini 2021-06-01 09:46:58.663711459 +0200
@@ -73 +72,0 @@
-[test_dns_service_wrap.js]
@@ -115 +113,0 @@
@@ -114 +112,0 @@
-[test_trr_httpssvc_wrap.js]
diff -U0 firefox-88.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/netwerk/test/unit/xpcshell.ini
--- firefox-88.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/netwerk/test/unit/xpcshell.ini 2021-04-19 13:48:43.194411557 +0200
@@ -204 +203,0 @@
diff -U0 firefox-89.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/netwerk/test/unit/xpcshell.ini
--- firefox-89.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:49.000000000 +0200
+++ firefox-89.0/netwerk/test/unit/xpcshell.ini 2021-06-01 09:46:58.663711459 +0200
@@ -205 +204,0 @@
-[test_dns_service.js]
@@ -228 +226,0 @@
@@ -229 +227,0 @@
-[test_file_protocol.js]
@@ -338 +335,0 @@
@@ -339 +336,0 @@
-[test_unix_domain.js]
@@ -350 +346,0 @@
@@ -351 +347,0 @@
-[test_udp_multicast.js]
@@ -399,2 +394,0 @@
@@ -401,2 +396,0 @@
-[test_tls_flags.js]
-skip-if = (verify && (os == 'linux')) || (os == "android" && processor == "x86_64")
@@ -414 +407,0 @@
@@ -416 +409,0 @@
-[test_network_connectivity_service.js]
@@ -509 +501,0 @@
@@ -511 +503,0 @@
-[test_httpssvc_retry_with_ech.js]
@@ -519 +510,0 @@
@@ -521 +512,0 @@
-[test_odoh.js]
diff -U0 firefox-88.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/security/manager/ssl/tests/unit/xpcshell.ini
--- firefox-88.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell 2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/security/manager/ssl/tests/unit/xpcshell.ini 2021-04-19 13:48:43.194411557 +0200
diff -U0 firefox-89.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/security/manager/ssl/tests/unit/xpcshell.ini
--- firefox-89.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:49.000000000 +0200
+++ firefox-89.0/security/manager/ssl/tests/unit/xpcshell.ini 2021-06-01 09:46:58.664711479 +0200
@@ -117,4 +116,0 @@
-[test_encrypted_client_hello.js]
-run-sequentially = hardcoded ports
@ -53,35 +53,34 @@ diff -U0 firefox-88.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests
-run-sequentially = hardcoded ports
@@ -182 +177,0 @@
-[test_oskeystore.js]
diff -U0 firefox-88.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell firefox-88.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
--- firefox-88.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell 2021-04-15 21:44:32.000000000 +0200
+++ firefox-88.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini 2021-04-19 13:48:43.194411557 +0200
diff -U0 firefox-89.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell firefox-89.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
--- firefox-89.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell 2021-05-27 22:29:49.000000000 +0200
+++ firefox-89.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini 2021-06-01 09:46:58.664711479 +0200
@@ -10 +9,0 @@
-[test_pkcs11_module.js]
diff -U0 firefox-88.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini
--- firefox-88.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini 2021-04-19 13:48:57.654847093 +0200
@@ -9,2 +8,0 @@
-skip-if = toolkit == 'android' # Bug 1567341
diff -U0 firefox-89.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini
--- firefox-89.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-06-01 09:47:37.006501341 +0200
+++ firefox-89.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini 2021-06-01 09:50:49.454470429 +0200
@@ -10 +9,0 @@
-[test_staticPartition_font.js]
diff -U0 firefox-88.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/components/commandlines/test/unit/xpcshell.ini
--- firefox-88.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/components/commandlines/test/unit/xpcshell.ini 2021-04-19 13:48:43.194411557 +0200
diff -U0 firefox-89.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/toolkit/components/commandlines/test/unit/xpcshell.ini
--- firefox-89.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/toolkit/components/commandlines/test/unit/xpcshell.ini 2021-06-01 09:47:37.007501362 +0200
@@ -10 +9,0 @@
-[test_resolvefile.js]
diff -U0 firefox-88.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js.firefox-tests-xpcshell firefox-88.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js
--- firefox-88.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js.firefox-tests-xpcshell 2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js 2021-04-19 13:48:57.654847093 +0200
diff -U0 firefox-89.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js.firefox-tests-xpcshell firefox-89.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js
--- firefox-89.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js.firefox-tests-xpcshell 2021-05-27 22:29:53.000000000 +0200
+++ firefox-89.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js 2021-06-01 09:47:37.007501362 +0200
@@ -30,5 +29,0 @@
-
- result = await Corroborate.verifyJar(
- do_get_file("data/signed-components.xpi")
- );
- equal(result, true, "Components signed files do verify");
diff -U0 firefox-88.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell firefox-88.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
--- firefox-88.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini 2021-04-19 13:50:23.462431517 +0200
@@ -78,8 +77,0 @@
diff -U0 firefox-89.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell firefox-89.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
--- firefox-89.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell 2021-05-27 22:29:53.000000000 +0200
+++ firefox-89.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini 2021-06-01 09:50:04.814549764 +0200
@@ -82,10 +81,0 @@
-skip-if = appname == "thunderbird" || os == "android" || tsan # tsan: bug 1612707
-[test_ext_downloads_misc.js]
-skip-if =
@ -89,13 +88,15 @@ diff -U0 firefox-88.0/toolkit/components/extensions/test/xpcshell/xpcshell-commo
- os == 'linux' && bits == 32 # bug 1324870
- tsan # bug 1612707
- os == "win" && bits == 32 # bug 1559476
-[test_ext_downloads_partitionKey.js]
-skip-if = os == "android"
-[test_ext_downloads_private.js]
@@ -254,2 +245,0 @@
@@ -265,2 +254,0 @@
-[test_proxy_listener.js]
-skip-if = appname == "thunderbird"
diff -U0 firefox-88.0/toolkit/components/search/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/components/search/tests/xpcshell/xpcshell.ini
--- firefox-88.0/toolkit/components/search/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/components/search/tests/xpcshell/xpcshell.ini 2021-04-19 13:48:57.654847093 +0200
diff -U0 firefox-89.0/toolkit/components/search/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/toolkit/components/search/tests/xpcshell/xpcshell.ini
--- firefox-89.0/toolkit/components/search/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/toolkit/components/search/tests/xpcshell/xpcshell.ini 2021-06-01 09:47:45.910684974 +0200
@@ -125 +124,0 @@
-[test_reload_engines.js]
@@ -132 +130,0 @@
@ -103,9 +104,9 @@ diff -U0 firefox-88.0/toolkit/components/search/tests/xpcshell/xpcshell.ini.fire
@@ -143,2 +140,0 @@
-[test_settings.js]
-[test_sort_orders-no-hints.js]
diff -U0 firefox-88.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js.firefox-tests-xpcshell firefox-88.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
--- firefox-88.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js.firefox-tests-xpcshell 2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js 2021-04-19 13:48:57.655847123 +0200
diff -U0 firefox-89.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js.firefox-tests-xpcshell firefox-89.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
--- firefox-89.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js.firefox-tests-xpcshell 2021-05-27 22:29:53.000000000 +0200
+++ firefox-89.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js 2021-06-01 09:47:45.911684995 +0200
@@ -598,20 +597,0 @@
- Assert.ok(
- withSuspend - withoutSuspend <= max_delta_ms,
@ -127,36 +128,36 @@ diff -U0 firefox-88.0/toolkit/components/telemetry/tests/unit/test_TelemetrySess
- );
- }
-
diff -U0 firefox-88.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
--- firefox-88.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini 2021-04-19 13:48:57.654847093 +0200
diff -U0 firefox-89.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
--- firefox-89.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini 2021-06-01 09:47:45.911684995 +0200
@@ -10 +9,0 @@
-[test_subprocess.js]
diff -U0 firefox-88.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini
--- firefox-88.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini.firefox-tests-xpcshell 2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini 2021-04-19 13:48:57.654847093 +0200
diff -U0 firefox-89.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini
--- firefox-89.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini 2021-06-01 09:47:45.911684995 +0200
@@ -4 +3,0 @@
-[test_DownloadUtils.js]
diff -U0 firefox-88.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
--- firefox-88.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini 2021-04-19 13:48:57.654847093 +0200
@@ -97 +96,0 @@
diff -U0 firefox-89.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
--- firefox-89.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:53.000000000 +0200
+++ firefox-89.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini 2021-06-01 09:47:45.911684995 +0200
@@ -91 +90,0 @@
-[test_sideloads_after_rebuild.js]
@@ -112 +110,0 @@
@@ -106 +104,0 @@
-[test_startup_scan.js]
@@ -192,2 +189,0 @@
@@ -188,2 +185,0 @@
-tags = webextensions
-[test_webextension_theme.js]
diff -U0 firefox-88.0/toolkit/profile/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-88.0/toolkit/profile/xpcshell/xpcshell.ini
--- firefox-88.0/toolkit/profile/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/toolkit/profile/xpcshell/xpcshell.ini 2021-04-19 13:48:57.654847093 +0200
diff -U0 firefox-89.0/toolkit/profile/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-89.0/toolkit/profile/xpcshell/xpcshell.ini
--- firefox-89.0/toolkit/profile/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/toolkit/profile/xpcshell/xpcshell.ini 2021-06-01 09:47:45.911684995 +0200
@@ -32,3 +31,0 @@
-[test_snatch_environment.js]
-[test_skip_locked_environment.js]
-[test_snatch_environment_default.js]
diff -U0 firefox-88.0/uriloader/exthandler/tests/unit/test_handlerService.js.firefox-tests-xpcshell firefox-88.0/uriloader/exthandler/tests/unit/test_handlerService.js
--- firefox-88.0/uriloader/exthandler/tests/unit/test_handlerService.js.firefox-tests-xpcshell 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/uriloader/exthandler/tests/unit/test_handlerService.js 2021-04-19 13:48:57.655847123 +0200
diff -U0 firefox-89.0/uriloader/exthandler/tests/unit/test_handlerService.js.firefox-tests-xpcshell firefox-89.0/uriloader/exthandler/tests/unit/test_handlerService.js
--- firefox-89.0/uriloader/exthandler/tests/unit/test_handlerService.js.firefox-tests-xpcshell 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/uriloader/exthandler/tests/unit/test_handlerService.js 2021-06-01 09:47:45.911684995 +0200
@@ -145 +145 @@
- Assert.ok(!protoInfo.alwaysAskBeforeHandling);
+ //Assert.ok(!protoInfo.alwaysAskBeforeHandling);

View File

@ -145,13 +145,13 @@ ExcludeArch: s390x
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 88.0.1
Version: 89.0
Release: 1%{?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
%if %{with langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20210510.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20210601.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source10: firefox-mozconfig
@ -225,10 +225,6 @@ Patch402: mozilla-1196777.patch
Patch407: mozilla-1667096.patch
Patch408: mozilla-1663844.patch
Patch415: mozilla-1670333.patch
Patch416: mozilla-1693472.patch
Patch417: mozilla-1702606.patch
Patch418: mozilla-1703657.patch
Patch419: mozilla-1703763.patch
Patch420: mochitest-wayland-workaround.patch
Patch421: mozilla-1580595.patch
Patch422: mozilla-1705048.patch
@ -467,10 +463,6 @@ This package contains results of tests executed during build.
%patch407 -p1 -b .1667096
%patch408 -p1 -b .1663844
%patch415 -p1 -b .1670333
%patch416 -p1 -b .1693472
%patch417 -p1 -b .1702606
%patch418 -p1 -b .1703657
%patch419 -p1 -b .1703763
%patch420 -p1 -b .mochitest-wayland-workaround
%patch421 -p1 -b .1580595
%patch422 -p1 -b .1705048
@ -1029,6 +1021,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Tue Jun 1 2021 Martin Stransky <stransky@redhat.com> - 89.0-1
- Updated to latest upstream (89.0)
* Mon May 10 2021 Martin Stransky <stransky@redhat.com> - 88.0.1-1
- Updated to latest upstream (88.0.1)

View File

@ -1,6 +1,6 @@
diff -up firefox-88.0/dom/base/test/browser_multiple_popups.js.mochitest-wayland-workaround firefox-88.0/dom/base/test/browser_multiple_popups.js
--- firefox-88.0/dom/base/test/browser_multiple_popups.js.mochitest-wayland-workaround 2021-04-15 21:44:27.000000000 +0200
+++ firefox-88.0/dom/base/test/browser_multiple_popups.js 2021-04-22 15:17:36.905908990 +0200
diff -up firefox-89.0/dom/base/test/browser_multiple_popups.js.mochitest-wayland-workaround firefox-89.0/dom/base/test/browser_multiple_popups.js
--- firefox-89.0/dom/base/test/browser_multiple_popups.js.mochitest-wayland-workaround 2021-05-27 22:29:44.000000000 +0200
+++ firefox-89.0/dom/base/test/browser_multiple_popups.js 2021-06-01 10:02:59.648432325 +0200
@@ -265,6 +265,7 @@ add_task(async _ => {
info("All opened from chrome.");
await withTestPage(2, { chrome: true }, async function(browser) {
@ -9,10 +9,10 @@ diff -up firefox-88.0/dom/base/test/browser_multiple_popups.js.mochitest-wayland
});
});
diff -up firefox-88.0/dom/ipc/BrowserChild.cpp.mochitest-wayland-workaround firefox-88.0/dom/ipc/BrowserChild.cpp
--- firefox-88.0/dom/ipc/BrowserChild.cpp.mochitest-wayland-workaround 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/dom/ipc/BrowserChild.cpp 2021-04-22 15:17:36.905908990 +0200
@@ -459,7 +459,7 @@ nsresult BrowserChild::Init(mozIDOMWindo
diff -up firefox-89.0/dom/ipc/BrowserChild.cpp.mochitest-wayland-workaround firefox-89.0/dom/ipc/BrowserChild.cpp
--- firefox-89.0/dom/ipc/BrowserChild.cpp.mochitest-wayland-workaround 2021-05-27 22:29:44.000000000 +0200
+++ firefox-89.0/dom/ipc/BrowserChild.cpp 2021-06-01 10:02:59.649432346 +0200
@@ -457,7 +457,7 @@ nsresult BrowserChild::Init(mozIDOMWindo
}
mPuppetWidget->InfallibleCreate(nullptr,
nullptr, // no parents
@ -21,10 +21,10 @@ diff -up firefox-88.0/dom/ipc/BrowserChild.cpp.mochitest-wayland-workaround fire
nullptr); // HandleWidgetEvent
mWebBrowser = nsWebBrowser::Create(this, mPuppetWidget, mBrowsingContext,
diff -up firefox-88.0/toolkit/components/browser/nsWebBrowser.cpp.mochitest-wayland-workaround firefox-88.0/toolkit/components/browser/nsWebBrowser.cpp
--- firefox-88.0/toolkit/components/browser/nsWebBrowser.cpp.mochitest-wayland-workaround 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/toolkit/components/browser/nsWebBrowser.cpp 2021-04-22 15:17:36.905908990 +0200
@@ -147,7 +147,8 @@ already_AddRefed<nsWebBrowser> nsWebBrow
diff -up firefox-89.0/toolkit/components/browser/nsWebBrowser.cpp.mochitest-wayland-workaround firefox-89.0/toolkit/components/browser/nsWebBrowser.cpp
--- firefox-89.0/toolkit/components/browser/nsWebBrowser.cpp.mochitest-wayland-workaround 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/toolkit/components/browser/nsWebBrowser.cpp 2021-06-01 10:02:59.649432346 +0200
@@ -150,7 +150,8 @@ already_AddRefed<nsWebBrowser> nsWebBrow
// handler that always gets called (even for subframes) for any bubbling
// event.
@ -34,15 +34,14 @@ diff -up firefox-88.0/toolkit/components/browser/nsWebBrowser.cpp.mochitest-wayl
if (NS_WARN_IF(NS_FAILED(rv))) {
return nullptr;
}
diff -up firefox-88.0/widget/gtk/nsWindow.cpp.mochitest-wayland-workaround firefox-88.0/widget/gtk/nsWindow.cpp
--- firefox-88.0/widget/gtk/nsWindow.cpp.mochitest-wayland-workaround 2021-04-22 15:17:36.903908930 +0200
+++ firefox-88.0/widget/gtk/nsWindow.cpp 2021-04-22 15:23:27.031343692 +0200
@@ -2224,8 +2224,22 @@ void nsWindow::SetFocus(Raise aRaise, mo
Preferences::GetBool("widget.wayland-focus-workaroud", false)) {
diff -up firefox-89.0/widget/gtk/nsWindow.cpp.mochitest-wayland-workaround firefox-89.0/widget/gtk/nsWindow.cpp
--- firefox-89.0/widget/gtk/nsWindow.cpp.mochitest-wayland-workaround 2021-06-01 10:02:59.644432243 +0200
+++ firefox-89.0/widget/gtk/nsWindow.cpp 2021-06-01 10:04:28.715262874 +0200
@@ -2225,11 +2225,22 @@ void nsWindow::SetFocus(Raise aRaise, mo
false)) {
// Wayland does not support focus changes so we need to workaround it
// by window hide/show sequence.
- owningWindow->NativeShow(false);
- owningWindow->NativeShow(true);
+ LOG(("Applying Wayland focus workaround for nsWindow %p\n",
+ owningWindow.get()));
+ GtkAllocation allocation;
@ -50,7 +49,10 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.mochitest-wayland-workaround firef
+ LOG((" mShell allocation %d %d -> %d %d\n", allocation.x,
+ allocation.y, allocation.width, allocation.height));
+ owningWindow->Show(false);
+ RefPtr<nsWindow> self(owningWindow);
RefPtr<nsWindow> self(owningWindow);
- NS_DispatchToMainThread(NS_NewRunnableFunction(
- "nsWindow::NativeShow()",
- [self]() -> void { self->NativeShow(true); }));
+ const GtkAllocation alloc = allocation;
+ NS_DispatchToMainThread(
+ NS_NewRunnableFunction("nsWindow::Show()", [self, alloc]() -> void {
@ -62,7 +64,7 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.mochitest-wayland-workaround firef
return;
}
@@ -7935,6 +7949,8 @@ nsresult nsWindow::SynthesizeNativeMouse
@@ -7962,6 +7973,8 @@ nsresult nsWindow::SynthesizeNativeMouse
nsIObserver* aObserver) {
AutoObserverNotifier notifier(aObserver, "mouseevent");
@ -71,7 +73,7 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.mochitest-wayland-workaround firef
if (!mGdkWindow) {
return NS_OK;
}
@@ -7949,6 +7965,12 @@ nsresult nsWindow::SynthesizeNativeMouse
@@ -7976,6 +7989,12 @@ nsresult nsWindow::SynthesizeNativeMouse
switch (aNativeMessage) {
case NativeMouseMessage::ButtonDown:
case NativeMouseMessage::ButtonUp: {

View File

@ -1,7 +1,7 @@
diff -up firefox-88.0/dom/events/EventStateManager.cpp.1580595 firefox-88.0/dom/events/EventStateManager.cpp
--- firefox-88.0/dom/events/EventStateManager.cpp.1580595 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/dom/events/EventStateManager.cpp 2021-04-23 10:16:59.821826691 +0200
@@ -4760,7 +4760,15 @@ void EventStateManager::SetPointerLock(n
diff -up firefox-89.0/dom/events/EventStateManager.cpp.1580595 firefox-89.0/dom/events/EventStateManager.cpp
--- firefox-89.0/dom/events/EventStateManager.cpp.1580595 2021-05-27 22:29:44.000000000 +0200
+++ firefox-89.0/dom/events/EventStateManager.cpp 2021-06-01 10:06:58.641344223 +0200
@@ -4816,7 +4816,15 @@ void EventStateManager::SetPointerLock(n
if (dragService) {
dragService->Suppress();
}
@ -17,10 +17,10 @@ diff -up firefox-88.0/dom/events/EventStateManager.cpp.1580595 firefox-88.0/dom/
// Unlocking, so return pointer to the original position by firing a
// synthetic mouse event. We first reset sLastRefPoint to its
// pre-pointerlock position, so that the synthetic mouse event reports
diff -up firefox-88.0/dom/ipc/BrowserParent.cpp.1580595 firefox-88.0/dom/ipc/BrowserParent.cpp
--- firefox-88.0/dom/ipc/BrowserParent.cpp.1580595 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/dom/ipc/BrowserParent.cpp 2021-04-23 10:16:59.821826691 +0200
@@ -236,7 +236,8 @@ BrowserParent::BrowserParent(ContentPare
diff -up firefox-89.0/dom/ipc/BrowserParent.cpp.1580595 firefox-89.0/dom/ipc/BrowserParent.cpp
--- firefox-89.0/dom/ipc/BrowserParent.cpp.1580595 2021-05-27 22:29:44.000000000 +0200
+++ firefox-89.0/dom/ipc/BrowserParent.cpp 2021-06-01 10:06:58.641344223 +0200
@@ -229,7 +229,8 @@ BrowserParent::BrowserParent(ContentPare
mHasLayers(false),
mHasPresented(false),
mIsReadyToHandleInputEvents(false),
@ -30,7 +30,7 @@ diff -up firefox-88.0/dom/ipc/BrowserParent.cpp.1580595 firefox-88.0/dom/ipc/Bro
MOZ_ASSERT(aManager);
// When the input event queue is disabled, we don't need to handle the case
// that some input events are dispatched before PBrowserConstructor.
@@ -601,6 +602,7 @@ void BrowserParent::RemoveWindowListener
@@ -594,6 +595,7 @@ void BrowserParent::RemoveWindowListener
}
void BrowserParent::Deactivated() {
@ -38,7 +38,7 @@ diff -up firefox-88.0/dom/ipc/BrowserParent.cpp.1580595 firefox-88.0/dom/ipc/Bro
UnsetTopLevelWebFocus(this);
UnsetLastMouseRemoteTarget(this);
PointerLockManager::ReleaseLockedRemoteTarget(this);
@@ -1109,6 +1111,7 @@ void BrowserParent::UpdateDimensions(con
@@ -1078,6 +1080,7 @@ void BrowserParent::UpdateDimensions(con
mChromeOffset = chromeOffset;
Unused << SendUpdateDimensions(GetDimensionInfo());
@ -46,7 +46,7 @@ diff -up firefox-88.0/dom/ipc/BrowserParent.cpp.1580595 firefox-88.0/dom/ipc/Bro
}
}
@@ -1129,6 +1132,17 @@ DimensionInfo BrowserParent::GetDimensio
@@ -1098,6 +1101,17 @@ DimensionInfo BrowserParent::GetDimensio
return di;
}
@ -64,7 +64,7 @@ diff -up firefox-88.0/dom/ipc/BrowserParent.cpp.1580595 firefox-88.0/dom/ipc/Bro
void BrowserParent::SizeModeChanged(const nsSizeMode& aSizeMode) {
if (!mIsDestroyed && aSizeMode != mSizeMode) {
mSizeMode = aSizeMode;
@@ -1915,6 +1929,30 @@ mozilla::ipc::IPCResult BrowserParent::R
@@ -1899,6 +1913,30 @@ mozilla::ipc::IPCResult BrowserParent::R
return IPC_OK();
}
@ -95,10 +95,10 @@ diff -up firefox-88.0/dom/ipc/BrowserParent.cpp.1580595 firefox-88.0/dom/ipc/Bro
void BrowserParent::SendRealKeyEvent(WidgetKeyboardEvent& aEvent) {
if (mIsDestroyed || !mIsReadyToHandleInputEvents) {
return;
diff -up firefox-88.0/dom/ipc/BrowserParent.h.1580595 firefox-88.0/dom/ipc/BrowserParent.h
--- firefox-88.0/dom/ipc/BrowserParent.h.1580595 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/dom/ipc/BrowserParent.h 2021-04-23 10:16:59.821826691 +0200
@@ -551,6 +551,10 @@ class BrowserParent final : public PBrow
diff -up firefox-89.0/dom/ipc/BrowserParent.h.1580595 firefox-89.0/dom/ipc/BrowserParent.h
--- firefox-89.0/dom/ipc/BrowserParent.h.1580595 2021-05-27 22:29:44.000000000 +0200
+++ firefox-89.0/dom/ipc/BrowserParent.h 2021-06-01 10:06:58.641344223 +0200
@@ -547,6 +547,10 @@ class BrowserParent final : public PBrow
mozilla::ipc::IPCResult RecvSynthesizeNativeTouchpadDoubleTap(
const LayoutDeviceIntPoint& aPoint, const uint32_t& aModifierFlags);
@ -109,7 +109,7 @@ diff -up firefox-88.0/dom/ipc/BrowserParent.h.1580595 firefox-88.0/dom/ipc/Brows
void SendMouseEvent(const nsAString& aType, float aX, float aY,
int32_t aButton, int32_t aClickCount, int32_t aModifiers);
@@ -805,6 +809,10 @@ class BrowserParent final : public PBrow
@@ -794,6 +798,10 @@ class BrowserParent final : public PBrow
// and have to ensure that the child did not modify links to be loaded.
bool QueryDropLinksForVerification();
@ -120,7 +120,7 @@ diff -up firefox-88.0/dom/ipc/BrowserParent.h.1580595 firefox-88.0/dom/ipc/Brows
private:
// This is used when APZ needs to find the BrowserParent associated with a
// layer to dispatch events.
@@ -990,6 +998,10 @@ class BrowserParent final : public PBrow
@@ -977,6 +985,10 @@ class BrowserParent final : public PBrow
// BrowserChild was not ready to handle it. We will resend it when the next
// time we fire a mouse event and the BrowserChild is ready.
bool mIsMouseEnterIntoWidgetEventSuppressed : 1;
@ -131,10 +131,10 @@ diff -up firefox-88.0/dom/ipc/BrowserParent.h.1580595 firefox-88.0/dom/ipc/Brows
};
struct MOZ_STACK_CLASS BrowserParent::AutoUseNewTab final {
diff -up firefox-88.0/dom/ipc/PBrowser.ipdl.1580595 firefox-88.0/dom/ipc/PBrowser.ipdl
--- firefox-88.0/dom/ipc/PBrowser.ipdl.1580595 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/dom/ipc/PBrowser.ipdl 2021-04-23 10:16:59.821826691 +0200
@@ -545,6 +545,9 @@ parent:
diff -up firefox-89.0/dom/ipc/PBrowser.ipdl.1580595 firefox-89.0/dom/ipc/PBrowser.ipdl
--- firefox-89.0/dom/ipc/PBrowser.ipdl.1580595 2021-05-27 22:29:44.000000000 +0200
+++ firefox-89.0/dom/ipc/PBrowser.ipdl 2021-06-01 10:06:58.641344223 +0200
@@ -538,6 +538,9 @@ parent:
async SynthesizeNativeTouchpadDoubleTap(LayoutDeviceIntPoint aPoint,
uint32_t aModifierFlags);
@ -144,9 +144,20 @@ diff -up firefox-88.0/dom/ipc/PBrowser.ipdl.1580595 firefox-88.0/dom/ipc/PBrowse
async AccessKeyNotHandled(WidgetKeyboardEvent event);
async RegisterProtocolHandler(nsString scheme, nsIURI handlerURI, nsString title,
diff -up firefox-88.0/widget/gtk/mozwayland/mozwayland.c.1580595 firefox-88.0/widget/gtk/mozwayland/mozwayland.c
--- firefox-88.0/widget/gtk/mozwayland/mozwayland.c.1580595 2021-04-15 21:44:37.000000000 +0200
+++ firefox-88.0/widget/gtk/mozwayland/mozwayland.c 2021-04-23 10:16:59.822826721 +0200
diff -up firefox-89.0/widget/gtk/mozgtk/mozgtk.c.1580595 firefox-89.0/widget/gtk/mozgtk/mozgtk.c
--- firefox-89.0/widget/gtk/mozgtk/mozgtk.c.1580595 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/widget/gtk/mozgtk/mozgtk.c 2021-06-01 10:06:58.643344264 +0200
@@ -647,6 +647,7 @@ STUB(gtk_color_chooser_get_type)
STUB(gtk_color_chooser_set_rgba)
STUB(gtk_color_chooser_get_rgba)
STUB(gtk_color_chooser_set_use_alpha)
+STUB(gdk_wayland_device_get_wl_pointer)
#endif
#ifdef GTK2_SYMBOLS
diff -up firefox-89.0/widget/gtk/mozwayland/mozwayland.c.1580595 firefox-89.0/widget/gtk/mozwayland/mozwayland.c
--- firefox-89.0/widget/gtk/mozwayland/mozwayland.c.1580595 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/widget/gtk/mozwayland/mozwayland.c 2021-06-01 10:06:58.641344223 +0200
@@ -23,6 +23,7 @@ const struct wl_interface wl_callback_in
const struct wl_interface wl_data_device_interface;
const struct wl_interface wl_data_device_manager_interface;
@ -155,11 +166,11 @@ diff -up firefox-88.0/widget/gtk/mozwayland/mozwayland.c.1580595 firefox-88.0/wi
const struct wl_interface wl_region_interface;
const struct wl_interface wl_registry_interface;
const struct wl_interface wl_shm_interface;
diff -up firefox-88.0/widget/gtk/nsWaylandDisplay.cpp.1580595 firefox-88.0/widget/gtk/nsWaylandDisplay.cpp
--- firefox-88.0/widget/gtk/nsWaylandDisplay.cpp.1580595 2021-04-23 10:16:59.814826481 +0200
+++ firefox-88.0/widget/gtk/nsWaylandDisplay.cpp 2021-04-23 10:26:31.795941023 +0200
@@ -115,6 +115,16 @@ void nsWaylandDisplay::SetIdleInhibitMan
mIdleInhibitManager = aIdleInhibitManager;
diff -up firefox-89.0/widget/gtk/nsWaylandDisplay.cpp.1580595 firefox-89.0/widget/gtk/nsWaylandDisplay.cpp
--- firefox-89.0/widget/gtk/nsWaylandDisplay.cpp.1580595 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/widget/gtk/nsWaylandDisplay.cpp 2021-06-01 10:09:49.151849365 +0200
@@ -119,6 +119,16 @@ void nsWaylandDisplay::SetViewporter(wp_
mViewporter = aViewporter;
}
+void nsWaylandDisplay::SetRelativePointerManager(
@ -175,7 +186,7 @@ diff -up firefox-88.0/widget/gtk/nsWaylandDisplay.cpp.1580595 firefox-88.0/widge
static void global_registry_handler(void* data, wl_registry* registry,
uint32_t id, const char* interface,
uint32_t version) {
@@ -163,6 +173,19 @@ static void global_registry_handler(void
@@ -167,6 +177,19 @@ static void global_registry_handler(void
wl_proxy_set_queue((struct wl_proxy*)idle_inhibit_manager,
display->GetEventQueue());
display->SetIdleInhibitManager(idle_inhibit_manager);
@ -195,18 +206,18 @@ diff -up firefox-88.0/widget/gtk/nsWaylandDisplay.cpp.1580595 firefox-88.0/widge
} else if (strcmp(interface, "wl_compositor") == 0) {
// Requested wl_compositor version 4 as we need wl_surface_damage_buffer().
auto* compositor = WaylandRegistryBind<wl_compositor>(
@@ -276,6 +299,8 @@ nsWaylandDisplay::nsWaylandDisplay(wl_di
@@ -285,6 +308,8 @@ nsWaylandDisplay::nsWaylandDisplay(wl_di
mPrimarySelectionDeviceManagerGtk(nullptr),
mPrimarySelectionDeviceManagerZwpV1(nullptr),
mIdleInhibitManager(nullptr),
+ mRelativePointerManager(nullptr),
+ mPointerConstraints(nullptr),
mRegistry(nullptr),
mViewporter(nullptr),
mExplicitSync(false) {
if (!aLighWrapper) {
diff -up firefox-88.0/widget/gtk/nsWaylandDisplay.h.1580595 firefox-88.0/widget/gtk/nsWaylandDisplay.h
--- firefox-88.0/widget/gtk/nsWaylandDisplay.h.1580595 2021-04-23 10:16:59.822826721 +0200
+++ firefox-88.0/widget/gtk/nsWaylandDisplay.h 2021-04-23 10:27:53.216377330 +0200
diff -up firefox-89.0/widget/gtk/nsWaylandDisplay.h.1580595 firefox-89.0/widget/gtk/nsWaylandDisplay.h
--- firefox-89.0/widget/gtk/nsWaylandDisplay.h.1580595 2021-06-01 10:06:58.642344243 +0200
+++ firefox-89.0/widget/gtk/nsWaylandDisplay.h 2021-06-01 10:11:03.422376541 +0200
@@ -14,6 +14,8 @@
#include "mozilla/widget/gbm.h"
#include "mozilla/widget/gtk-primary-selection-client-protocol.h"
@ -215,8 +226,8 @@ diff -up firefox-88.0/widget/gtk/nsWaylandDisplay.h.1580595 firefox-88.0/widget/
+#include "mozilla/widget/pointer-constraints-unstable-v1-client-protocol.h"
#include "mozilla/widget/linux-dmabuf-unstable-v1-client-protocol.h"
#include "mozilla/widget/primary-selection-unstable-v1-client-protocol.h"
@@ -61,6 +63,12 @@ class nsWaylandDisplay {
#include "mozilla/widget/viewporter-client-protocol.h"
@@ -62,6 +64,12 @@ class nsWaylandDisplay {
zwp_idle_inhibit_manager_v1* GetIdleInhibitManager(void) {
return mIdleInhibitManager;
}
@ -226,12 +237,12 @@ diff -up firefox-88.0/widget/gtk/nsWaylandDisplay.h.1580595 firefox-88.0/widget/
+ zwp_pointer_constraints_v1* GetPointerConstraints(void) {
+ return mPointerConstraints;
+ }
wp_viewporter* GetViewporter(void) { return mViewporter; };
bool IsMainThreadDisplay() { return mEventQueue == nullptr; }
@@ -75,6 +83,9 @@ class nsWaylandDisplay {
zwp_primary_selection_device_manager_v1* aPrimarySelectionDeviceManager);
@@ -78,6 +86,9 @@ class nsWaylandDisplay {
void SetIdleInhibitManager(zwp_idle_inhibit_manager_v1* aIdleInhibitManager);
void SetViewporter(wp_viewporter* aViewporter);
+ void SetRelativePointerManager(
+ zwp_relative_pointer_manager_v1* aRelativePointerManager);
@ -239,18 +250,18 @@ diff -up firefox-88.0/widget/gtk/nsWaylandDisplay.h.1580595 firefox-88.0/widget/
bool IsExplicitSyncEnabled() { return mExplicitSync; }
private:
@@ -92,6 +103,8 @@ class nsWaylandDisplay {
@@ -95,6 +106,8 @@ class nsWaylandDisplay {
gtk_primary_selection_device_manager* mPrimarySelectionDeviceManagerGtk;
zwp_primary_selection_device_manager_v1* mPrimarySelectionDeviceManagerZwpV1;
zwp_idle_inhibit_manager_v1* mIdleInhibitManager;
+ zwp_relative_pointer_manager_v1* mRelativePointerManager;
+ zwp_pointer_constraints_v1* mPointerConstraints;
wl_registry* mRegistry;
wp_viewporter* mViewporter;
bool mExplicitSync;
};
diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1580595 firefox-88.0/widget/gtk/nsWindow.cpp
--- firefox-88.0/widget/gtk/nsWindow.cpp.1580595 2021-04-23 10:16:59.819826631 +0200
+++ firefox-88.0/widget/gtk/nsWindow.cpp 2021-04-23 10:16:59.823826750 +0200
diff -up firefox-89.0/widget/gtk/nsWindow.cpp.1580595 firefox-89.0/widget/gtk/nsWindow.cpp
--- firefox-89.0/widget/gtk/nsWindow.cpp.1580595 2021-06-01 10:06:58.640344202 +0200
+++ firefox-89.0/widget/gtk/nsWindow.cpp 2021-06-01 10:06:58.642344243 +0200
@@ -506,6 +506,9 @@ nsWindow::nsWindow() {
#ifdef MOZ_WAYLAND
mNeedsCompositorResume = false;
@ -261,7 +272,7 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1580595 firefox-88.0/widget/gtk/ns
#endif
mWaitingForMoveToRectCB = false;
mPendingSizeRect = LayoutDeviceIntRect(0, 0, 0, 0);
@@ -8013,6 +8016,13 @@ nsresult nsWindow::SynthesizeNativeMouse
@@ -8037,6 +8040,13 @@ nsresult nsWindow::SynthesizeNativeMouse
// all other cases we'll synthesize a motion event that will be emitted by
// gdk_display_warp_pointer().
// XXX How to activate native modifier for the other events?
@ -275,7 +286,7 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1580595 firefox-88.0/widget/gtk/ns
GdkScreen* screen = gdk_window_get_screen(mGdkWindow);
GdkPoint point = DevicePixelsToGdkPointRoundDown(aPoint);
gdk_display_warp_pointer(display, screen, point.x, point.y);
@@ -8436,6 +8446,106 @@ already_AddRefed<nsIWidget> nsIWidget::C
@@ -8460,6 +8470,106 @@ already_AddRefed<nsIWidget> nsIWidget::C
}
#ifdef MOZ_WAYLAND
@ -382,10 +393,10 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1580595 firefox-88.0/widget/gtk/ns
nsresult nsWindow::GetScreenRect(LayoutDeviceIntRect* aRect) {
typedef struct _GdkMonitor GdkMonitor;
static auto s_gdk_display_get_monitor_at_window =
diff -up firefox-88.0/widget/gtk/nsWindow.h.1580595 firefox-88.0/widget/gtk/nsWindow.h
--- firefox-88.0/widget/gtk/nsWindow.h.1580595 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/gtk/nsWindow.h 2021-04-23 10:16:59.822826721 +0200
@@ -424,6 +424,13 @@ class nsWindow final : public nsBaseWidg
diff -up firefox-89.0/widget/gtk/nsWindow.h.1580595 firefox-89.0/widget/gtk/nsWindow.h
--- firefox-89.0/widget/gtk/nsWindow.h.1580595 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/widget/gtk/nsWindow.h 2021-06-01 10:06:58.642344243 +0200
@@ -423,6 +423,13 @@ class nsWindow final : public nsBaseWidg
static bool GetTopLevelWindowActiveState(nsIFrame* aFrame);
static bool TitlebarUseShapeMask();
#ifdef MOZ_WAYLAND
@ -399,7 +410,7 @@ diff -up firefox-88.0/widget/gtk/nsWindow.h.1580595 firefox-88.0/widget/gtk/nsWi
virtual nsresult GetScreenRect(LayoutDeviceIntRect* aRect) override;
virtual nsRect GetPreferredPopupRect() override {
return mPreferredPopupRect;
@@ -481,6 +488,7 @@ class nsWindow final : public nsBaseWidg
@@ -480,6 +487,7 @@ class nsWindow final : public nsBaseWidg
#ifdef MOZ_WAYLAND
bool mNeedsCompositorResume;
bool mCompositorInitiallyPaused;
@ -407,7 +418,7 @@ diff -up firefox-88.0/widget/gtk/nsWindow.h.1580595 firefox-88.0/widget/gtk/nsWi
#endif
bool mWindowScaleFactorChanged;
int mWindowScaleFactor;
@@ -562,6 +570,8 @@ class nsWindow final : public nsBaseWidg
@@ -561,6 +569,8 @@ class nsWindow final : public nsBaseWidg
#endif
#ifdef MOZ_WAYLAND
RefPtr<mozilla::gfx::VsyncSource> mWaylandVsyncSource;
@ -416,20 +427,21 @@ diff -up firefox-88.0/widget/gtk/nsWindow.h.1580595 firefox-88.0/widget/gtk/nsWi
#endif
// Upper bound on pending ConfigureNotify events to be dispatched to the
diff -up firefox-88.0/widget/gtk/wayland/moz.build.1580595 firefox-88.0/widget/gtk/wayland/moz.build
--- firefox-88.0/widget/gtk/wayland/moz.build.1580595 2021-04-23 11:25:30.201028672 +0200
+++ firefox-88.0/widget/gtk/wayland/moz.build 2021-04-23 11:26:20.015525447 +0200
@@ -11,7 +11,9 @@ SOURCES += [
diff -up firefox-89.0/widget/gtk/wayland/moz.build.1580595 firefox-89.0/widget/gtk/wayland/moz.build
--- firefox-89.0/widget/gtk/wayland/moz.build.1580595 2021-06-01 10:06:58.643344264 +0200
+++ firefox-89.0/widget/gtk/wayland/moz.build 2021-06-01 10:08:52.391682258 +0200
@@ -11,8 +11,10 @@ SOURCES += [
"gtk-primary-selection-protocol.c",
"idle-inhibit-unstable-v1-protocol.c",
"linux-dmabuf-unstable-v1-protocol.c",
+ "pointer-constraints-unstable-v1-protocol.c",
"primary-selection-unstable-v1-protocol.c",
"viewporter-protocol.c",
+ "relative-pointer-unstable-v1-protocol.c",
"xdg-output-unstable-v1-protocol.c",
]
@@ -20,7 +22,9 @@ EXPORTS.mozilla.widget += [
@@ -21,7 +23,9 @@ EXPORTS.mozilla.widget += [
"gtk-primary-selection-client-protocol.h",
"idle-inhibit-unstable-v1-client-protocol.h",
"linux-dmabuf-unstable-v1-client-protocol.h",
@ -437,11 +449,11 @@ diff -up firefox-88.0/widget/gtk/wayland/moz.build.1580595 firefox-88.0/widget/g
"primary-selection-unstable-v1-client-protocol.h",
+ "relative-pointer-unstable-v1-client-protocol.h",
"va_drmcommon.h",
"viewporter-client-protocol.h",
"xdg-output-unstable-v1-client-protocol.h",
]
diff -up firefox-88.0/widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h.1580595 firefox-88.0/widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h
--- firefox-88.0/widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h.1580595 2021-04-23 10:16:59.823826750 +0200
+++ firefox-88.0/widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h 2021-04-23 10:16:59.823826750 +0200
diff -up firefox-89.0/widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h.1580595 firefox-89.0/widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h
--- firefox-89.0/widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h.1580595 2021-06-01 10:06:58.643344264 +0200
+++ firefox-89.0/widget/gtk/wayland/pointer-constraints-unstable-v1-client-protocol.h 2021-06-01 10:06:58.643344264 +0200
@@ -0,0 +1,650 @@
+/* Generated by wayland-scanner 1.18.0 */
+
@ -1093,9 +1105,9 @@ diff -up firefox-88.0/widget/gtk/wayland/pointer-constraints-unstable-v1-client-
+#endif
+
+#endif
diff -up firefox-88.0/widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c.1580595 firefox-88.0/widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c
--- firefox-88.0/widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c.1580595 2021-04-23 10:16:59.823826750 +0200
+++ firefox-88.0/widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c 2021-04-23 10:16:59.823826750 +0200
diff -up firefox-89.0/widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c.1580595 firefox-89.0/widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c
--- firefox-89.0/widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c.1580595 2021-06-01 10:06:58.643344264 +0200
+++ firefox-89.0/widget/gtk/wayland/pointer-constraints-unstable-v1-protocol.c 2021-06-01 10:06:58.643344264 +0200
@@ -0,0 +1,97 @@
+/* Generated by wayland-scanner 1.18.0 */
+
@ -1194,9 +1206,9 @@ diff -up firefox-88.0/widget/gtk/wayland/pointer-constraints-unstable-v1-protoco
+ "zwp_confined_pointer_v1", 1, 2,
+ zwp_confined_pointer_v1_requests, 2, zwp_confined_pointer_v1_events,
+};
diff -up firefox-88.0/widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h.1580595 firefox-88.0/widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h
--- firefox-88.0/widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h.1580595 2021-04-23 10:16:59.823826750 +0200
+++ firefox-88.0/widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h 2021-04-23 10:16:59.823826750 +0200
diff -up firefox-89.0/widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h.1580595 firefox-89.0/widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h
--- firefox-89.0/widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h.1580595 2021-06-01 10:06:58.643344264 +0200
+++ firefox-89.0/widget/gtk/wayland/relative-pointer-unstable-v1-client-protocol.h 2021-06-01 10:06:58.643344264 +0200
@@ -0,0 +1,293 @@
+/* Generated by wayland-scanner 1.18.0 */
+
@ -1491,9 +1503,9 @@ diff -up firefox-88.0/widget/gtk/wayland/relative-pointer-unstable-v1-client-pro
+#endif
+
+#endif
diff -up firefox-88.0/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c.1580595 firefox-88.0/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c
--- firefox-88.0/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c.1580595 2021-04-23 10:16:59.823826750 +0200
+++ firefox-88.0/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c 2021-04-23 10:16:59.823826750 +0200
diff -up firefox-89.0/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c.1580595 firefox-89.0/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c
--- firefox-89.0/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c.1580595 2021-06-01 10:06:58.643344264 +0200
+++ firefox-89.0/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c 2021-06-01 10:06:58.643344264 +0200
@@ -0,0 +1,69 @@
+/* Generated by wayland-scanner 1.18.0 */
+
@ -1564,10 +1576,10 @@ diff -up firefox-88.0/widget/gtk/wayland/relative-pointer-unstable-v1-protocol.c
+ "zwp_relative_pointer_v1", 1, 1,
+ zwp_relative_pointer_v1_requests, 1, zwp_relative_pointer_v1_events,
+};
diff -up firefox-88.0/widget/nsIWidget.h.1580595 firefox-88.0/widget/nsIWidget.h
--- firefox-88.0/widget/nsIWidget.h.1580595 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/nsIWidget.h 2021-04-23 10:16:59.823826750 +0200
@@ -1771,6 +1771,16 @@ class nsIWidget : public nsISupports {
diff -up firefox-89.0/widget/nsIWidget.h.1580595 firefox-89.0/widget/nsIWidget.h
--- firefox-89.0/widget/nsIWidget.h.1580595 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/widget/nsIWidget.h 2021-06-01 10:06:58.643344264 +0200
@@ -1834,6 +1834,16 @@ class nsIWidget : public nsISupports {
#endif
@ -1584,10 +1596,10 @@ diff -up firefox-88.0/widget/nsIWidget.h.1580595 firefox-88.0/widget/nsIWidget.h
/*
* Get safe area insets except to cutout.
* See https://drafts.csswg.org/css-env-1/#safe-area-insets.
diff -up firefox-88.0/widget/PuppetWidget.cpp.1580595 firefox-88.0/widget/PuppetWidget.cpp
--- firefox-88.0/widget/PuppetWidget.cpp.1580595 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/PuppetWidget.cpp 2021-04-23 10:16:59.822826721 +0200
@@ -534,6 +534,20 @@ nsresult PuppetWidget::SynthesizeNativeT
diff -up firefox-89.0/widget/PuppetWidget.cpp.1580595 firefox-89.0/widget/PuppetWidget.cpp
--- firefox-89.0/widget/PuppetWidget.cpp.1580595 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/widget/PuppetWidget.cpp 2021-06-01 10:06:58.643344264 +0200
@@ -533,6 +533,20 @@ nsresult PuppetWidget::SynthesizeNativeT
return NS_OK;
}
@ -1608,10 +1620,10 @@ diff -up firefox-88.0/widget/PuppetWidget.cpp.1580595 firefox-88.0/widget/Puppet
void PuppetWidget::SetConfirmedTargetAPZC(
uint64_t aInputBlockId,
const nsTArray<ScrollableLayerGuid>& aTargets) const {
diff -up firefox-88.0/widget/PuppetWidget.h.1580595 firefox-88.0/widget/PuppetWidget.h
--- firefox-88.0/widget/PuppetWidget.h.1580595 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/PuppetWidget.h 2021-04-23 10:16:59.821826691 +0200
@@ -283,6 +283,9 @@ class PuppetWidget : public nsBaseWidget
diff -up firefox-89.0/widget/PuppetWidget.h.1580595 firefox-89.0/widget/PuppetWidget.h
--- firefox-89.0/widget/PuppetWidget.h.1580595 2021-05-27 22:29:54.000000000 +0200
+++ firefox-89.0/widget/PuppetWidget.h 2021-06-01 10:06:58.643344264 +0200
@@ -281,6 +281,9 @@ class PuppetWidget : public nsBaseWidget
virtual nsresult SynthesizeNativeTouchpadDoubleTap(
LayoutDeviceIntPoint aPoint, uint32_t aModifierFlags) override;
@ -1621,13 +1633,3 @@ diff -up firefox-88.0/widget/PuppetWidget.h.1580595 firefox-88.0/widget/PuppetWi
virtual void StartAsyncScrollbarDrag(
const AsyncDragMetrics& aDragMetrics) override;
--- firefox-88.0/widget/gtk/mozgtk/mozgtk.c.old 2021-04-23 14:19:07.244820364 +0200
+++ firefox-88.0/widget/gtk/mozgtk/mozgtk.c 2021-04-23 14:19:34.228631957 +0200
@@ -644,6 +644,7 @@ STUB(gtk_color_chooser_get_type)
STUB(gtk_color_chooser_set_rgba)
STUB(gtk_color_chooser_get_rgba)
STUB(gtk_color_chooser_set_use_alpha)
+STUB(gdk_wayland_device_get_wl_pointer)
#endif
#ifdef GTK2_SYMBOLS

View File

@ -1,111 +0,0 @@
changeset: 576074:12385afb25c9
tag: tip
parent: 576071:a3bc2d23debb
user: stransky <stransky@redhat.com>
date: Wed Mar 31 16:37:22 2021 +0200
files: modules/libpref/init/StaticPrefList.yaml widget/gtk/WindowSurfaceWayland.cpp widget/gtk/WindowSurfaceWayland.h
description:
Bug 1693472 [Wayland] Always use direct drawing on KWim, r?jhorak
Differential Revision: https://phabricator.services.mozilla.com/D110427
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -10991,10 +10991,13 @@
mirror: always
#endif
-# Use smooth rendering for Wayland basic compositor.
+# Smooth rendering mode for Wayland basic compositor.
+# 0 - direct draw
+# 1 - basic caching
+# 2 - all caching
- name: widget.wayland-smooth-rendering
- type: RelaxedAtomicBool
- value: false
+ type: RelaxedAtomicUint32
+ value: 1
mirror: always
# Use DMABuf backend for WebGL.
diff --git a/widget/gtk/WindowSurfaceWayland.cpp b/widget/gtk/WindowSurfaceWayland.cpp
--- a/widget/gtk/WindowSurfaceWayland.cpp
+++ b/widget/gtk/WindowSurfaceWayland.cpp
@@ -487,6 +487,11 @@ WindowSurfaceWayland::WindowSurfaceWayla
for (int i = 0; i < BACK_BUFFER_NUM; i++) {
mShmBackupBuffer[i] = nullptr;
}
+ // Use slow compositing on KDE only.
+ const char* currentDesktop = getenv("XDG_CURRENT_DESKTOP");
+ if (currentDesktop && strstr(currentDesktop, "KDE") != nullptr) {
+ mSmoothRendering = CACHE_NONE;
+ }
}
WindowSurfaceWayland::~WindowSurfaceWayland() {
@@ -817,13 +822,12 @@ already_AddRefed<gfx::DrawTarget> Window
mMozContainerRect = mozContainerSize;
}
- // We can draw directly only when we redraw significant part of the window
- // to avoid flickering or do only fullscreen updates in smooth mode.
- mDrawToWaylandBufferDirectly =
- mSmoothRendering
- ? windowRedraw
- : (windowRedraw || (lockSize.width * 2 > mozContainerSize.width &&
- lockSize.height * 2 > mozContainerSize.height));
+ mDrawToWaylandBufferDirectly = windowRedraw || mSmoothRendering == CACHE_NONE;
+ if (!mDrawToWaylandBufferDirectly && mSmoothRendering == CACHE_SMALL) {
+ mDrawToWaylandBufferDirectly =
+ (lockSize.width * 2 > mozContainerSize.width &&
+ lockSize.height * 2 > mozContainerSize.height);
+ }
if (!mDrawToWaylandBufferDirectly) {
// Don't switch wl_buffers when we cache drawings.
diff --git a/widget/gtk/WindowSurfaceWayland.h b/widget/gtk/WindowSurfaceWayland.h
--- a/widget/gtk/WindowSurfaceWayland.h
+++ b/widget/gtk/WindowSurfaceWayland.h
@@ -149,19 +149,6 @@ class WindowSurfaceWayland : public Wind
RefPtr<nsWaylandDisplay> GetWaylandDisplay() { return mWaylandDisplay; };
- // Image cache mode can be set by widget.wayland_cache_mode
- typedef enum {
- // Cache and clip all drawings, default. It's slowest
- // but also without any rendered artifacts.
- CACHE_ALL = 0,
- // Cache drawing only when back buffer is missing. May produce
- // some rendering artifacts and flickering when partial screen update
- // is rendered.
- CACHE_MISSING = 1,
- // Don't cache anything, draw only when back buffer is available.
- CACHE_NONE = 2
- } RenderingCacheMode;
-
private:
WindowBackBuffer* GetWaylandBuffer();
WindowBackBuffer* SetNewWaylandBuffer();
@@ -251,9 +238,18 @@ class WindowSurfaceWayland : public Wind
// This typically apply to popup windows.
bool mBufferNeedsClear;
+ typedef enum {
+ // Don't cache anything, always draw directly to wl_buffer
+ CACHE_NONE = 0,
+ // Cache only small paints (smaller than 1/2 of screen).
+ CACHE_SMALL = 1,
+ // Cache all painting except fullscreen updates.
+ CACHE_ALL = 2,
+ } RenderingCacheMode;
+
// Cache all drawings except fullscreen updates.
// Avoid any rendering artifacts for significant performance penality.
- bool mSmoothRendering;
+ unsigned int mSmoothRendering;
gint mSurfaceReadyTimerID;
mozilla::Mutex mSurfaceLock;

View File

@ -1,41 +0,0 @@
changeset: 576316:5310862f0f2a
tag: tip
parent: 576314:6159d3fc46c6
user: stransky <stransky@redhat.com>
date: Thu Apr 01 20:02:47 2021 +0200
files: widget/gtk/WindowSurfaceWayland.cpp widget/gtk/nsWaylandDisplay.cpp
description:
Bug 1702606 [Wayland] Don't call mWaylandDisplay::WaitForSyncEnd() from Compositor/Render thread, r?rmader
Differential Revision: https://phabricator.services.mozilla.com/D110590
diff --git a/widget/gtk/WindowSurfaceWayland.cpp b/widget/gtk/WindowSurfaceWayland.cpp
--- a/widget/gtk/WindowSurfaceWayland.cpp
+++ b/widget/gtk/WindowSurfaceWayland.cpp
@@ -737,10 +737,6 @@ already_AddRefed<gfx::DrawTarget> Window
return nullptr;
}
- // Wait until all pending events are processed. There may be queued
- // wl_buffer release event which releases our wl_buffer for further rendering.
- mWaylandDisplay->WaitForSyncEnd();
-
// Lock the surface *after* WaitForSyncEnd() call as is can fire
// FlushPendingCommits().
MutexAutoLock lock(mSurfaceLock);
diff --git a/widget/gtk/nsWaylandDisplay.cpp b/widget/gtk/nsWaylandDisplay.cpp
--- a/widget/gtk/nsWaylandDisplay.cpp
+++ b/widget/gtk/nsWaylandDisplay.cpp
@@ -239,6 +239,10 @@ void nsWaylandDisplay::QueueSyncBegin()
}
void nsWaylandDisplay::WaitForSyncEnd() {
+ MOZ_RELEASE_ASSERT(
+ NS_IsMainThread(),
+ "nsWaylandDisplay::WaitForSyncEnd() can be called in main thread only!");
+
// We're done here
if (!mSyncCallback) {
return;

View File

@ -1,28 +0,0 @@
changeset: 576616:8d1ea60136ed
tag: tip
parent: 576614:144a345005ac
user: stransky <stransky@redhat.com>
date: Wed Apr 07 21:55:43 2021 +0200
files: widget/gtk/nsWindow.cpp
description:
Bug 1703657 [Wayland] Use wayland focus workaround if widget.wayland-focus-workaroud is set at nsWindow::SetFocus(), r?rmader
Differential Revision: https://phabricator.services.mozilla.com/D111162
diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp
--- a/widget/gtk/nsWindow.cpp
+++ b/widget/gtk/nsWindow.cpp
@@ -2220,9 +2220,9 @@ void nsWindow::SetFocus(Raise aRaise, mo
if (gRaiseWindows && owningWindow->mIsShown && owningWindow->mShell &&
!gtk_window_is_active(GTK_WINDOW(owningWindow->mShell))) {
if (!mIsX11Display &&
- Preferences::GetBool("testing.browserTestHarness.running", false)) {
+ Preferences::GetBool("widget.wayland-focus-workaroud", false)) {
// Wayland does not support focus changes so we need to workaround it
- // by window hide/show sequence but only when it's running in testsuite.
+ // by window hide/show sequence.
owningWindow->NativeShow(false);
owningWindow->NativeShow(true);
return;

View File

@ -1,317 +0,0 @@
diff -up firefox-88.0/widget/gtk/nsClipboard.cpp.1703763 firefox-88.0/widget/gtk/nsClipboard.cpp
--- firefox-88.0/widget/gtk/nsClipboard.cpp.1703763 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/gtk/nsClipboard.cpp 2021-04-21 09:46:55.642676394 +0200
@@ -153,10 +153,11 @@ nsClipboard::SetData(nsITransferable* aT
bool imagesAdded = false;
for (uint32_t i = 0; i < flavors.Length(); i++) {
nsCString& flavorStr = flavors[i];
+ LOGCLIP((" processing target %s\n", flavorStr.get()));
// Special case text/unicode since we can handle all of the string types.
if (flavorStr.EqualsLiteral(kUnicodeMime)) {
- LOGCLIP((" text targets\n"));
+ LOGCLIP((" adding TEXT targets\n"));
gtk_target_list_add_text_targets(list, 0);
continue;
}
@@ -165,7 +166,7 @@ nsClipboard::SetData(nsITransferable* aT
// Don't bother adding image targets twice
if (!imagesAdded) {
// accept any writable image type
- LOGCLIP((" image targets\n"));
+ LOGCLIP((" adding IMAGE targets\n"));
gtk_target_list_add_image_targets(list, 0, TRUE);
imagesAdded = true;
}
@@ -173,6 +174,7 @@ nsClipboard::SetData(nsITransferable* aT
}
// Add this to our list of valid targets
+ LOGCLIP((" adding OTHER target %s\n", flavorStr.get()));
GdkAtom atom = gdk_atom_intern(flavorStr.get(), FALSE);
gtk_target_list_add(list, atom, 0, 0);
}
@@ -184,14 +186,17 @@ nsClipboard::SetData(nsITransferable* aT
gint numTargets;
GtkTargetEntry* gtkTargets =
gtk_target_table_new_from_list(list, &numTargets);
-
- LOGCLIP((" gtk_target_table_new_from_list() = %p\n", (void*)gtkTargets));
+ if (!gtkTargets) {
+ LOGCLIP((" gtk_clipboard_set_with_data() failed!\n"));
+ // Clear references to the any old data and let GTK know that it is no
+ // longer available.
+ EmptyClipboard(aWhichClipboard);
+ return NS_ERROR_FAILURE;
+ }
// Set getcallback and request to store data after an application exit
- if (gtkTargets &&
- gtk_clipboard_set_with_data(gtkClipboard, gtkTargets, numTargets,
+ if (gtk_clipboard_set_with_data(gtkClipboard, gtkTargets, numTargets,
clipboard_get_cb, clipboard_clear_cb, this)) {
- LOGCLIP((" gtk_clipboard_set_with_data() is ok\n"));
// We managed to set-up the clipboard so update internal state
// We have to set it now because gtk_clipboard_set_with_data() calls
// clipboard_clear_cb() which reset our internal state
@@ -207,8 +212,6 @@ nsClipboard::SetData(nsITransferable* aT
rv = NS_OK;
} else {
LOGCLIP((" gtk_clipboard_set_with_data() failed!\n"));
- // Clear references to the any old data and let GTK know that it is no
- // longer available.
EmptyClipboard(aWhichClipboard);
rv = NS_ERROR_FAILURE;
}
@@ -419,6 +422,22 @@ nsClipboard::HasDataMatchingFlavors(cons
return NS_OK;
}
+#ifdef MOZ_LOGGING
+ LOGCLIP((" Clipboard content (target nums %d):\n", targetNums));
+ for (int32_t j = 0; j < targetNums; j++) {
+ gchar* atom_name = gdk_atom_name(targets[j]);
+ if (!atom_name) {
+ LOGCLIP((" failed to get MIME\n"));
+ continue;
+ }
+ LOGCLIP((" MIME %s\n", atom_name));
+ }
+ LOGCLIP((" Asking for content:\n"));
+ for (auto& flavor : aFlavorList) {
+ LOGCLIP((" MIME %s\n", flavor.get()));
+ }
+#endif
+
// Walk through the provided types and try to match it to a
// provided type.
for (auto& flavor : aFlavorList) {
diff -up firefox-88.0/widget/gtk/nsClipboard.h.1703763 firefox-88.0/widget/gtk/nsClipboard.h
--- firefox-88.0/widget/gtk/nsClipboard.h.1703763 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/gtk/nsClipboard.h 2021-04-21 09:46:55.642676394 +0200
@@ -23,6 +23,8 @@ extern mozilla::LazyLogModule gClipboard
# define LOGCLIP(args)
#endif /* MOZ_LOGGING */
+enum ClipboardDataType { CLIPBOARD_DATA, CLIPBOARD_TEXT, CLIPBOARD_TARGETS };
+
class nsRetrievalContext {
public:
// Get actual clipboard content (GetClipboardData/GetClipboardText)
diff -up firefox-88.0/widget/gtk/nsClipboardWayland.cpp.1703763 firefox-88.0/widget/gtk/nsClipboardWayland.cpp
--- firefox-88.0/widget/gtk/nsClipboardWayland.cpp.1703763 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/gtk/nsClipboardWayland.cpp 2021-04-21 09:46:55.642676394 +0200
@@ -233,6 +233,7 @@ nsWaylandDragContext* WaylandDataOffer::
static void data_offer_offer(void* data, struct wl_data_offer* wl_data_offer,
const char* type) {
auto* offer = static_cast<DataOffer*>(data);
+ LOGCLIP(("Data offer %p add MIME %s\n", wl_data_offer, type));
offer->AddMIMEType(type);
}
@@ -311,6 +312,8 @@ bool PrimaryDataOffer::RequestDataTransf
static void primary_data_offer(
void* data, gtk_primary_selection_offer* primary_selection_offer,
const char* mime_type) {
+ LOGCLIP(("Primary data offer %p add MIME %s\n", primary_selection_offer,
+ mime_type));
auto* offer = static_cast<DataOffer*>(data);
offer->AddMIMEType(mime_type);
}
@@ -318,6 +321,8 @@ static void primary_data_offer(
static void primary_data_offer(
void* data, zwp_primary_selection_offer_v1* primary_selection_offer,
const char* mime_type) {
+ LOGCLIP(("Primary data offer %p add MIME %s\n", primary_selection_offer,
+ mime_type));
auto* offer = static_cast<DataOffer*>(data);
offer->AddMIMEType(mime_type);
}
@@ -814,30 +819,15 @@ nsRetrievalContextWayland::~nsRetrievalC
g_hash_table_destroy(mActiveOffers);
}
-GdkAtom* nsRetrievalContextWayland::GetTargets(int32_t aWhichClipboard,
- int* aTargetNum) {
- if (GetSelectionAtom(aWhichClipboard) == GDK_SELECTION_CLIPBOARD) {
- if (mClipboardOffer) {
- return mClipboardOffer->GetTargets(aTargetNum);
- }
- } else {
- if (mPrimaryOffer) {
- return mPrimaryOffer->GetTargets(aTargetNum);
- }
- }
-
- *aTargetNum = 0;
- return nullptr;
-}
-
struct FastTrackClipboard {
- FastTrackClipboard(int aClipboardRequestNumber,
+ FastTrackClipboard(ClipboardDataType aDataType, int aClipboardRequestNumber,
nsRetrievalContextWayland* aRetrievalContex)
: mClipboardRequestNumber(aClipboardRequestNumber),
- mRetrievalContex(aRetrievalContex) {}
-
+ mRetrievalContex(aRetrievalContex),
+ mDataType(aDataType) {}
int mClipboardRequestNumber;
nsRetrievalContextWayland* mRetrievalContex;
+ ClipboardDataType mDataType;
};
static void wayland_clipboard_contents_received(
@@ -846,17 +836,24 @@ static void wayland_clipboard_contents_r
selection_data));
FastTrackClipboard* fastTrack = static_cast<FastTrackClipboard*>(data);
fastTrack->mRetrievalContex->TransferFastTrackClipboard(
- fastTrack->mClipboardRequestNumber, selection_data);
+ fastTrack->mDataType, fastTrack->mClipboardRequestNumber, selection_data);
delete fastTrack;
}
void nsRetrievalContextWayland::TransferFastTrackClipboard(
- int aClipboardRequestNumber, GtkSelectionData* aSelectionData) {
+ ClipboardDataType aDataType, int aClipboardRequestNumber,
+ GtkSelectionData* aSelectionData) {
LOGCLIP(
("nsRetrievalContextWayland::TransferFastTrackClipboard(), "
"aSelectionData = %p\n",
aSelectionData));
+ if (mClipboardRequestNumber != aClipboardRequestNumber) {
+ LOGCLIP((" request number does not match!\n"));
+ NS_WARNING("Received obsoleted clipboard data!");
+ }
+ LOGCLIP((" request number matches\n"));
+
int dataLength = gtk_selection_data_get_length(aSelectionData);
if (dataLength < 0) {
LOGCLIP(
@@ -866,24 +863,76 @@ void nsRetrievalContextWayland::Transfer
return;
}
- if (mClipboardRequestNumber == aClipboardRequestNumber) {
- LOGCLIP((" request number matches\n"));
- LOGCLIP((" fastracking %d bytes of data.\n", dataLength));
- mClipboardDataLength = dataLength;
- if (dataLength > 0) {
- mClipboardData = reinterpret_cast<char*>(
- g_malloc(sizeof(char) * (mClipboardDataLength + 1)));
- memcpy(mClipboardData, gtk_selection_data_get_data(aSelectionData),
- sizeof(char) * mClipboardDataLength);
- mClipboardData[mClipboardDataLength] = '\0';
- LOGCLIP((" done, mClipboardData = %p\n", mClipboardData));
- } else {
- ReleaseClipboardData(mClipboardData);
+ switch (aDataType) {
+ case CLIPBOARD_TARGETS: {
+ LOGCLIP((" fastracking %d bytes of clipboard targets.\n", dataLength));
+ gint n_targets = 0;
+ GdkAtom* targets = nullptr;
+
+ if (!gtk_selection_data_get_targets(aSelectionData, &targets,
+ &n_targets) ||
+ !n_targets) {
+ ReleaseClipboardData(mClipboardData);
+ }
+
+ mClipboardData = reinterpret_cast<char*>(targets);
+ mClipboardDataLength = n_targets;
+ break;
+ }
+ case CLIPBOARD_DATA:
+ case CLIPBOARD_TEXT: {
+ LOGCLIP((" fastracking %d bytes of data.\n", dataLength));
+ mClipboardDataLength = dataLength;
+ if (dataLength > 0) {
+ mClipboardData = reinterpret_cast<char*>(
+ g_malloc(sizeof(char) * (mClipboardDataLength + 1)));
+ memcpy(mClipboardData, gtk_selection_data_get_data(aSelectionData),
+ sizeof(char) * mClipboardDataLength);
+ mClipboardData[mClipboardDataLength] = '\0';
+ LOGCLIP((" done, mClipboardData = %p\n", mClipboardData));
+ } else {
+ ReleaseClipboardData(mClipboardData);
+ }
+ }
+ }
+}
+
+GdkAtom* nsRetrievalContextWayland::GetTargets(int32_t aWhichClipboard,
+ int* aTargetNum) {
+ /* If actual clipboard data is owned by us we don't need to go
+ * through Wayland but we ask Gtk+ to directly call data
+ * getter callback nsClipboard::SelectionGetEvent().
+ * see gtk_selection_convert() at gtk+/gtkselection.c.
+ */
+ GdkAtom selection = GetSelectionAtom(aWhichClipboard);
+ if (gdk_selection_owner_get(selection)) {
+ LOGCLIP((" Asking for internal clipboard content.\n"));
+ mClipboardRequestNumber++;
+ gtk_clipboard_request_contents(
+ gtk_clipboard_get(selection), gdk_atom_intern("TARGETS", FALSE),
+ wayland_clipboard_contents_received,
+ new FastTrackClipboard(CLIPBOARD_TARGETS, mClipboardRequestNumber,
+ this));
+ *aTargetNum = mClipboardDataLength;
+ GdkAtom* targets = static_cast<GdkAtom*>((void*)mClipboardData);
+ // We don't hold the target list internally but we transfer the ownership.
+ mClipboardData = nullptr;
+ mClipboardDataLength = 0;
+ return targets;
+ }
+
+ if (GetSelectionAtom(aWhichClipboard) == GDK_SELECTION_CLIPBOARD) {
+ if (mClipboardOffer) {
+ return mClipboardOffer->GetTargets(aTargetNum);
}
} else {
- LOGCLIP((" request number does not match!\n"));
- NS_WARNING("Received obsoleted clipboard data!");
+ if (mPrimaryOffer) {
+ return mPrimaryOffer->GetTargets(aTargetNum);
+ }
}
+
+ *aTargetNum = 0;
+ return nullptr;
}
const char* nsRetrievalContextWayland::GetClipboardData(
@@ -906,7 +955,7 @@ const char* nsRetrievalContextWayland::G
gtk_clipboard_request_contents(
gtk_clipboard_get(selection), gdk_atom_intern(aMimeType, FALSE),
wayland_clipboard_contents_received,
- new FastTrackClipboard(mClipboardRequestNumber, this));
+ new FastTrackClipboard(CLIPBOARD_DATA, mClipboardRequestNumber, this));
} else {
LOGCLIP((" Asking for remote clipboard content.\n"));
const auto& dataOffer =
diff -up firefox-88.0/widget/gtk/nsClipboardWayland.h.1703763 firefox-88.0/widget/gtk/nsClipboardWayland.h
--- firefox-88.0/widget/gtk/nsClipboardWayland.h.1703763 2021-04-21 09:46:55.642676394 +0200
+++ firefox-88.0/widget/gtk/nsClipboardWayland.h 2021-04-21 09:56:10.939329774 +0200
@@ -134,7 +134,8 @@ class nsRetrievalContextWayland : public
void ClearDragAndDropDataOffer();
- void TransferFastTrackClipboard(int aClipboardRequestNumber,
+ void TransferFastTrackClipboard(ClipboardDataType aDataType,
+ int aClipboardRequestNumber,
GtkSelectionData* aSelectionData);
virtual ~nsRetrievalContextWayland() override;
diff -up firefox-88.0/widget/gtk/nsClipboardX11.h.1703763 firefox-88.0/widget/gtk/nsClipboardX11.h
--- firefox-88.0/widget/gtk/nsClipboardX11.h.1703763 2021-04-16 01:11:48.000000000 +0200
+++ firefox-88.0/widget/gtk/nsClipboardX11.h 2021-04-21 09:46:55.642676394 +0200
@@ -10,8 +10,6 @@
#include <gtk/gtk.h>
-enum ClipboardDataType { CLIPBOARD_DATA, CLIPBOARD_TEXT, CLIPBOARD_TARGETS };
-
class nsRetrievalContextX11 : public nsRetrievalContext {
public:
enum State { INITIAL, COMPLETED, TIMED_OUT };

View File

@ -1,6 +1,6 @@
diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1705048 firefox-88.0/widget/gtk/nsWindow.cpp
--- firefox-88.0/widget/gtk/nsWindow.cpp.1705048 2021-05-04 15:43:16.039586526 +0200
+++ firefox-88.0/widget/gtk/nsWindow.cpp 2021-05-04 15:47:26.358614462 +0200
diff -up firefox-89.0/widget/gtk/nsWindow.cpp.1705048 firefox-89.0/widget/gtk/nsWindow.cpp
--- firefox-89.0/widget/gtk/nsWindow.cpp.1705048 2021-06-01 10:12:40.671376199 +0200
+++ firefox-89.0/widget/gtk/nsWindow.cpp 2021-06-01 10:13:45.134701718 +0200
@@ -553,6 +553,7 @@ nsWindow::nsWindow() {
mTitlebarBackdropState = false;
@ -9,16 +9,16 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1705048 firefox-88.0/widget/gtk/ns
mIsPIPWindow = false;
mAlwaysOnTop = false;
@@ -3713,7 +3714,7 @@ void nsWindow::OnButtonPressEvent(GdkEve
@@ -3724,7 +3725,7 @@ void nsWindow::OnButtonPressEvent(GdkEve
LayoutDeviceIntPoint refPoint =
GdkEventCoordsToDevicePixels(aEvent->x, aEvent->y);
- if (mDraggableRegion.Contains(refPoint.x, refPoint.y) &&
+ if ((mIsWaylandPanelWindow || mDraggableRegion.Contains(refPoint.x, refPoint.y)) &&
domButton == MouseButton::ePrimary &&
eventStatus != nsEventStatus_eConsumeNoDefault) {
eventStatus.mContentStatus != nsEventStatus_eConsumeNoDefault) {
mWindowShouldStartDragging = true;
@@ -4614,8 +4615,9 @@ nsresult nsWindow::Create(nsIWidget* aPa
@@ -4636,8 +4637,9 @@ nsresult nsWindow::Create(nsIWidget* aPa
// as a workaround.
mWindowType = eWindowType_toplevel;
} else if (mWindowType == eWindowType_popup && !aNativeParent && !aParent) {
@ -30,7 +30,7 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1705048 firefox-88.0/widget/gtk/ns
mWindowType = eWindowType_toplevel;
}
}
@@ -4642,8 +4644,10 @@ nsresult nsWindow::Create(nsIWidget* aPa
@@ -4664,8 +4666,10 @@ nsresult nsWindow::Create(nsIWidget* aPa
// popup window position.
GtkWindowType type = GTK_WINDOW_TOPLEVEL;
if (mWindowType == eWindowType_popup) {
@ -43,7 +43,7 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1705048 firefox-88.0/widget/gtk/ns
}
mShell = gtk_window_new(type);
@@ -4890,6 +4894,10 @@ nsresult nsWindow::Create(nsIWidget* aPa
@@ -4912,6 +4916,10 @@ nsresult nsWindow::Create(nsIWidget* aPa
}
#endif
@ -54,10 +54,10 @@ diff -up firefox-88.0/widget/gtk/nsWindow.cpp.1705048 firefox-88.0/widget/gtk/ns
if (mWindowType == eWindowType_popup) {
// gdk does not automatically set the cursor for "temporary"
// windows, which are what gtk uses for popups.
diff -up firefox-88.0/widget/gtk/nsWindow.h.1705048 firefox-88.0/widget/gtk/nsWindow.h
--- firefox-88.0/widget/gtk/nsWindow.h.1705048 2021-05-04 15:43:16.041586502 +0200
+++ firefox-88.0/widget/gtk/nsWindow.h 2021-05-04 15:45:01.703331956 +0200
@@ -591,6 +591,10 @@ class nsWindow final : public nsBaseWidg
diff -up firefox-89.0/widget/gtk/nsWindow.h.1705048 firefox-89.0/widget/gtk/nsWindow.h
--- firefox-89.0/widget/gtk/nsWindow.h.1705048 2021-06-01 10:12:40.671376199 +0200
+++ firefox-89.0/widget/gtk/nsWindow.h 2021-06-01 10:12:40.673376240 +0200
@@ -590,6 +590,10 @@ class nsWindow final : public nsBaseWidg
LayoutDeviceIntRegion mDraggableRegion;
// It's PictureInPicture window.
bool mIsPIPWindow;

View File

@ -1,4 +1,2 @@
SHA512 (mochitest-python.tar.gz) = 7f357cb8bd93d64be5cb75819a8a813d2f8f217ff25f0df8c3190910744132405d45797b3900775a44b554f5c70cf2682809c9e7a686ca131fddcd81e98028d9
SHA512 (cbindgen-vendor.tar.xz) = f122880b80009e5d5147b40147ba383731922e618d50312067cab0be6a0873adde5d5dbe2e6688b41c1a7e0f0ca2f1cccfa789e7b834b69f8c5445cc46ecccaf
SHA512 (firefox-88.0.1.source.tar.xz) = e2d7fc950ba49f225c83ee1d799d6318fcf16c33a3b7f40b85c49d5b7865f7e632c703e5fd227a303b56e2565d0796283ebb12d7fd1a02781dcaa45e84cea934
SHA512 (firefox-langpacks-88.0.1-20210510.tar.xz) = 9a2818dac19d1dd728dff0ad9a24c199c3b03aacbde1985344ae3b9a16ad7519d2e74f75c3c0c447ffb031ba542c307eb847d20d346aceedf194dbb068396834