diff options
| -rw-r--r-- | .gitignore | 16 | ||||
| -rw-r--r-- | cbindgen-vendor.tar.xz | bin | 5624628 -> 5627872 bytes | |||
| -rw-r--r-- | firefox-crashreporter-build.patch | 12 | ||||
| -rw-r--r-- | firefox-fedora-ua.patch | 15 | ||||
| -rw-r--r-- | firefox-glibc-dynstack.patch | 64 | ||||
| -rw-r--r-- | firefox-mozconfig | 1 | ||||
| -rw-r--r-- | firefox-testing.patch | 44 | ||||
| -rw-r--r-- | firefox-tests-reftest.patch | 461 | ||||
| -rw-r--r-- | firefox-tests-xpcshell.patch | 142 | ||||
| -rw-r--r-- | firefox.sh.in | 6 | ||||
| -rw-r--r-- | firefox.spec | 129 | ||||
| -rw-r--r-- | librewolf-branding.tgz | bin | 1036752 -> 957778 bytes | |||
| -rw-r--r-- | librewolf.spec | 132 | ||||
| -rw-r--r-- | megabar.patch | 88 | ||||
| -rw-r--r-- | mochitest-wayland-workaround.patch | 27 | ||||
| -rw-r--r-- | mozilla-1705048.patch | 70 | ||||
| -rw-r--r-- | mozilla-1708709.patch | 240 | ||||
| -rw-r--r-- | mozilla-1725828.patch | 53 | ||||
| -rw-r--r-- | mozilla-1728749.patch | 16 | ||||
| -rw-r--r-- | mozilla-vpn-ad.patch | 13 | ||||
| -rw-r--r-- | remove_addons.patch | 20 | ||||
| -rwxr-xr-x | run-tests-wayland | 6 |
22 files changed, 969 insertions, 586 deletions
@@ -458,5 +458,21 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-88.0.1-20210510.tar.xz /firefox-langpacks-89.0-20210601.tar.xz /firefox-89.0.source.tar.xz +/firefox-89.0.2.source.tar.xz +/firefox-langpacks-89.0.2-20210624.tar.xz +/firefox-90.0.source.tar.xz +/firefox-langpacks-90.0-20210712.tar.xz +/firefox-90.0.1.source.tar.xz +/firefox-langpacks-90.0.1-20210721.tar.xz +/firefox-90.0.2.source.tar.xz +/firefox-langpacks-90.0.2-20210722.tar.xz +/firefox-91.0.source.tar.xz +/firefox-langpacks-91.0-20210810.tar.xz +/firefox-91.0.2.source.tar.xz +/firefox-langpacks-91.0.2-20210826.tar.xz +/firefox-langpacks-92.0-20210903.tar.xz +/firefox-92.0.source.tar.xz +/firefox-92.0.1.source.tar.xz +/firefox-langpacks-92.0.1-20210927.tar.xz *.spec? .*.swp diff --git a/cbindgen-vendor.tar.xz b/cbindgen-vendor.tar.xz Binary files differindex 9d6dda0..7ee5ee3 100644 --- a/cbindgen-vendor.tar.xz +++ b/cbindgen-vendor.tar.xz diff --git a/firefox-crashreporter-build.patch b/firefox-crashreporter-build.patch deleted file mode 100644 index 0c1bc37..0000000 --- a/firefox-crashreporter-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up firefox-87.0/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc.old firefox-87.0/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc ---- firefox-87.0/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc.old 2021-03-25 19:07:12.920421009 +0100 -+++ firefox-87.0/toolkit/crashreporter/breakpad-client/linux/handler/exception_handler.cc 2021-03-25 19:06:45.496596019 +0100 -@@ -149,7 +149,7 @@ void InstallAlternateStackLocked() { - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ static const unsigned kSigStackSize = (16384 > SIGSTKSZ) ? 16384 : SIGSTKSZ; - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. diff --git a/firefox-fedora-ua.patch b/firefox-fedora-ua.patch index 7f1f554..053b2a9 100644 --- a/firefox-fedora-ua.patch +++ b/firefox-fedora-ua.patch @@ -1,15 +1,16 @@ -diff -up firefox-65.0/netwerk/protocol/http/nsHttpHandler.cpp.fedora-ua firefox-65.0/netwerk/protocol/http/nsHttpHandler.cpp ---- firefox-65.0/netwerk/protocol/http/nsHttpHandler.cpp.fedora-ua 2019-01-28 14:28:35.806375063 +0100 -+++ firefox-65.0/netwerk/protocol/http/nsHttpHandler.cpp 2019-01-28 14:30:25.886917219 +0100 -@@ -873,6 +873,7 @@ void nsHttpHandler::BuildUserAgent() { +diff -up firefox-91.0.1/netwerk/protocol/http/nsHttpHandler.cpp.fedora-ua firefox-91.0.1/netwerk/protocol/http/nsHttpHandler.cpp +--- firefox-91.0.1/netwerk/protocol/http/nsHttpHandler.cpp.fedora-ua 2021-08-16 20:10:57.000000000 +0200 ++++ firefox-91.0.1/netwerk/protocol/http/nsHttpHandler.cpp 2021-08-23 12:07:21.128772096 +0200 +@@ -716,7 +716,7 @@ void nsHttpHandler::BuildUserAgent() { + // than if we didn't preallocate at all. mUserAgent.SetCapacity(mLegacyAppName.Length() + mLegacyAppVersion.Length() + #ifndef UA_SPARE_PLATFORM - mPlatform.Length() + -+ mPlatform.Length() + 8 + +- mPlatform.Length() + ++ mPlatform.Length() + 10 + #endif mOscpu.Length() + mMisc.Length() + mProduct.Length() + mProductSub.Length() + mAppName.Length() + -@@ -891,6 +892,7 @@ void nsHttpHandler::BuildUserAgent() { +@@ -735,6 +735,7 @@ void nsHttpHandler::BuildUserAgent() { if (!mPlatform.IsEmpty()) { mUserAgent += mPlatform; mUserAgent.AppendLiteral("; "); diff --git a/firefox-glibc-dynstack.patch b/firefox-glibc-dynstack.patch new file mode 100644 index 0000000..b0487d7 --- /dev/null +++ b/firefox-glibc-dynstack.patch @@ -0,0 +1,64 @@ +diff -ur firefox-90.0.orig/js/xpconnect/src/XPCJSContext.cpp firefox-90.0/js/xpconnect/src/XPCJSContext.cpp +--- firefox-90.0.orig/js/xpconnect/src/XPCJSContext.cpp 2021-07-05 21:16:02.000000000 +0200 ++++ firefox-90.0/js/xpconnect/src/XPCJSContext.cpp 2021-07-19 15:01:24.083460460 +0200 +@@ -85,14 +85,6 @@ + using namespace xpc; + using namespace JS; + +-// The watchdog thread loop is pretty trivial, and should not require much stack +-// space to do its job. So only give it 32KiB or the platform minimum. +-#if !defined(PTHREAD_STACK_MIN) +-# define PTHREAD_STACK_MIN 0 +-#endif +-static constexpr size_t kWatchdogStackSize = +- PTHREAD_STACK_MIN < 32 * 1024 ? 32 * 1024 : PTHREAD_STACK_MIN; +- + static void WatchdogMain(void* arg); + class Watchdog; + class WatchdogManager; +@@ -163,7 +155,7 @@ + // watchdog, we need to join it on shutdown. + mThread = PR_CreateThread(PR_USER_THREAD, WatchdogMain, this, + PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, +- PR_JOINABLE_THREAD, kWatchdogStackSize); ++ PR_JOINABLE_THREAD, 0); + if (!mThread) { + MOZ_CRASH("PR_CreateThread failed!"); + } +Only in firefox-90.0/js/xpconnect/src: XPCJSContext.cpp.firefox-glibc-dynstack +diff -ur firefox-90.0.orig/security/sandbox/linux/launch/SandboxLaunch.cpp firefox-90.0/security/sandbox/linux/launch/SandboxLaunch.cpp +--- firefox-90.0.orig/security/sandbox/linux/launch/SandboxLaunch.cpp 2021-07-05 18:20:36.000000000 +0200 ++++ firefox-90.0/security/sandbox/linux/launch/SandboxLaunch.cpp 2021-07-20 08:39:17.272136982 +0200 +@@ -501,8 +501,7 @@ + MOZ_NEVER_INLINE MOZ_ASAN_BLACKLIST static pid_t DoClone(int aFlags, + jmp_buf* aCtx) { + static constexpr size_t kStackAlignment = 16; +- uint8_t miniStack[PTHREAD_STACK_MIN] +- __attribute__((aligned(kStackAlignment))); ++ uint8_t miniStack[4096] __attribute__((aligned(kStackAlignment))); + #ifdef __hppa__ + void* stackPtr = miniStack; + #else +@@ -523,13 +522,19 @@ + CLONE_CHILD_CLEARTID; + MOZ_RELEASE_ASSERT((aFlags & kBadFlags) == 0); + ++ // Block signals due to small stack in DoClone. ++ sigset_t oldSigs; ++ BlockAllSignals(&oldSigs); ++ ++ int ret = 0; + jmp_buf ctx; + if (setjmp(ctx) == 0) { + // In the parent and just called setjmp: +- return DoClone(aFlags | SIGCHLD, &ctx); ++ ret = DoClone(aFlags | SIGCHLD, &ctx); + } ++ RestoreSignals(&oldSigs); + // In the child and have longjmp'ed: +- return 0; ++ return ret; + } + + static bool WriteStringToFile(const char* aPath, const char* aStr, +Only in firefox-90.0/security/sandbox/linux/launch: SandboxLaunch.cpp~ diff --git a/firefox-mozconfig b/firefox-mozconfig index 48d07f7..469d5c1 100644 --- a/firefox-mozconfig +++ b/firefox-mozconfig @@ -14,6 +14,7 @@ ac_add_options --update-channel=release ac_add_options --allow-addon-sideload ac_add_options --with-system-fdk-aac ac_add_options --enable-js-shell +ac_add_options --with-unsigned-addon-scopes=app,system export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/firefox-testing.patch b/firefox-testing.patch index f918aa3..1a9ee13 100644 --- a/firefox-testing.patch +++ b/firefox-testing.patch @@ -1,6 +1,6 @@ -diff -up firefox-87.0/docshell/base/crashtests/crashtests.list.testing firefox-87.0/docshell/base/crashtests/crashtests.list ---- firefox-87.0/docshell/base/crashtests/crashtests.list.testing 2021-03-18 14:48:29.000000000 +0100 -+++ firefox-87.0/docshell/base/crashtests/crashtests.list 2021-03-22 19:07:27.214761368 +0100 +diff -up firefox-91.0/docshell/base/crashtests/crashtests.list.testing firefox-91.0/docshell/base/crashtests/crashtests.list +--- firefox-91.0/docshell/base/crashtests/crashtests.list.testing 2021-08-04 20:02:32.000000000 +0200 ++++ firefox-91.0/docshell/base/crashtests/crashtests.list 2021-08-10 10:38:40.885587687 +0200 @@ -13,7 +13,6 @@ load 614499-1.html load 678872-1.html skip-if(Android) pref(dom.disable_open_during_load,false) load 914521.html # Android bug 1584562 @@ -9,9 +9,9 @@ diff -up firefox-87.0/docshell/base/crashtests/crashtests.list.testing firefox-8 load 1341657.html load 1584467.html load 1614211-1.html -diff -up firefox-87.0/dom/media/tests/crashtests/crashtests.list.testing firefox-87.0/dom/media/tests/crashtests/crashtests.list ---- firefox-87.0/dom/media/tests/crashtests/crashtests.list.testing 2021-03-18 14:48:35.000000000 +0100 -+++ firefox-87.0/dom/media/tests/crashtests/crashtests.list 2021-03-22 19:07:27.214761368 +0100 +diff -up firefox-91.0/dom/media/tests/crashtests/crashtests.list.testing firefox-91.0/dom/media/tests/crashtests/crashtests.list +--- firefox-91.0/dom/media/tests/crashtests/crashtests.list.testing 2021-08-04 20:02:33.000000000 +0200 ++++ firefox-91.0/dom/media/tests/crashtests/crashtests.list 2021-08-10 10:38:40.885587687 +0200 @@ -25,7 +25,6 @@ asserts-if(Android,0-1) pref(browser.lin load 1443212.html asserts-if(Android,0-2) load 1453030.html @@ -20,10 +20,10 @@ diff -up firefox-87.0/dom/media/tests/crashtests/crashtests.list.testing firefox load 1505957.html load 1509442.html load 1511130.html -diff -up firefox-87.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.testing firefox-87.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py ---- firefox-87.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.testing 2021-03-18 14:49:06.000000000 +0100 -+++ firefox-87.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py 2021-03-22 19:07:27.214761368 +0100 -@@ -69,15 +69,7 @@ class TestMarionette(MarionetteTestCase) +diff -up firefox-91.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.testing firefox-91.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py +--- firefox-91.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.testing 2021-08-04 20:03:19.000000000 +0200 ++++ firefox-91.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py 2021-08-10 10:38:40.885587687 +0200 +@@ -75,15 +75,7 @@ class TestMarionette(MarionetteTestCase) def test_application_update_disabled(self): # Updates of the application should always be disabled by default @@ -40,19 +40,21 @@ diff -up firefox-87.0/testing/marionette/harness/marionette_harness/tests/unit/t self.assertFalse(update_allowed) -diff -up firefox-87.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt.testing firefox-87.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt ---- firefox-87.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt.testing 2021-03-18 14:49:54.000000000 +0100 -+++ firefox-87.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt 2021-03-22 19:07:27.214761368 +0100 -@@ -1,4 +1,5 @@ +diff -up firefox-91.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt.testing firefox-91.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt +--- firefox-91.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt.testing 2021-08-10 10:38:40.885587687 +0200 ++++ firefox-91.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt 2021-08-10 10:46:55.136291780 +0200 +@@ -1,6 +1,7 @@ # This file is the websocketprocess requirements.txt used with python 3. -+pyrsistent - # needed by txws, and we'd like pip to get it from the local server before setuptools tries pypi six -diff -up firefox-87.0/toolkit/crashreporter/test/unit/xpcshell.ini.testing firefox-87.0/toolkit/crashreporter/test/unit/xpcshell.ini ---- firefox-87.0/toolkit/crashreporter/test/unit/xpcshell.ini.testing 2021-03-22 19:07:27.214761368 +0100 -+++ firefox-87.0/toolkit/crashreporter/test/unit/xpcshell.ini 2021-03-22 19:10:00.264361746 +0100 -@@ -37,7 +37,6 @@ skip-if = (os != 'win' && os != 'linux') ++pyrsistent + vcversioner==2.16.0.0 + twisted>=18.7.0 + +diff -up firefox-91.0/toolkit/crashreporter/test/unit/xpcshell.ini.testing firefox-91.0/toolkit/crashreporter/test/unit/xpcshell.ini +--- firefox-91.0/toolkit/crashreporter/test/unit/xpcshell.ini.testing 2021-08-04 20:04:05.000000000 +0200 ++++ firefox-91.0/toolkit/crashreporter/test/unit/xpcshell.ini 2021-08-10 10:38:40.885587687 +0200 +@@ -41,7 +41,6 @@ skip-if = (os != 'win' && os != 'linux') [test_crash_AsyncShutdown.js] [test_event_files.js] @@ -60,7 +62,7 @@ diff -up firefox-87.0/toolkit/crashreporter/test/unit/xpcshell.ini.testing firef [test_crash_backgroundtask_moz_crash.js] -@@ -112,4 +111,3 @@ head = head_crashreporter.js head_win64c +@@ -121,4 +120,3 @@ head = head_crashreporter.js head_win64c skip-if = !(os == 'win' && bits == 64 && processor == 'x86_64') reason = Windows test specific to the x86-64 architecture support-files = test_crash_win64cfi_not_a_pe.exe diff --git a/firefox-tests-reftest.patch b/firefox-tests-reftest.patch index 68fd16a..6800721 100644 --- a/firefox-tests-reftest.patch +++ b/firefox-tests-reftest.patch @@ -1,121 +1,107 @@ -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 +diff -U0 firefox-92.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest firefox-92.0/dom/canvas/test/reftest/filters/reftest.list +--- firefox-92.0/dom/canvas/test/reftest/filters/reftest.list.firefox-tests-reftest 2021-09-01 19:14:40.000000000 +0200 ++++ firefox-92.0/dom/canvas/test/reftest/filters/reftest.list 2021-09-03 18:44:02.933897050 +0200 @@ -21 +21 @@ -== units-ex.html ref.html +fuzzy-if(gtkWidget,0-255,0-100) == units-ex.html ref.html -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 +diff -U0 firefox-92.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest firefox-92.0/dom/html/reftests/autofocus/reftest.list +--- firefox-92.0/dom/html/reftests/autofocus/reftest.list.firefox-tests-reftest 2021-09-01 19:14:40.000000000 +0200 ++++ firefox-92.0/dom/html/reftests/autofocus/reftest.list 2021-09-03 18:44:02.933897050 +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-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) 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(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-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 +diff -U0 firefox-92.0/dom/html/reftests/reftest.list.firefox-tests-reftest firefox-92.0/dom/html/reftests/reftest.list +--- firefox-92.0/dom/html/reftests/reftest.list.firefox-tests-reftest 2021-09-01 19:14:40.000000000 +0200 ++++ firefox-92.0/dom/html/reftests/reftest.list 2021-09-03 18:44:02.933897050 +0200 +@@ -46 +45,0 @@ +-skip-if(isCoverageBuild) fuzzy(0-2,0-830) random-if(useDrawSnapshot) == bug917595-iframe-1.html bug917595-1-ref.html +diff -U0 firefox-92.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest firefox-92.0/dom/media/test/reftest/reftest.list +--- firefox-92.0/dom/media/test/reftest/reftest.list.firefox-tests-reftest 2021-09-01 19:14:40.000000000 +0200 ++++ firefox-92.0/dom/media/test/reftest/reftest.list 2021-09-03 18:50:43.693907440 +0200 +@@ -0,0 +1,9 @@ ++skip-if(Android) fuzzy-if(OSX,0-80,0-76800) fuzzy-if(appleSilicon,92-92,76799-76799) fuzzy-if(winWidget,0-62,0-76799) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-70,0-2032) fuzzy-if(swgl,62-69,588-76737) HTTP(..) == short.mp4.firstframe.html short.mp4.firstframe-ref.html ++skip-if(Android) fuzzy-if(OSX,0-87,0-76797) fuzzy-if(appleSilicon,83-83,76797-76797) fuzzy-if(winWidget,0-60,0-76797) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-60,0-6070) fuzzy-if(swgl,52-76,1698-76545) HTTP(..) == short.mp4.lastframe.html short.mp4.lastframe-ref.html ++skip-if(Android) skip-if(cocoaWidget) skip-if(winWidget) fuzzy-if(gtkWidget&&layersGPUAccelerated,0-57,0-4282) fuzzy-if(OSX,55-80,4173-4417) fuzzy-if(swgl,54-54,3653-3653) 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(appleSilicon,49-49,176063-176063) 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 ++skip-if(Android) fuzzy(0-27,0-573106) fuzzy-if(appleSilicon,46-46,575885-575885) == image-10bits-rendering-720-video.html image-10bits-rendering-720-ref.html ++skip-if(Android) fuzzy(0-31,0-573249) == image-10bits-rendering-720-90-video.html image-10bits-rendering-720-90-ref.html ++skip-if(Android) skip-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) fuzzy(0-84,0-771156) fails-if(useDrawSnapshot) == uneven_frame_duration_video.html uneven_frame_duration_video-ref.html # Skip on Windows 7 as the resolution of the video is too high for test machines and will fail in the decoder. +diff -U0 firefox-92.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest firefox-92.0/dom/media/webvtt/test/reftest/reftest.list +--- firefox-92.0/dom/media/webvtt/test/reftest/reftest.list.firefox-tests-reftest 2021-09-01 19:14:41.000000000 +0200 ++++ firefox-92.0/dom/media/webvtt/test/reftest/reftest.list 2021-09-03 18:50:43.693907440 +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-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&>kWidget,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&>kWidget,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 --fuzzy-if(Android,0-7,0-6) fuzzy-if(webrender&>kWidget,1-2,4-20) fuzzy-if(webrender&&cocoaWidget,14-18,48-88) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html --fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&>kWidget,1-8,8-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html +diff -U0 firefox-92.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest firefox-92.0/gfx/layers/apz/test/reftest/reftest.list +--- firefox-92.0/gfx/layers/apz/test/reftest/reftest.list.firefox-tests-reftest 2021-09-01 19:14:41.000000000 +0200 ++++ firefox-92.0/gfx/layers/apz/test/reftest/reftest.list 2021-09-03 18:50:43.693907440 +0200 +@@ -6,6 +5,0 @@ +-fuzzy-if(Android&&!swgl,0-1,0-2) fuzzy-if(Android&&swgl,3-3,4-4) fuzzy-if(webrender&>kWidget,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&&!swgl,0-4,0-5) fuzzy-if(Android&&swgl,11-11,4-4) fuzzy-if(webrender&>kWidget,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 +-fuzzy-if(Android&&!swgl,0-7,0-6) fuzzy-if(Android&&swgl,11-11,8-8) fuzzy-if(webrender&>kWidget,1-2,4-20) fuzzy-if(webrender&&cocoaWidget,14-18,48-88) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html +-fuzzy-if(Android&&!swgl,0-1,0-2) fuzzy-if(Android&&swgl,3-3,4-4) fuzzy-if(webrender&>kWidget,1-8,8-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html -fuzzy-if(Android,0-14,0-5) fuzzy-if(webrender&>kWidget,1-30,12-32) fuzzy-if(webrender&&cocoaWidget,18-22,20-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html -fuzzy-if(Android,0-8,0-8) fuzzy-if(webrender&>kWidget,8-14,12-32) fuzzy-if(webrender&&cocoaWidget,14-18,26-54) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html -+fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&>kWidget&&!swgl,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html -+fuzzy-if(Android,0-4,0-5) fuzzy-if(webrender&>kWidget,28-31,28-50) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html -+fuzzy-if(Android,0-6,0-6) fuzzy-if(webrender&>kWidget&&!swgl,0-20,0-100) fuzzy-if(webrender&&cocoaWidget,17-17,88-88) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html -+fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&>kWidget&&!swgl,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html -+fuzzy-if(Android,0-14,0-5) fuzzy-if(webrender&>kWidget,28-31,28-50) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html -+fuzzy-if(Android,0-8,0-8) fuzzy-if(webrender&>kWidget,0-14,27-80) fuzzy-if(webrender&&cocoaWidget,17-17,50-54) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html -@@ -21 +21 @@ +@@ -21 +15 @@ -# 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-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-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 +diff -U0 firefox-92.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest firefox-92.0/image/test/reftest/downscaling/reftest.list +--- firefox-92.0/image/test/reftest/downscaling/reftest.list.firefox-tests-reftest 2021-09-01 19:14:47.000000000 +0200 ++++ firefox-92.0/image/test/reftest/downscaling/reftest.list 2021-09-03 18:50:44.863939657 +0200 +@@ -91,0 +92,4 @@ ++fuzzy(0-17,0-3940) 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 ++ ++# Skip on Android because it runs reftests via http, and moz-icon isn't ++# accessible from http/https origins anymore. +@@ -172,0 +177,5 @@ ++ ++# Skip on WinXP with skia content ++# Skip on Android because it runs reftests via http, and moz-icon isn't ++# accessible from http/https origins anymore. ++fuzzy(0-53,0-6391) fuzzy-if(appleSilicon,20-20,11605-11605) 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-92.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/abs-pos/reftest.list +--- firefox-92.0/layout/reftests/abs-pos/reftest.list.firefox-tests-reftest 2021-09-01 19:15:00.000000000 +0200 ++++ firefox-92.0/layout/reftests/abs-pos/reftest.list 2021-09-03 18:50:44.863939657 +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-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 +diff -U0 firefox-92.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/async-scrolling/reftest.list +--- firefox-92.0/layout/reftests/async-scrolling/reftest.list.firefox-tests-reftest 2021-09-01 19:15:01.000000000 +0200 ++++ firefox-92.0/layout/reftests/async-scrolling/reftest.list 2021-09-03 18:50:44.863939657 +0200 @@ -27 +27 @@ -fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&>kWidget,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&>kWidget,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 -@@ -38 +38 @@ --skip-if(!asyncPan) fuzzy(0-2,0-2) fuzzy-if(cocoaWidget&&!webrender,1-1,7-16) fuzzy-if(gtkWidget&&!nativeThemePref,0-1,0-4) fuzzy-if(winWidget&&!nativeThemePref,0-1,0-51) == fixed-pos-scrollable-1.html fixed-pos-scrollable-1-ref.html -+skip-if(!asyncPan) fuzzy(0-2,0-2) fuzzy-if(gtkWidget,0-5,0-5) fuzzy-if(cocoaWidget&&!webrender,0-10,0-16) == fixed-pos-scrollable-1.html fixed-pos-scrollable-1-ref.html -@@ -52,2 +52,2 @@ --fuzzy-if(Android,0-6,0-4) fuzzy-if(skiaContent&&!Android,0-1,0-34) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html # Bug 1604338 --fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html # Bug 1604338 -+fuzzy-if(Android,0-6,0-4) fuzzy-if(skiaContent&&!Android,0-1,0-34) fuzzy-if(webrender&>kWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,7-7,38-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html # Bug 1604338 -+fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&>kWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,7-7,38-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html # Bug 1604338 -@@ -55,2 +55,2 @@ --fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html # Bug 1604338 --fuzzy-if(Android,0-7,0-1680) fuzzy-if(webrender&>kWidget,1-1,2-20) fuzzy-if(webrender&&cocoaWidget,1-2,10-18) skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1-ref.html # Bug 1604338 -+fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&>kWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,7-7,38-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html # Bug 1604338 -+fuzzy-if(Android,0-7,0-1680) fuzzy-if(webrender&>kWidget&&!swgl,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,1-2,16-18) skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1-ref.html # Bug 1604338 -@@ -58,2 +58,2 @@ +@@ -52,2 +51,0 @@ +-fuzzy-if(Android,0-6,0-4) fuzzy-if(skiaContent&&!Android,0-1,0-34) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html # Bug 1604338 +-fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html # Bug 1604338 +@@ -55,2 +52,0 @@ +-fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&>kWidget,22-74,20-32) fuzzy-if(webrender&&cocoaWidget,6-7,18-39) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-7,0-39) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html # Bug 1604338 +-fuzzy-if(Android,0-7,0-1680) fuzzy-if(webrender&>kWidget,1-1,2-20) fuzzy-if(webrender&&cocoaWidget,1-2,10-18) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-2,0-18) skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1-ref.html # Bug 1604338 +@@ -58,2 +54,2 @@ -fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&>kWidget,8-13,12-32) fuzzy-if(webrender&&cocoaWidget,10-13,20-44) skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3-ref.html # Bug 1604338 -fuzzy-if(Android,0-7,0-4) fuzzy-if(webrender&>kWidget,18-30,14-32) fuzzy-if(webrender&&cocoaWidget,16-20,20-44) skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4-ref.html # Bug 1604338 +fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&>kWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,13-13,44-44) skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3-ref.html # Bug 1604338 +fuzzy-if(Android,0-7,0-4) fuzzy-if(webrender&>kWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,19-20,44-44) skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4-ref.html # Bug 1604338 -@@ -65,4 +65,4 @@ +@@ -65,4 +60,0 @@ -fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&>kWidget,12-19,12-32) fuzzy-if(webrender&&cocoaWidget,17-21,20-44) skip-if(!asyncPan) == fixed-pos-scrolled-clip-1.html fixed-pos-scrolled-clip-1-ref.html # Bug 1604338 --fuzzy-if(Android,0-44,0-10) fuzzy-if(webrender&>kWidget,16-26,26-64) fuzzy-if(webrender&&cocoaWidget,10-13,38-82) fuzzy-if(winWidget&&!nativeThemePref,0-4,0-36) skip-if(!asyncPan) == fixed-pos-scrolled-clip-2.html fixed-pos-scrolled-clip-2-ref.html # Bug 1604338 +-fuzzy-if(Android,0-44,0-10) fuzzy-if(Android&&webrender&&swgl,0-44,0-126) fuzzy-if(webrender&>kWidget,16-26,26-64) fuzzy-if(webrender&&cocoaWidget,10-13,38-82) fuzzy-if(winWidget&&!nativeThemePref,0-4,0-36) skip-if(!asyncPan) == fixed-pos-scrolled-clip-2.html fixed-pos-scrolled-clip-2-ref.html # Bug 1604338 -fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&>kWidget,17-28,24-60) fuzzy-if(webrender&&cocoaWidget,15-19,40-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-3.html fixed-pos-scrolled-clip-3-ref.html # Bug 1604338 -fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&>kWidget,17-29,24-60) fuzzy-if(webrender&&cocoaWidget,15-19,40-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-4.html fixed-pos-scrolled-clip-4-ref.html # Bug 1604338 -+fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&>kWidget,0-50,0-50) fuzzy-if(webrender&&cocoaWidget,21-21,44-44) skip-if(!asyncPan) == fixed-pos-scrolled-clip-1.html fixed-pos-scrolled-clip-1-ref.html # Bug 1604338 -+fuzzy-if(Android,0-44,0-10) fuzzy-if(webrender&>kWidget,0-100,0-100) fuzzy-if(webrender&&cocoaWidget,13-13,81-82) skip-if(!asyncPan) == fixed-pos-scrolled-clip-2.html fixed-pos-scrolled-clip-2-ref.html # Bug 1604338 -+fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&>kWidget,0-50,0-100) fuzzy-if(webrender&&cocoaWidget,18-19,70-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-3.html fixed-pos-scrolled-clip-3-ref.html # Bug 1604338 -+fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&>kWidget,0-50,0-100) fuzzy-if(webrender&&cocoaWidget,18-19,70-75) skip-if(!asyncPan) == fixed-pos-scrolled-clip-4.html fixed-pos-scrolled-clip-4-ref.html # Bug 1604338 -@@ -71 +71 @@ +@@ -71 +63 @@ -fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&>kWidget,16-25,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-scrolled-clip-1.html position-sticky-scrolled-clip-1-ref.html # Bug 1604338 +fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&>kWidget,22-30,28-50) fuzzy-if(webrender&&cocoaWidget,16-16,44-44) skip-if(!asyncPan) == position-sticky-scrolled-clip-1.html position-sticky-scrolled-clip-1-ref.html # Bug 1604338 -@@ -73,6 +73,6 @@ +@@ -73,6 +64,0 @@ -fuzzy-if(Android,0-8,0-27) fuzzy-if(webrender&&cocoaWidget,9-11,20-44) skip-if(!asyncPan) == curtain-effect-1.html curtain-effect-1-ref.html --fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&>kWidget,10-15,12-32) fuzzy-if(webrender&&cocoaWidget,5-9,20-42) skip-if(!asyncPan) == transformed-1.html transformed-1-ref.html # Bug 1604338 --fuzzy-if(Android&&!webrender,2-2,4-4) fuzzy-if(Android&&webrender,7-7,4-4) fuzzy-if(webrender&>kWidget,3-5,12-28) fuzzy-if(webrender&&cocoaWidget,5-6,18-38) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-1.html position-sticky-transformed-in-scrollframe-1-ref.html # Bug 1604338 --fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,10-10,4-4) fuzzy-if(webrender&>kWidget,13-20,12-32) fuzzy-if(webrender&&cocoaWidget,12-16,20-44) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-2.html position-sticky-transformed-in-scrollframe-2-ref.html # Bug 1604338 --fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,13-13,4-4) fuzzy-if(webrender&>kWidget,16-27,14-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-1.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338 --fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,13-13,4-4) fuzzy-if(webrender&>kWidget,16-27,14-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338 -+fuzzy-if(Android,0-8,0-27) fuzzy-if(webrender&>kWidget,0-17,0-50) fuzzy-if(webrender&&cocoaWidget,10-11,44-44) skip-if(!asyncPan) == curtain-effect-1.html curtain-effect-1-ref.html -+fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&>kWidget,10-16,28-41) fuzzy-if(webrender&&cocoaWidget,8-8,38-42) skip-if(!asyncPan) == transformed-1.html transformed-1-ref.html # Bug 1604338 -+fuzzy-if(Android&&!webrender,2-2,4-4) fuzzy-if(Android&&webrender,7-7,4-4) fuzzy-if(webrender&>kWidget&&!swgl,0-22,0-50) fuzzy-if(webrender&&cocoaWidget,6-6,37-38) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-1.html position-sticky-transformed-in-scrollframe-1-ref.html # Bug 1604338 -+fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,10-10,4-4) fuzzy-if(webrender&>kWidget,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&>kWidget,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&>kWidget,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-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 +-fuzzy-if(Android,0-7,0-4) fuzzy-if(webrender&>kWidget,10-15,12-32) fuzzy-if(webrender&&cocoaWidget,5-9,20-42) skip-if(!asyncPan) == transformed-1.html transformed-1-ref.html # Bug 1604338 +-fuzzy-if(Android&&!webrender,2-6,4-4) fuzzy-if(Android&&webrender,6-7,4-4) fuzzy-if(webrender&>kWidget,3-5,12-28) fuzzy-if(webrender&&cocoaWidget,5-6,18-38) skip-if(!asyncPan) fuzzy-if(swgl&&cocoaWidget&&isDebugBuild,0-6,0-38) == position-sticky-transformed-in-scrollframe-1.html position-sticky-transformed-in-scrollframe-1-ref.html # Bug 1604338 +-fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,10-10,4-449) fuzzy-if(webrender&>kWidget,13-20,12-32) fuzzy-if(webrender&&cocoaWidget,12-16,20-44) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-2.html position-sticky-transformed-in-scrollframe-2-ref.html # Bug 1604338 +-fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,12-13,4-24) fuzzy-if(webrender&>kWidget,16-27,14-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-1.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338 +-fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,12-13,4-24) fuzzy-if(webrender&>kWidget,16-27,14-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html # Bug 1604338 +diff -U0 firefox-92.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/bidi/reftest.list +--- firefox-92.0/layout/reftests/bidi/reftest.list.firefox-tests-reftest 2021-09-01 19:15:00.000000000 +0200 ++++ firefox-92.0/layout/reftests/bidi/reftest.list 2021-09-03 18:50:44.863939657 +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 +127,15 @@ diff -U0 firefox-89.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-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 +diff -U0 firefox-92.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/border-radius/reftest.list +--- firefox-92.0/layout/reftests/border-radius/reftest.list.firefox-tests-reftest 2021-09-01 19:15:01.000000000 +0200 ++++ firefox-92.0/layout/reftests/border-radius/reftest.list 2021-09-03 18:50:44.863939657 +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-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 +diff -U0 firefox-92.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/bugs/reftest.list +--- firefox-92.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest 2021-09-01 19:15:00.000000000 +0200 ++++ firefox-92.0/layout/reftests/bugs/reftest.list 2021-09-03 18:50:44.864939685 +0200 @@ -464 +463,0 @@ -== 341043-1a.html 341043-1-ref.html @@ -553 +552 @@ @@ -167,55 +153,48 @@ diff -U0 firefox-89.0/layout/reftests/bugs/reftest.list.firefox-tests-reftest fi @@ -1000 +999 @@ -== 422394-1.html 422394-1-ref.html +fuzzy-if(gtkWidget,0-255,0-640) == 422394-1.html 422394-1-ref.html -@@ -1175 +1174 @@ +@@ -1172 +1171 @@ -fails-if(Android||cocoaWidget||winWidget) == chrome://reftest/content/bugs/456147.xhtml 456147-ref.html # bug 458047 +fuzzy-if(gtkWidget,0-255,0-5167) fails-if(Android||cocoaWidget||winWidget) == chrome://reftest/content/bugs/456147.xhtml 456147-ref.html # bug 458047 -@@ -1385 +1384 @@ --fuzzy-if(winWidget&&nativeThemePref&&webrender,82-82,84-84) fuzzy-if(cocoaWidget&&nativeThemePref&&webrender,46-46,58-58) == 513153-2a.html 513153-2-ref.html -+fuzzy(0-61,0-172) fuzzy-if(webrender&&winWidget,82-82,84-84) == 513153-2a.html 513153-2-ref.html -@@ -1823 +1822 @@ +@@ -1820 +1819 @@ -== 1062108-1.html 1062108-1-ref.html +fuzzy-if(gtkWidget,0-255,0-53) == 1062108-1.html 1062108-1-ref.html -@@ -2025 +2023,0 @@ +@@ -2022 +2020,0 @@ -!= 1404057.html 1404057-noref.html -@@ -2065,2 +2063 @@ --fuzzy-if(!webrender,1-5,66-547) fuzzy-if(geckoview&&!webrender,1-2,64-141) fuzzy-if(winWidget&&swgl,1-1,16-16) fuzzy-if(cocoaWidget&&swgl,1-1,32-32) == 1529992-1.html 1529992-1-ref.html --fuzzy-if(!webrender,0-6,0-34) fuzzy-if(Android,9-14,44-60) fails-if(webrender) == 1529992-2.html 1529992-2-ref.html -+fuzzy(0-13,0-154) fuzzy-if(Android,9-14,44-60) fails-if(webrender) == 1529992-2.html 1529992-2-ref.html -@@ -2069 +2066 @@ +@@ -2062,2 +2059,0 @@ +-fuzzy-if(!webrender,1-5,66-547) fuzzy-if(geckoview&&!webrender,1-2,64-141) fuzzy-if(winWidget&&swgl,1-1,12-16) fuzzy-if(cocoaWidget&&swgl,1-1,32-32) fuzzy-if(useDrawSnapshot&&webrender,3-3,459-459) == 1529992-1.html 1529992-1-ref.html +-fuzzy-if(!webrender,0-6,0-34) fuzzy-if(Android,9-14,44-60) fails-if(!useDrawSnapshot&&webrender) == 1529992-2.html 1529992-2-ref.html +@@ -2066 +2062 @@ -skip-if(!asyncPan) == 1544895.html 1544895-ref.html +fuzzy-if(gtkWidget,0-252,0-24) skip-if(!asyncPan) == 1544895.html 1544895-ref.html -@@ -2082 +2079 @@ +@@ -2079 +2075 @@ -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-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 +diff -U0 firefox-92.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/canvas/reftest.list +--- firefox-92.0/layout/reftests/canvas/reftest.list.firefox-tests-reftest 2021-09-01 19:15:00.000000000 +0200 ++++ firefox-92.0/layout/reftests/canvas/reftest.list 2021-09-03 18:50:44.864939685 +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-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 @@ +diff -U0 firefox-92.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/css-break/reftest.list +--- firefox-92.0/layout/reftests/css-break/reftest.list.firefox-tests-reftest 2021-09-03 18:50:44.864939685 +0200 ++++ firefox-92.0/layout/reftests/css-break/reftest.list 2021-09-03 18:51:55.862894766 +0200 +@@ -1,3 +0,0 @@ -== 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 --skip-if(verify) fuzzy(0-45,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 -+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-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 +-fuzzy(0-45,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-92.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/css-placeholder/reftest.list +--- firefox-92.0/layout/reftests/css-placeholder/reftest.list.firefox-tests-reftest 2021-09-01 19:15:00.000000000 +0200 ++++ firefox-92.0/layout/reftests/css-placeholder/reftest.list 2021-09-03 18:50:44.864939685 +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-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 +diff -U0 firefox-92.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/css-ruby/reftest.list +--- firefox-92.0/layout/reftests/css-ruby/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/css-ruby/reftest.list 2021-09-03 18:50:44.865939713 +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 +210,15 @@ diff -U0 firefox-89.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-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 +diff -U0 firefox-92.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/first-letter/reftest.list +--- firefox-92.0/layout/reftests/first-letter/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/first-letter/reftest.list 2021-09-03 18:50:44.865939713 +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-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 +diff -U0 firefox-92.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/font-face/reftest.list +--- firefox-92.0/layout/reftests/font-face/reftest.list.firefox-tests-reftest 2021-09-01 19:15:01.000000000 +0200 ++++ firefox-92.0/layout/reftests/font-face/reftest.list 2021-09-03 18:50:44.865939713 +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 +254,9 @@ diff -U0 firefox-89.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-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 +diff -U0 firefox-92.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/font-matching/reftest.list +--- firefox-92.0/layout/reftests/font-matching/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/font-matching/reftest.list 2021-09-03 18:50:44.865939713 +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 +268,56 @@ diff -U0 firefox-89.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-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-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 +diff -U0 firefox-92.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/forms/fieldset/reftest.list +--- firefox-92.0/layout/reftests/forms/fieldset/reftest.list.firefox-tests-reftest 2021-09-01 19:15:01.000000000 +0200 ++++ firefox-92.0/layout/reftests/forms/fieldset/reftest.list 2021-09-03 18:50:44.865939713 +0200 +@@ -8 +7,0 @@ +-fuzzy-if(!layersGPUAccelerated,0-142,0-276) == positioned-container-1.html positioned-container-1-ref.html +diff -U0 firefox-92.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/forms/input/checkbox/reftest.list +--- firefox-92.0/layout/reftests/forms/input/checkbox/reftest.list.firefox-tests-reftest 2021-09-01 19:15:01.000000000 +0200 ++++ firefox-92.0/layout/reftests/forms/input/checkbox/reftest.list 2021-09-03 18:50:44.865939713 +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-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 +diff -U0 firefox-92.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/forms/input/radio/reftest.list +--- firefox-92.0/layout/reftests/forms/input/radio/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/forms/input/radio/reftest.list 2021-09-03 18:50:44.865939713 +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-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 +diff -U0 firefox-92.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/forms/placeholder/reftest.list +--- firefox-92.0/layout/reftests/forms/placeholder/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/forms/placeholder/reftest.list 2021-09-03 18:50:44.866939741 +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-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-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 +diff -U0 firefox-92.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/forms/textbox/reftest.list +--- firefox-92.0/layout/reftests/forms/textbox/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/forms/textbox/reftest.list 2021-09-03 18:50:44.866939741 +0200 +@@ -4 +3,0 @@ +-fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(!useDrawSnapshot&&webrender) == chrome://reftest/content/forms/textbox/accesskey-2.xhtml chrome://reftest/content/forms/textbox/accesskey-2-ref.xhtml +@@ -8 +6,0 @@ +-fuzzy-if(winWidget,0-1,0-3) skip-if(cocoaWidget||Android) fails-if(!useDrawSnapshot&&webrender&&!Android) == chrome://reftest/content/forms/textbox/accesskey-4.xhtml chrome://reftest/content/forms/textbox/accesskey-4-ref.xhtml +diff -U0 firefox-92.0/layout/reftests/generated-content/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/generated-content/reftest.list +--- firefox-92.0/layout/reftests/generated-content/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/generated-content/reftest.list 2021-09-03 18:50:44.866939741 +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-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 +diff -U0 firefox-92.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/high-contrast/reftest.list +--- firefox-92.0/layout/reftests/high-contrast/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/high-contrast/reftest.list 2021-09-03 18:50:44.866939741 +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-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 +diff -U0 firefox-92.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/indic-shaping/reftest.list +--- firefox-92.0/layout/reftests/indic-shaping/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/indic-shaping/reftest.list 2021-09-03 18:50:44.866939741 +0200 @@ -12 +11,0 @@ -fuzzy-if(gtkWidget,255-255,46-46) == gujarati-3b.html gujarati-3-ref.html # gtkWidget, Bug 1600777 -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 +diff -U0 firefox-92.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/mathml/reftest.list +--- firefox-92.0/layout/reftests/mathml/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/mathml/reftest.list 2021-09-03 18:50:44.866939741 +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 +328,9 @@ diff -U0 firefox-89.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-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 +diff -U0 firefox-92.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/position-dynamic-changes/relative/reftest.list +--- firefox-92.0/layout/reftests/position-dynamic-changes/relative/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/position-dynamic-changes/relative/reftest.list 2021-09-03 18:50:44.866939741 +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 +340,16 @@ diff -U0 firefox-89.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-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&>kWidget,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&>kWidget,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&>kWidget,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&>kWidget,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&>kWidget,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-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 +diff -U0 firefox-92.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/position-sticky/reftest.list +--- firefox-92.0/layout/reftests/position-sticky/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/position-sticky/reftest.list 2021-09-03 18:50:44.866939741 +0200 +@@ -53,3 +52,0 @@ +-fuzzy-if(Android,0-5,0-4) fuzzy-if(webrender&>kWidget,10-17,12-32) fuzzy-if(webrender&&cocoaWidget,7-8,18-42) skip-if(!asyncPan) fails-if(useDrawSnapshot) == transformed-2.html transformed-2-ref.html # Bug 1604644 +-skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&>kWidget,19-30,12-32) fuzzy-if(webrender&&cocoaWidget,13-16,20-44) fails-if(useDrawSnapshot) == nested-sticky-1.html nested-sticky-1-ref.html # Bug 1604644 +-skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&>kWidget,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) fails-if(useDrawSnapshot) == nested-sticky-2.html nested-sticky-2-ref.html # Bug 1604644 +diff -U0 firefox-92.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/reftest-sanity/reftest.list +--- firefox-92.0/layout/reftests/reftest-sanity/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/reftest-sanity/reftest.list 2021-09-03 18:50:44.867939768 +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 +363,9 @@ diff -U0 firefox-89.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-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 +diff -U0 firefox-92.0/layout/reftests/svg/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/svg/reftest.list +--- firefox-92.0/layout/reftests/svg/reftest.list.firefox-tests-reftest 2021-09-01 19:15:00.000000000 +0200 ++++ firefox-92.0/layout/reftests/svg/reftest.list 2021-09-03 18:50:44.867939768 +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 +377,30 @@ diff -U0 firefox-89.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-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 +diff -U0 firefox-92.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/svg/smil/style/reftest.list +--- firefox-92.0/layout/reftests/svg/smil/style/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/svg/smil/style/reftest.list 2021-09-03 18:50:44.867939768 +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-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 +diff -U0 firefox-92.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/svg/svg-integration/reftest.list +--- firefox-92.0/layout/reftests/svg/svg-integration/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/svg/svg-integration/reftest.list 2021-09-03 18:50:44.867939768 +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-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-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 +diff -U0 firefox-92.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/svg/text/reftest.list +--- firefox-92.0/layout/reftests/svg/text/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/svg/text/reftest.list 2021-09-03 18:50:44.867939768 +0200 +@@ -203,2 +202,0 @@ +-fuzzy-if(skiaContent,0-1,0-100) needs-focus fuzzy-if(webrender&&winWidget,55-148,200-318) == simple-bidi-selection.svg simple-bidi-selection-ref.html +-fuzzy-if(skiaContent,0-1,0-50) needs-focus fuzzy-if(webrender&&winWidget,55-148,200-254) fuzzy-if(webrender&&OSX,1-65,19-196) == simple-fill-color-selection.svg simple-fill-color-selection-ref.html +diff -U0 firefox-92.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/tab-size/reftest.list +--- firefox-92.0/layout/reftests/tab-size/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/tab-size/reftest.list 2021-09-03 18:50:44.867939768 +0200 @@ -2,6 +2,6 @@ -== tab-size-8.html spaces-8.html -== tab-size-4.html spaces-4.html @@ -442,26 +414,26 @@ diff -U0 firefox-89.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-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 +diff -U0 firefox-92.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/text-decoration/reftest.list +--- firefox-92.0/layout/reftests/text-decoration/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/text-decoration/reftest.list 2021-09-03 18:50:44.867939768 +0200 @@ -1,2 +1,2 @@ -fuzzy-if(webrender&>kWidget,0-208,0-12) == complex-decoration-style-quirks.html complex-decoration-style-quirks-ref.html -fuzzy-if(webrender&>kWidget,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-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 +diff -U0 firefox-92.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/text-overflow/reftest.list +--- firefox-92.0/layout/reftests/text-overflow/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/text-overflow/reftest.list 2021-09-03 18:50:44.868939795 +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-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 +diff -U0 firefox-92.0/layout/reftests/text/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/text/reftest.list +--- firefox-92.0/layout/reftests/text/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/text/reftest.list 2021-09-03 18:50:44.868939795 +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 @@ -470,40 +442,37 @@ diff -U0 firefox-89.0/layout/reftests/text/reftest.list.firefox-tests-reftest fi -fails-if(Android) == 1463020-letter-spacing-text-transform-2.html 1463020-letter-spacing-text-transform-2-ref.html # missing font coverage on Android +fuzzy-if(gtkWidget,0-255,0-800) fails-if(/^^Windows\x20NT\x2010\.0/.test(http.oscpu)) fuzzy-if(Android,0-128,0-233) == 1463020-letter-spacing-text-transform-1.html 1463020-letter-spacing-text-transform-1-ref.html +fuzzy-if(gtkWidget,0-255,0-1600) fails-if(Android) == 1463020-letter-spacing-text-transform-2.html 1463020-letter-spacing-text-transform-2-ref.html # missing font coverage on Android -@@ -198 +198 @@ --fuzzy-if(!webrender,0-42,0-1590) fuzzy-if(gtkWidget&&!webrender,0-255,0-50) == 1655364-1.html 1655364-1-ref.html -+fuzzy-if(!webrender,0-42,0-1553) fuzzy-if(gtkWidget,0-255,0-1625) == 1655364-1.html 1655364-1-ref.html -@@ -366 +366 @@ +@@ -198 +197,0 @@ +-fuzzy-if(useDrawSnapshot&&webrender,255-255,50-50) fuzzy-if(!webrender,0-42,0-1590) fuzzy-if(gtkWidget&&!webrender,0-255,0-50) == 1655364-1.html 1655364-1-ref.html +@@ -366 +365 @@ -== 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-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 +diff -U0 firefox-92.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/text-transform/reftest.list +--- firefox-92.0/layout/reftests/text-transform/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/text-transform/reftest.list 2021-09-03 18:50:44.868939795 +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-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 -@@ -27,2 +27,2 @@ +diff -U0 firefox-92.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/transform-3d/reftest.list +--- firefox-92.0/layout/reftests/transform-3d/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/transform-3d/reftest.list 2021-09-03 18:50:44.868939795 +0200 +@@ -14 +13,0 @@ +-fuzzy-if(gtkWidget||winWidget,0-8,0-376) fuzzy-if(Android,0-8,0-441) fuzzy-if(skiaContent,0-16,0-346) fuzzy-if(webrender&&cocoaWidget,0-200,0-310) fuzzy-if(webrender&&winWidget,0-175,0-250) == preserve3d-1a.html preserve3d-1-ref.html +@@ -27,2 +26,2 @@ -fuzzy-if(winWidget,0-143,0-689) fuzzy-if(OSX,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == scale3d-all.html scale3d-1-ref.html # subpixel AA -fuzzy-if(winWidget,0-143,0-689) fuzzy-if(OSX,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == scale3d-all-separate.html scale3d-1-ref.html # subpixel AA +fuzzy-if(gtkWidget,0-100,0-628) fuzzy-if(winWidget,0-143,0-689) fuzzy-if(OSX,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == scale3d-all.html scale3d-1-ref.html # subpixel AA +fuzzy-if(gtkWidget,0-100,0-628) fuzzy-if(winWidget,0-143,0-689) fuzzy-if(OSX,0-224,0-924) fuzzy-if(winWidget,0-154,0-644) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == scale3d-all-separate.html scale3d-1-ref.html # subpixel AA -@@ -75,2 +75,2 @@ +@@ -75,2 +74,2 @@ -fuzzy-if(skiaContent,0-1,0-4) fuzzy-if(cocoaWidget,0-128,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-parent.html animate-preserve3d-ref.html # intermittently fuzzy on Mac -fuzzy-if(skiaContent,0-1,0-4) fuzzy-if(cocoaWidget,0-128,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-child.html animate-preserve3d-ref.html # intermittently fuzzy on Mac, bug 1461311 for Android +fuzzy(0-1,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-parent.html animate-preserve3d-ref.html # intermittently fuzzy on Mac +fuzzy(0-1,0-6) fuzzy-if(cocoaWidget,0-128,0-9) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == animate-preserve3d-child.html animate-preserve3d-ref.html # intermittently fuzzy on Mac, bug 1461311 for Android -@@ -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-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 +@@ -102 +100,0 @@ +-fuzzy-if(webrender,0-6,0-3117) fuzzy-if(useDrawSnapshot,4-4,13-13) == 1637067-1.html 1637067-1-ref.html +diff -U0 firefox-92.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/writing-mode/reftest.list +--- firefox-92.0/layout/reftests/writing-mode/reftest.list.firefox-tests-reftest 2021-09-01 19:15:01.000000000 +0200 ++++ firefox-92.0/layout/reftests/writing-mode/reftest.list 2021-09-03 18:50:44.868939795 +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 +488,9 @@ diff -U0 firefox-89.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-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 +diff -U0 firefox-92.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/writing-mode/tables/reftest.list +--- firefox-92.0/layout/reftests/writing-mode/tables/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/writing-mode/tables/reftest.list 2021-09-03 18:50:44.868939795 +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 +500,15 @@ diff -U0 firefox-89.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-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 +diff -U0 firefox-92.0/layout/reftests/xul/reftest.list.firefox-tests-reftest firefox-92.0/layout/reftests/xul/reftest.list +--- firefox-92.0/layout/reftests/xul/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/reftests/xul/reftest.list 2021-09-03 18:50:44.869939823 +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-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 +diff -U0 firefox-92.0/layout/xul/reftest/reftest.list.firefox-tests-reftest firefox-92.0/layout/xul/reftest/reftest.list +--- firefox-92.0/layout/xul/reftest/reftest.list.firefox-tests-reftest 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/xul/reftest/reftest.list 2021-09-03 18:50:44.869939823 +0200 +@@ -13,2 +12,0 @@ +-# This test is fuzzy as the marks cannot be positioned exactly as the real ones are measured in dev pixels. +-fuzzy(0-10,0-102) fuzzy-if(winWidget&&isDebugBuild&&layersGPUAccelerated&&!is64Bit,1-1,102-102) == chrome://reftest/content/xul/reftest/scrollbar-marks-overlay.html chrome://reftest/content/xul/reftest/scrollbar-marks-overlay-ref.html diff --git a/firefox-tests-xpcshell.patch b/firefox-tests-xpcshell.patch index b3e3fd4..a342668 100644 --- a/firefox-tests-xpcshell.patch +++ b/firefox-tests-xpcshell.patch @@ -1,86 +1,75 @@ -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 +diff -U0 firefox-92.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini +--- firefox-92.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:14:33.000000000 +0200 ++++ firefox-92.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini 2021-09-03 18:39:17.386058157 +0200 @@ -9 +8,0 @@ -[test_appupdateurl.js] @@ -27 +25,0 @@ -[test_sorted_alphabetically.js] -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-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-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 +diff -U0 firefox-92.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/netwerk/test/unit_ipc/xpcshell.ini +--- firefox-92.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:15:11.000000000 +0200 ++++ firefox-92.0/netwerk/test/unit_ipc/xpcshell.ini 2021-09-03 18:41:07.754088004 +0200 @@ -73 +72,0 @@ -[test_dns_service_wrap.js] @@ -114 +112,0 @@ -[test_trr_httpssvc_wrap.js] -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 +diff -U0 firefox-92.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/netwerk/test/unit/xpcshell.ini +--- firefox-92.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:15:11.000000000 +0200 ++++ firefox-92.0/netwerk/test/unit/xpcshell.ini 2021-09-03 18:41:58.545482327 +0200 @@ -205 +204,0 @@ -[test_dns_service.js] -@@ -229 +227,0 @@ +@@ -221 +219,0 @@ -[test_file_protocol.js] -@@ -339 +336,0 @@ +@@ -328 +325,0 @@ -[test_unix_domain.js] -@@ -351 +347,0 @@ +@@ -340 +336,0 @@ -[test_udp_multicast.js] -@@ -401,2 +396,0 @@ +@@ -390,2 +385,0 @@ -[test_tls_flags.js] --skip-if = (verify && (os == 'linux')) || (os == "android" && processor == "x86_64") -@@ -416 +409,0 @@ +-skip-if = (os == "android" && processor == "x86_64") +@@ -406 +399,0 @@ -[test_network_connectivity_service.js] -@@ -511 +503,0 @@ +@@ -503 +495,0 @@ -[test_httpssvc_retry_with_ech.js] -@@ -521 +512,0 @@ +@@ -513 +504,0 @@ -[test_odoh.js] -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 @@ +diff -U0 firefox-92.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/security/manager/ssl/tests/unit/xpcshell.ini +--- firefox-92.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/security/manager/ssl/tests/unit/xpcshell.ini 2021-09-03 18:41:07.755088031 +0200 +@@ -115,4 +114,0 @@ -[test_encrypted_client_hello.js] -run-sequentially = hardcoded ports -[test_encrypted_client_hello_client_only.js] -run-sequentially = hardcoded ports -@@ -182 +177,0 @@ +@@ -180 +175,0 @@ -[test_oskeystore.js] -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 +diff -U0 firefox-92.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell firefox-92.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini +--- firefox-92.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell 2021-09-01 19:15:18.000000000 +0200 ++++ firefox-92.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini 2021-09-03 18:41:07.755088031 +0200 @@ -10 +9,0 @@ -[test_pkcs11_module.js] -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 @@ +diff -U0 firefox-92.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini +--- firefox-92.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:15:34.000000000 +0200 ++++ firefox-92.0/toolkit/components/antitracking/test/xpcshell/xpcshell.ini 2021-09-03 18:41:07.755088031 +0200 +@@ -11 +10,0 @@ -[test_staticPartition_font.js] -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 +diff -U0 firefox-92.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/toolkit/components/commandlines/test/unit/xpcshell.ini +--- firefox-92.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:16:05.000000000 +0200 ++++ firefox-92.0/toolkit/components/commandlines/test/unit/xpcshell.ini 2021-09-03 18:41:07.755088031 +0200 @@ -10 +9,0 @@ -[test_resolvefile.js] -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 +diff -U0 firefox-92.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js.firefox-tests-xpcshell firefox-92.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js +--- firefox-92.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js.firefox-tests-xpcshell 2021-09-01 19:16:00.000000000 +0200 ++++ firefox-92.0/toolkit/components/corroborator/test/xpcshell/test_verify_jar.js 2021-09-03 18:41:07.755088031 +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-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 @@ +diff -U0 firefox-92.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell firefox-92.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini +--- firefox-92.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell 2021-09-01 19:16:05.000000000 +0200 ++++ firefox-92.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini 2021-09-03 18:41:07.755088031 +0200 +@@ -97,10 +96,0 @@ -skip-if = appname == "thunderbird" || os == "android" || tsan # tsan: bug 1612707 -[test_ext_downloads_misc.js] -skip-if = @@ -91,23 +80,23 @@ diff -U0 firefox-89.0/toolkit/components/extensions/test/xpcshell/xpcshell-commo -[test_ext_downloads_partitionKey.js] -skip-if = os == "android" -[test_ext_downloads_private.js] -@@ -265,2 +254,0 @@ +@@ -288,2 +277,0 @@ -[test_proxy_listener.js] -skip-if = appname == "thunderbird" -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 @@ +diff -U0 firefox-92.0/toolkit/components/search/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/toolkit/components/search/tests/xpcshell/xpcshell.ini +--- firefox-92.0/toolkit/components/search/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:16:05.000000000 +0200 ++++ firefox-92.0/toolkit/components/search/tests/xpcshell/xpcshell.ini 2021-09-03 18:41:07.755088031 +0200 +@@ -124 +123,0 @@ -[test_reload_engines.js] -@@ -132 +130,0 @@ +@@ -131 +129,0 @@ -[test_searchSuggest.js] -@@ -143,2 +140,0 @@ +@@ -142,2 +139,0 @@ -[test_settings.js] -[test_sort_orders-no-hints.js] -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 @@ +diff -U0 firefox-92.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js.firefox-tests-xpcshell firefox-92.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js +--- firefox-92.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js.firefox-tests-xpcshell 2021-09-01 19:16:00.000000000 +0200 ++++ firefox-92.0/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js 2021-09-03 18:41:07.755088031 +0200 +@@ -594,20 +593,0 @@ - Assert.ok( - withSuspend - withoutSuspend <= max_delta_ms, - "In test condition, the two uptimes should be close to each other" @@ -128,36 +117,31 @@ diff -U0 firefox-89.0/toolkit/components/telemetry/tests/unit/test_TelemetrySess - ); - } - -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-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 +diff -U0 firefox-92.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini +--- firefox-92.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:16:01.000000000 +0200 ++++ firefox-92.0/toolkit/mozapps/downloads/tests/unit/xpcshell.ini 2021-09-03 18:41:07.755088031 +0200 @@ -4 +3,0 @@ -[test_DownloadUtils.js] -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 +diff -U0 firefox-92.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini +--- firefox-92.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:16:01.000000000 +0200 ++++ firefox-92.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini 2021-09-03 18:41:07.756088058 +0200 @@ -91 +90,0 @@ -[test_sideloads_after_rebuild.js] @@ -106 +104,0 @@ -[test_startup_scan.js] -@@ -188,2 +185,0 @@ +@@ -187,2 +184,0 @@ -tags = webextensions -[test_webextension_theme.js] -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 +diff -U0 firefox-92.0/toolkit/profile/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-92.0/toolkit/profile/xpcshell/xpcshell.ini +--- firefox-92.0/toolkit/profile/xpcshell/xpcshell.ini.firefox-tests-xpcshell 2021-09-01 19:15:35.000000000 +0200 ++++ firefox-92.0/toolkit/profile/xpcshell/xpcshell.ini 2021-09-03 18:41:07.756088058 +0200 @@ -32,3 +31,0 @@ -[test_snatch_environment.js] -[test_skip_locked_environment.js] -[test_snatch_environment_default.js] -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 +diff -U0 firefox-92.0/uriloader/exthandler/tests/unit/test_handlerService.js.firefox-tests-xpcshell firefox-92.0/uriloader/exthandler/tests/unit/test_handlerService.js +--- firefox-92.0/uriloader/exthandler/tests/unit/test_handlerService.js.firefox-tests-xpcshell 2021-09-01 19:16:05.000000000 +0200 ++++ firefox-92.0/uriloader/exthandler/tests/unit/test_handlerService.js 2021-09-03 18:41:07.756088058 +0200 @@ -145 +145 @@ - Assert.ok(!protoInfo.alwaysAskBeforeHandling); + //Assert.ok(!protoInfo.alwaysAskBeforeHandling); diff --git a/firefox.sh.in b/firefox.sh.in index 76df06b..fb7f463 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -76,9 +76,9 @@ if ! [ $MOZ_DISABLE_WAYLAND ] && [ "$WAYLAND_DISPLAY" ]; then fi ## Enable Wayland on KDE/Sway ## - if [ "$XDG_SESSION_TYPE" == "wayland" ]; then - export MOZ_ENABLE_WAYLAND=1 - fi +# if [ "$XDG_SESSION_TYPE" == "wayland" ]; then +# export MOZ_ENABLE_WAYLAND=1 +# fi fi ## diff --git a/firefox.spec b/firefox.spec index 04b55c8..a9eb3f6 100644 --- a/firefox.spec +++ b/firefox.spec @@ -6,7 +6,7 @@ # building locally and don't want to spend 24 hours waiting for results. %global run_firefox_tests 0 %ifarch x86_64 %{ix86} -%global run_firefox_tests 1 +%global run_firefox_tests 0 %endif # Don't create debuginfo rpm packages. It reduces build time as @@ -18,10 +18,15 @@ %global debug_build 0 %global system_nss 1 -%global build_with_clang 0 %global build_with_asan 0 %global test_on_wayland 1 +%if "%{toolchain}" == "clang" +%global build_with_clang 1 +%else +%global build_with_clang 0 +%endif + # There are still build problems on s390x, see # https://koji.fedoraproject.org/koji/taskinfo?taskID=55048351 # https://bugzilla.redhat.com/show_bug.cgi?id=1897522 @@ -29,7 +34,7 @@ ExcludeArch: s390x # Disabled due to # https://bugzilla.redhat.com/show_bug.cgi?id=1966949 -%if 0%{?fedora} > 34 +%if 0%{?fedora} > 33 ExcludeArch: armv7hl %endif @@ -113,9 +118,9 @@ ExcludeArch: armv7hl %endif %if %{?system_nss} -%global nspr_version 4.21 +%global nspr_version 4.26 %global nspr_build_version %{nspr_version} -%global nss_version 3.64 +%global nss_version 3.69 %global nss_build_version %{nss_version} %endif @@ -151,13 +156,13 @@ ExcludeArch: armv7hl Summary: Mozilla Firefox Web browser Name: firefox -Version: 89.0 +Version: 92.0.1 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}-20210601.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20210927.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source10: firefox-mozconfig @@ -199,14 +204,14 @@ Patch41: build-disable-elfhack.patch Patch44: build-arm-libopus.patch Patch46: firefox-nss-version.patch Patch47: fedora-shebang-build.patch -Patch48: build-arm-wasm.patch +#Patch48: build-arm-wasm.patch Patch49: build-arm-libaom.patch Patch53: firefox-gcc-build.patch # This should be fixed in Firefox 83 Patch54: mozilla-1669639.patch Patch55: firefox-testing.patch Patch57: firefox-disable-ffvpx-with-vapi.patch -Patch58: firefox-crashreporter-build.patch +Patch61: firefox-glibc-dynstack.patch # Test patches # Generate without context by @@ -232,7 +237,9 @@ Patch407: mozilla-1667096.patch Patch408: mozilla-1663844.patch Patch415: mozilla-1670333.patch Patch420: mochitest-wayland-workaround.patch -Patch422: mozilla-1705048.patch +Patch422: mozilla-1728749.patch +Patch423: mozilla-1708709.patch +Patch424: mozilla-1725828.patch # PGO/LTO patches Patch600: pgo.patch @@ -329,6 +336,9 @@ BuildRequires: mutter BuildRequires: gsettings-desktop-schemas BuildRequires: gnome-settings-daemon BuildRequires: mesa-dri-drivers +BuildRequires: xorg-x11-server-Xwayland +BuildRequires: dbus-x11 +BuildRequires: gnome-keyring %endif %if 0%{?run_firefox_tests} BuildRequires: procps-ng @@ -337,9 +347,9 @@ BuildRequires: python2.7 BuildRequires: dejavu-sans-mono-fonts BuildRequires: dejavu-sans-fonts BuildRequires: dejavu-serif-fonts -BuildRequires: mesa-dri-drivers BuildRequires: dbus-x11 BuildRequires: gnome-keyring +BuildRequires: mesa-dri-drivers # ---------------------------------------- BuildRequires: liberation-fonts-common BuildRequires: liberation-mono-fonts @@ -379,6 +389,7 @@ BuildRequires: xorg-x11-fonts-ISO8859-1-100dpi BuildRequires: xorg-x11-fonts-misc %endif BuildRequires: make +BuildRequires: pciutils-libs Obsoletes: mozilla <= 37:1.7.13 Provides: webclient @@ -439,13 +450,13 @@ This package contains results of tests executed during build. %patch44 -p1 -b .build-arm-libopus #%patch46 -p1 -b .nss-version %patch47 -p1 -b .fedora-shebang -%patch48 -p1 -b .build-arm-wasm +#%patch48 -p1 -b .build-arm-wasm %patch49 -p1 -b .build-arm-libaom %patch53 -p1 -b .firefox-gcc-build %patch54 -p1 -b .1669639 %patch55 -p1 -b .testing %patch57 -p1 -b .ffvpx-with-vapi -%patch58 -p1 -b .firefox-crashreporter-build +#%patch61 -p1 -b .glibc-dynstack # Test patches %patch100 -p1 -b .firefox-tests-xpcshell @@ -469,7 +480,9 @@ This package contains results of tests executed during build. %patch408 -p1 -b .1663844 %patch415 -p1 -b .1670333 %patch420 -p1 -b .mochitest-wayland-workaround -%patch422 -p1 -b .1705048 +%patch422 -p1 -b .1728749 +%patch423 -p1 -b .1708709 +%patch424 -p1 -b .1725828 # PGO patches %if %{build_with_pgo} @@ -727,15 +740,14 @@ cp %{SOURCE45} . %if %{build_with_pgo} %if %{test_on_wayland} env | grep "WAYLAND" -MOZ_ENABLE_WAYLAND=1 ./mach build 2>&1 | cat - +MOZ_ENABLE_WAYLAND=1 ./mach build -v 2>&1 | cat - %else -xvfb-run ./mach build 2>&1 | cat - +xvfb-run ./mach build -v 2>&1 | cat - %endif %else -./mach build 2>&1 | cat - +./mach build -v 2>&1 | cat - %endif - #--------------------------------------------------------------------- %install # run Firefox test suite @@ -917,6 +929,17 @@ rm -rf %{buildroot}%{mozappdir}/gtk2/ rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libmozjs.so rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libmozalloc.so rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libxul.so + +# Create a symlink to replace libnssckbi.so with p11-kit-client.so +# instead of p11-kit-trust.so, so that Firefox can see the system +# trust store on the host through the p11-kit RPC protocol. A symlink +# to libnss3.so is also needed, because Firefox tries to load +# libnssckbi.so from the same directory where libnss3.so is loaded (as +# of Firefox 89). +%if 0%{?flatpak} +ln -sf /usr/lib64/libnss3.so %{buildroot}%{_libdir}/libnss3.so +ln -sf /usr/lib64/pkcs11/p11-kit-client.so %{buildroot}%{_libdir}/libnssckbi.so +%endif #--------------------------------------------------------------------- # Moves defaults/preferences to browser/defaults/preferences @@ -992,6 +1015,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/application.ini %{mozappdir}/pingsender %exclude %{mozappdir}/removed-files +%if 0%{?flatpak} +%{_libdir}/libnss3.so +%{_libdir}/libnssckbi.so +%endif %{_datadir}/icons/hicolor/16x16/apps/firefox.png %{_datadir}/icons/hicolor/22x22/apps/firefox.png %{_datadir}/icons/hicolor/24x24/apps/firefox.png @@ -1025,6 +1052,72 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Sep 27 2021 Martin Stransky <stransky@redhat.com> - 92.0.1-1 +- Updated to 92.0.1 + +* Mon Sep 13 2021 Martin Stransky <stransky@redhat.com> - 92.0-3 +- Added fix for mozbz#1725828 + +* Thu Sep 9 2021 Martin Stransky <stransky@redhat.com> - 92.0-2 +- Disable test + +* Fri Sep 3 2021 Martin Stransky <stransky@redhat.com> - 92.0-1 +- Updated to 92.0 +- Added fix for mozbz#1728749 +- Added fix for mozbz#1708709 + +* Thu Aug 26 2021 Martin Stransky <stransky@redhat.com> - 91.0.2-1 +- Updated to 91.0.2 + +* Mon Aug 23 2021 Martin Stransky <stransky@redhat.com> - 91.0.1-2 +- Set %%build_with_clang automatically based on %%toolchain + by Timm Bäder <tbaeder@redhat.com> +- Updated Fedora UA patch by Eric Engestrom + (https://src.fedoraproject.org/rpms/firefox/pull-request/21) +- Added fix for mozbz#1726515 + +* Mon Aug 23 2021 Martin Stransky <stransky@redhat.com> - 91.0.1-1 +- Updated to 91.0.1 + +* Tue Aug 10 2021 Martin Stransky <stransky@redhat.com> - 91.0-1 +- Updated to 91.0 + +* Wed Aug 04 2021 Martin Stransky <stransky@redhat.com> - 90.0.2-2 +- Added fix for rhbz#1988841 - Allow unsigned extensions when installed + under non-user-writable dirs. + +* Thu Jul 22 2021 Martin Stransky <stransky@redhat.com> - 90.0.2-1 +- Updated to 90.0.2 + +* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 90.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 21 2021 Martin Stransky <stransky@redhat.com> - 90.0.1-1 +- Updated to 90.0.1 +- Added fixes to build on rawhide + +* Thu Jul 15 2021 Martin Stransky <stransky@redhat.com> - 90.0-3 +- Disabled Wayland backend on KDE due to + https://bugzilla.mozilla.org/show_bug.cgi?id=1714132 + +* Tue Jul 13 2021 Martin Stransky <stransky@redhat.com> - 90.0-2 +- Added xorg-x11-server-Xwayland dependency for Mutter + +* Mon Jul 12 2021 Martin Stransky <stransky@redhat.com> - 90.0-1 +- Updated to 90.0 + +* Mon Jul 12 2021 Daiki Ueno <dueno@redhat.com> - 89.0.2-3 +- flatpak: Enable loading system trust store on the host (rhbz#1766340) + +* Wed Jun 30 2021 Martin Stransky <stransky@redhat.com> - 89.0.2-2 +- Added fix for mozbz#1715254 (rhbz#1976892). + +* Thu Jun 24 2021 Martin Stransky <stransky@redhat.com> - 89.0.2-1 +- Updated to latest upstream (89.0.2) + +* Mon Jun 14 2021 Martin Stransky <stransky@redhat.com> - 89.0-2 +- Added fix for mozbz#1646135 + * Tue Jun 1 2021 Martin Stransky <stransky@redhat.com> - 89.0-1 - Updated to latest upstream (89.0) diff --git a/librewolf-branding.tgz b/librewolf-branding.tgz Binary files differindex 7659ae4..d4fd905 100644 --- a/librewolf-branding.tgz +++ b/librewolf-branding.tgz diff --git a/librewolf.spec b/librewolf.spec index bb50e33..2d31a48 100644 --- a/librewolf.spec +++ b/librewolf.spec @@ -18,10 +18,15 @@ %global debug_build 0 %global system_nss 1 -%global build_with_clang 0 %global build_with_asan 0 %global test_on_wayland 1 +%if "%{toolchain}" == "clang" +%global build_with_clang 1 +%else +%global build_with_clang 0 +%endif + # There are still build problems on s390x, see # https://koji.fedoraproject.org/koji/taskinfo?taskID=55048351 # https://bugzilla.redhat.com/show_bug.cgi?id=1897522 @@ -29,7 +34,7 @@ ExcludeArch: s390x # Disabled due to # https://bugzilla.redhat.com/show_bug.cgi?id=1966949 -%if 0%{?fedora} > 34 +%if 0%{?fedora} > 33 ExcludeArch: armv7hl %endif @@ -113,9 +118,9 @@ ExcludeArch: armv7hl %endif %if %{?system_nss} -%global nspr_version 4.21 +%global nspr_version 4.26 %global nspr_build_version %{nspr_version} -%global nss_version 3.64 +%global nss_version 3.69 %global nss_build_version %{nss_version} %endif @@ -152,13 +157,13 @@ ExcludeArch: armv7hl Summary: Mozilla Firefox Web browser Name: librewolf %global enable_mozilla_crashreporter 0 -Version: 89.0 +Version: 92.0.1 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}-20210601.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20210927.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source10: firefox-mozconfig @@ -202,14 +207,14 @@ Patch41: build-disable-elfhack.patch Patch44: build-arm-libopus.patch Patch46: firefox-nss-version.patch Patch47: fedora-shebang-build.patch -Patch48: build-arm-wasm.patch +#Patch48: build-arm-wasm.patch Patch49: build-arm-libaom.patch Patch53: firefox-gcc-build.patch # This should be fixed in Firefox 83 Patch54: mozilla-1669639.patch Patch55: firefox-testing.patch Patch57: firefox-disable-ffvpx-with-vapi.patch -Patch58: firefox-crashreporter-build.patch +Patch61: firefox-glibc-dynstack.patch # Test patches # Generate without context by @@ -235,7 +240,9 @@ Patch407: mozilla-1667096.patch Patch408: mozilla-1663844.patch Patch415: mozilla-1670333.patch Patch420: mochitest-wayland-workaround.patch -Patch422: mozilla-1705048.patch +Patch422: mozilla-1728749.patch +Patch423: mozilla-1708709.patch +Patch424: mozilla-1725828.patch # PGO/LTO patches Patch600: pgo.patch @@ -334,6 +341,9 @@ BuildRequires: mutter BuildRequires: gsettings-desktop-schemas BuildRequires: gnome-settings-daemon BuildRequires: mesa-dri-drivers +BuildRequires: xorg-x11-server-Xwayland +BuildRequires: dbus-x11 +BuildRequires: gnome-keyring %endif %if 0%{?run_firefox_tests} BuildRequires: procps-ng @@ -342,9 +352,9 @@ BuildRequires: python2.7 BuildRequires: dejavu-sans-mono-fonts BuildRequires: dejavu-sans-fonts BuildRequires: dejavu-serif-fonts -BuildRequires: mesa-dri-drivers BuildRequires: dbus-x11 BuildRequires: gnome-keyring +BuildRequires: mesa-dri-drivers # ---------------------------------------- BuildRequires: liberation-fonts-common BuildRequires: liberation-mono-fonts @@ -384,6 +394,7 @@ BuildRequires: xorg-x11-fonts-ISO8859-1-100dpi BuildRequires: xorg-x11-fonts-misc %endif BuildRequires: make +BuildRequires: pciutils-libs Obsoletes: mozilla <= 37:1.7.13 Provides: webclient @@ -455,13 +466,13 @@ This package contains results of tests executed during build. %patch44 -p1 -b .build-arm-libopus #%patch46 -p1 -b .nss-version %patch47 -p1 -b .fedora-shebang -%patch48 -p1 -b .build-arm-wasm +#%patch48 -p1 -b .build-arm-wasm %patch49 -p1 -b .build-arm-libaom %patch53 -p1 -b .firefox-gcc-build %patch54 -p1 -b .1669639 %patch55 -p1 -b .testing %patch57 -p1 -b .ffvpx-with-vapi -%patch58 -p1 -b .firefox-crashreporter-build +#%patch61 -p1 -b .glibc-dynstack # Test patches %patch100 -p1 -b .firefox-tests-xpcshell @@ -485,7 +496,9 @@ This package contains results of tests executed during build. %patch408 -p1 -b .1663844 %patch415 -p1 -b .1670333 %patch420 -p1 -b .mochitest-wayland-workaround -%patch422 -p1 -b .1705048 +%patch422 -p1 -b .1728749 +%patch423 -p1 -b .1708709 +%patch424 -p1 -b .1725828 # PGO patches %if %{build_with_pgo} @@ -498,7 +511,7 @@ This package contains results of tests executed during build. %patch900 -p1 %patch901 -p1 %patch902 -p1 -%patch903 -p1 +#%%patch903 -p1 %patch904 -p1 %patch905 -p1 %patch906 -p1 @@ -739,7 +752,6 @@ echo "ac_add_options --with-distribution-id=io.gitlab.librewolf-community" >> .m echo "ac_add_options --with-unsigned-addon-scopes=app,system" >> .mozconfig echo "ac_add_options --enable-alsa" >> .mozconfig echo "ac_add_options --enable-jack" >> .mozconfig -echo "export MOZ_REQUIRE_SIGNING=0" >> .mozconfig echo "ac_add_options --disable-updater" >> .mozconfig echo "mk_add_options MOZ_CRASHREPORTER=0" >> .mozconfig echo "mk_add_options MOZ_DATA_REPORTING=0" >> .mozconfig @@ -778,15 +790,14 @@ cp %{SOURCE45} . %if %{build_with_pgo} %if %{test_on_wayland} env | grep "WAYLAND" -MOZ_ENABLE_WAYLAND=1 ./mach build 2>&1 | cat - +MOZ_ENABLE_WAYLAND=1 ./mach build -v 2>&1 | cat - %else -xvfb-run ./mach build 2>&1 | cat - +xvfb-run ./mach build -v 2>&1 | cat - %endif %else -./mach build 2>&1 | cat - +./mach build -v 2>&1 | cat - %endif - #--------------------------------------------------------------------- %install # run Firefox test suite @@ -986,6 +997,17 @@ rm -rf %{buildroot}%{mozappdir}/gtk2/ rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libmozjs.so rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libmozalloc.so rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libxul.so + +# Create a symlink to replace libnssckbi.so with p11-kit-client.so +# instead of p11-kit-trust.so, so that Firefox can see the system +# trust store on the host through the p11-kit RPC protocol. A symlink +# to libnss3.so is also needed, because Firefox tries to load +# libnssckbi.so from the same directory where libnss3.so is loaded (as +# of Firefox 89). +%if 0%{?flatpak} +ln -sf /usr/lib64/libnss3.so %{buildroot}%{_libdir}/libnss3.so +ln -sf /usr/lib64/pkcs11/p11-kit-client.so %{buildroot}%{_libdir}/libnssckbi.so +%endif #--------------------------------------------------------------------- # Moves defaults/preferences to browser/defaults/preferences @@ -1062,6 +1084,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/application.ini %{mozappdir}/pingsender %exclude %{mozappdir}/removed-files +%if 0%{?flatpak} +%{_libdir}/libnss3.so +%{_libdir}/libnssckbi.so +%endif %{_datadir}/icons/hicolor/16x16/apps/librewolf.png %{_datadir}/icons/hicolor/64x64/apps/librewolf.png %{_datadir}/icons/hicolor/128x128/apps/librewolf.png @@ -1094,9 +1120,75 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Wed Jun 09 2021 B. Stack <bgstack15@gmail.com> - 89.0-1 +* Sat Oct 02 2021 B. Stack <bgstack15@gmail.com> - 92.0.1-2 - Fork to librewolf release. +* Mon Sep 27 2021 Martin Stransky <stransky@redhat.com> - 92.0.1-1 +- Updated to 92.0.1 + +* Mon Sep 13 2021 Martin Stransky <stransky@redhat.com> - 92.0-3 +- Added fix for mozbz#1725828 + +* Thu Sep 9 2021 Martin Stransky <stransky@redhat.com> - 92.0-2 +- Disable test + +* Fri Sep 3 2021 Martin Stransky <stransky@redhat.com> - 92.0-1 +- Updated to 92.0 +- Added fix for mozbz#1728749 +- Added fix for mozbz#1708709 + +* Thu Aug 26 2021 Martin Stransky <stransky@redhat.com> - 91.0.2-1 +- Updated to 91.0.2 + +* Mon Aug 23 2021 Martin Stransky <stransky@redhat.com> - 91.0.1-2 +- Set %%build_with_clang automatically based on %%toolchain + by Timm Bäder <tbaeder@redhat.com> +- Updated Fedora UA patch by Eric Engestrom + (https://src.fedoraproject.org/rpms/firefox/pull-request/21) +- Added fix for mozbz#1726515 + +* Mon Aug 23 2021 Martin Stransky <stransky@redhat.com> - 91.0.1-1 +- Updated to 91.0.1 + +* Tue Aug 10 2021 Martin Stransky <stransky@redhat.com> - 91.0-1 +- Updated to 91.0 + +* Wed Aug 04 2021 Martin Stransky <stransky@redhat.com> - 90.0.2-2 +- Added fix for rhbz#1988841 - Allow unsigned extensions when installed + under non-user-writable dirs. + +* Thu Jul 22 2021 Martin Stransky <stransky@redhat.com> - 90.0.2-1 +- Updated to 90.0.2 + +* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 90.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 21 2021 Martin Stransky <stransky@redhat.com> - 90.0.1-1 +- Updated to 90.0.1 +- Added fixes to build on rawhide + +* Thu Jul 15 2021 Martin Stransky <stransky@redhat.com> - 90.0-3 +- Disabled Wayland backend on KDE due to + https://bugzilla.mozilla.org/show_bug.cgi?id=1714132 + +* Tue Jul 13 2021 Martin Stransky <stransky@redhat.com> - 90.0-2 +- Added xorg-x11-server-Xwayland dependency for Mutter + +* Mon Jul 12 2021 Martin Stransky <stransky@redhat.com> - 90.0-1 +- Updated to 90.0 + +* Mon Jul 12 2021 Daiki Ueno <dueno@redhat.com> - 89.0.2-3 +- flatpak: Enable loading system trust store on the host (rhbz#1766340) + +* Wed Jun 30 2021 Martin Stransky <stransky@redhat.com> - 89.0.2-2 +- Added fix for mozbz#1715254 (rhbz#1976892). + +* Thu Jun 24 2021 Martin Stransky <stransky@redhat.com> - 89.0.2-1 +- Updated to latest upstream (89.0.2) + +* Mon Jun 14 2021 Martin Stransky <stransky@redhat.com> - 89.0-2 +- Added fix for mozbz#1646135 + * Tue Jun 1 2021 Martin Stransky <stransky@redhat.com> - 89.0-1 - Updated to latest upstream (89.0) diff --git a/megabar.patch b/megabar.patch index ddbd4e8..1f2bed8 100644 --- a/megabar.patch +++ b/megabar.patch @@ -27,59 +27,24 @@ diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/sha index e80aaf6..6ec0961 100644 --- a/browser/themes/shared/urlbar-searchbar.inc.css +++ b/browser/themes/shared/urlbar-searchbar.inc.css -@@ -5,7 +5,7 @@ +@@ -5,6 +5,6 @@ %endif - %define fieldHoverBorderColor hsla(240,5%,5%,.35) -%define urlbarMarginInline 5px +%define urlbarMarginInline 0px %define urlbarSearchButtonWidth calc(16px + 2 * var(--urlbar-icon-padding)) :root { -@@ -279,40 +279,40 @@ - } +@@ -246,14 +246,14 @@ #urlbar[breakout][breakout-extend] { -- top: -@urlbarBreakoutExtend@; -- left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@); -- width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@); -+ top: 0; -+ left: 0; -+ width: 100%; - } - - @media (-moz-proton) { - #urlbar[breakout][breakout-extend] { top: 0; - left: -@urlbarMarginInline@; - width: calc(100% + 2 * @urlbarMarginInline@); + left: 0; -+ width: 100%; - } - } /*** END proton ***/ - - @media not (-moz-proton) { - #urlbar[breakout][breakout-extend] > #urlbar-background { -- box-shadow: 0 3px 8px 0 rgba(0,0,0,.15) -+ box-shadow: 0 1px 4px rgba(0,0,0,.05); - } - - #urlbar[breakout][breakout-extend][open] > #urlbar-background { -- box-shadow: 0 5px 18px rgba(0,0,0,.2); -+ box-shadow: 0 1px 4px rgba(0,0,0,.05); - } - } /*** END !proton ***/ - - #urlbar[breakout][breakout-extend] > #urlbar-input-container { -- height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@); -- padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2); -- padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@); -+ height: var(--urlbar-toolbar-height); -+ padding-block: 0; -+ padding-inline: 0; ++ width: 100; } - @media (-moz-proton) { #urlbar[breakout][breakout-extend] > #urlbar-input-container { height: var(--urlbar-toolbar-height); - padding-block: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding)); @@ -87,9 +52,9 @@ index e80aaf6..6ec0961 100644 + padding-block: 0; + padding-inline: 0; } - } /*** END proton ***/ -@@ -331,7 +331,7 @@ + #urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button { +@@ -271,7 +271,7 @@ } #urlbar[breakout][breakout-extend] > #urlbar-background { @@ -102,54 +67,40 @@ diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/ur index d2bb269..0d47466 100644 --- a/browser/themes/shared/urlbarView.inc.css +++ b/browser/themes/shared/urlbarView.inc.css -@@ -73,16 +73,16 @@ +@@ -56,8 +56,8 @@ display: block; text-shadow: none; overflow: clip; - margin-inline: calc(5px + var(--urlbar-container-padding)); - width: calc(100% - 2 * (5px + var(--urlbar-container-padding))); + margin-inline: 0; -+ width: 100% ++ width: 100%; /* Match urlbar-background's border. */ border-inline: 1px solid transparent; } - - @media not (-moz-proton) { - .urlbarView { -- margin-inline: calc(4px + var(--identity-box-margin-inline)); -- width: calc(100% - 2 * (4px + var(--identity-box-margin-inline))); -+ margin-inline: 0; -+ width: 100%; - } - /* If the view is open, offset the toolbar overlap so the view's top border - aligns with the toolbar. */ -@@ -112,7 +112,7 @@ +@@ -83,11 +83,11 @@ .urlbarView-row { fill: currentColor; fill-opacity: var(--urlbar-icon-fill-opacity); -- padding-block: 3px; -+ padding-block: 0; +- padding-block: 2px; ++ padding-block: 0px; } - - @media not (-moz-proton) { -@@ -127,7 +127,7 @@ - } - + :root:not([uidensity=compact]) .urlbarView-row:not([type=tip], [type=dynamic]) { - min-height: 32px; -+ min-height: 0; ++ min-height: 0px; } - } /*** END proton ***/ -@@ -295,6 +295,7 @@ + :root[uidensity=touch] .urlbarView-row:not([type=tip], [type=dynamic]) { +@@ -241,6 +241,7 @@ object-fit: contain; flex-shrink: 0; -moz-context-properties: fill, fill-opacity; + margin-inline-start: 20px; } - @media not (-moz-proton) { -@@ -328,10 +329,10 @@ + +@@ -268,10 +269,10 @@ .urlbarView-type-icon { position: absolute; @@ -159,8 +110,9 @@ index d2bb269..0d47466 100644 - margin-inline-start: 8px; + width: 16px; + height: 16px; -+ margin-bottom: 0; -+ margin-inline-start: 0; ++ margin-bottom: 0px; ++ margin-inline-start: 0px; align-self: end; background-repeat: no-repeat; - background-size: contain;
\ No newline at end of file + background-size: contain; + diff --git a/mochitest-wayland-workaround.patch b/mochitest-wayland-workaround.patch index 6f77b79..7a69061 100644 --- a/mochitest-wayland-workaround.patch +++ b/mochitest-wayland-workaround.patch @@ -37,33 +37,6 @@ diff -up firefox-89.0/toolkit/components/browser/nsWebBrowser.cpp.mochitest-wayl 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); -+ LOG(("Applying Wayland focus workaround for nsWindow %p\n", -+ owningWindow.get())); -+ GtkAllocation allocation; -+ gtk_widget_get_allocation(GTK_WIDGET(mContainer), &allocation); -+ LOG((" mShell allocation %d %d -> %d %d\n", allocation.x, -+ allocation.y, allocation.width, allocation.height)); -+ owningWindow->Show(false); - 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 { -+ self->Show(true); -+ GtkAllocation al = alloc; -+ self->mBounds.width = self->mBounds.height = 1; -+ self->OnSizeAllocate(&al); -+ })); - return; - } - @@ -7962,6 +7973,8 @@ nsresult nsWindow::SynthesizeNativeMouse nsIObserver* aObserver) { AutoObserverNotifier notifier(aObserver, "mouseevent"); diff --git a/mozilla-1705048.patch b/mozilla-1705048.patch deleted file mode 100644 index b45faa2..0000000 --- a/mozilla-1705048.patch +++ /dev/null @@ -1,70 +0,0 @@ -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; - - mHasAlphaVisual = false; -+ mIsWaylandPanelWindow = false; - mIsPIPWindow = false; - mAlwaysOnTop = false; - -@@ -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.mContentStatus != nsEventStatus_eConsumeNoDefault) { - mWindowShouldStartDragging = true; -@@ -4636,8 +4637,9 @@ nsresult nsWindow::Create(nsIWidget* aPa - // as a workaround. - mWindowType = eWindowType_toplevel; - } else if (mWindowType == eWindowType_popup && !aNativeParent && !aParent) { -- // Workaround for Wayland where the popup windows always need to have -- // parent window. For example webrtc ui is a popup window without parent. -+ // mIsWaylandPanelWindow is a special toplevel window on Wayland which -+ // emulates X11 popup window without parent. -+ mIsWaylandPanelWindow = true; - mWindowType = eWindowType_toplevel; - } - } -@@ -4664,8 +4666,10 @@ nsresult nsWindow::Create(nsIWidget* aPa - // popup window position. - GtkWindowType type = GTK_WINDOW_TOPLEVEL; - if (mWindowType == eWindowType_popup) { -- type = (mIsX11Display && aInitData->mNoAutoHide) ? GTK_WINDOW_TOPLEVEL -- : GTK_WINDOW_POPUP; -+ type = GTK_WINDOW_POPUP; -+ if (GdkIsX11Display() && aInitData->mNoAutoHide) { -+ type = GTK_WINDOW_TOPLEVEL; -+ } - } - mShell = gtk_window_new(type); - -@@ -4912,6 +4916,10 @@ nsresult nsWindow::Create(nsIWidget* aPa - } - #endif - -+ if (mIsWaylandPanelWindow) { -+ gtk_window_set_decorated(GTK_WINDOW(mShell), false); -+ } -+ - if (mWindowType == eWindowType_popup) { - // gdk does not automatically set the cursor for "temporary" - // windows, which are what gtk uses for popups. -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; -+ // It's undecorated popup utility window, without resizers/titlebar, -+ // movable by mouse. Used on Wayland as a workaround for popups without -+ // parent (for instance WebRTC sharing indicator). -+ bool mIsWaylandPanelWindow; - bool mAlwaysOnTop; - - #ifdef ACCESSIBILITY diff --git a/mozilla-1708709.patch b/mozilla-1708709.patch new file mode 100644 index 0000000..8ee1b35 --- /dev/null +++ b/mozilla-1708709.patch @@ -0,0 +1,240 @@ +diff -up firefox-92.0/dom/xul/XULPopupElement.cpp.1708709 firefox-92.0/dom/xul/XULPopupElement.cpp +--- firefox-92.0/dom/xul/XULPopupElement.cpp.1708709 2021-09-01 19:14:41.000000000 +0200 ++++ firefox-92.0/dom/xul/XULPopupElement.cpp 2021-09-07 10:33:55.686223973 +0200 +@@ -271,8 +271,7 @@ already_AddRefed<DOMRect> XULPopupElemen + // For native menus we can't query the true size. Use the anchor rect + // instead, which at least has the position at which we were intending to + // open the menu. +- screenRect = Some(CSSRect( +- CSSIntRect::FromUnknownRect(menuPopupFrame->GetScreenAnchorRect()))); ++ screenRect = Some(CSSRect(menuPopupFrame->GetScreenAnchorRect())); + } else { + // For non-native menus, query the bounds from the widget. + if (nsView* view = menuPopupFrame->GetView()) { +diff -up firefox-92.0/layout/xul/nsMenuPopupFrame.cpp.1708709 firefox-92.0/layout/xul/nsMenuPopupFrame.cpp +--- firefox-92.0/layout/xul/nsMenuPopupFrame.cpp.1708709 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/xul/nsMenuPopupFrame.cpp 2021-09-07 10:33:55.686223973 +0200 +@@ -868,8 +868,9 @@ void nsMenuPopupFrame::InitializePopup(n + InitPositionFromAnchorAlign(anchor, align); + } + } +- +- mScreenRect = nsIntRect(-1, -1, 0, 0); ++ // When converted back to CSSIntRect it is (-1, -1, 0, 0) - as expected in ++ // nsXULPopupManager::Rollup ++ mScreenRect = nsRect(-AppUnitsPerCSSPixel(), -AppUnitsPerCSSPixel(), 0, 0); + + if (aAttributesOverride) { + // Use |left| and |top| dimension attributes to position the popup if +@@ -881,11 +882,15 @@ void nsMenuPopupFrame::InitializePopup(n + nsresult err; + if (!left.IsEmpty()) { + int32_t x = left.ToInteger(&err); +- if (NS_SUCCEEDED(err)) mScreenRect.x = x; ++ if (NS_SUCCEEDED(err)) { ++ mScreenRect.x = CSSPixel::ToAppUnits(x); ++ } + } + if (!top.IsEmpty()) { + int32_t y = top.ToInteger(&err); +- if (NS_SUCCEEDED(err)) mScreenRect.y = y; ++ if (NS_SUCCEEDED(err)) { ++ mScreenRect.y = CSSPixel::ToAppUnits(y); ++ } + } + } + } +@@ -900,7 +905,8 @@ void nsMenuPopupFrame::InitializePopupAt + mPopupState = ePopupShowing; + mAnchorContent = nullptr; + mTriggerContent = aTriggerContent; +- mScreenRect = nsIntRect(aXPos, aYPos, 0, 0); ++ mScreenRect = ++ nsRect(CSSPixel::ToAppUnits(aXPos), CSSPixel::ToAppUnits(aYPos), 0, 0); + mXPos = 0; + mYPos = 0; + mFlip = FlipType_Default; +@@ -920,7 +926,8 @@ void nsMenuPopupFrame::InitializePopupAs + mTriggerContent = aTriggerContent; + mPopupState = ePopupShowing; + mAnchorContent = nullptr; +- mScreenRect = nsIntRect(aXPos, aYPos, 0, 0); ++ mScreenRect = ++ nsRect(CSSPixel::ToAppUnits(aXPos), CSSPixel::ToAppUnits(aYPos), 0, 0); + mXPos = 0; + mYPos = 0; + mFlip = FlipType_Default; +@@ -941,7 +948,7 @@ void nsMenuPopupFrame::InitializePopupAt + bool aAttributesOverride) { + InitializePopup(nullptr, aTriggerContent, aPosition, 0, 0, + MenuPopupAnchorType_Rect, aAttributesOverride); +- mScreenRect = aRect; ++ mScreenRect = ToAppUnits(aRect, AppUnitsPerCSSPixel()); + } + + void nsMenuPopupFrame::ShowPopup(bool aIsContextMenu) { +@@ -1430,7 +1437,7 @@ nsresult nsMenuPopupFrame::SetPopupPosit + // If anchored to a rectangle, use that rectangle. Otherwise, determine the + // rectangle from the anchor. + if (mAnchorType == MenuPopupAnchorType_Rect) { +- anchorRect = ToAppUnits(mScreenRect, AppUnitsPerCSSPixel()); ++ anchorRect = mScreenRect; + } else { + // if the frame is not specified, use the anchor node passed to OpenPopup. + // If that wasn't specified either, use the root frame. Note that +@@ -1517,7 +1524,7 @@ nsresult nsMenuPopupFrame::SetPopupPosit + // mXPos and mYPos specify an additonal offset passed to OpenPopup that + // should be added to the position. We also add the offset to the anchor + // pos so a later flip/resize takes the offset into account. +- nscoord anchorXOffset = nsPresContext::CSSPixelsToAppUnits(mXPos); ++ nscoord anchorXOffset = CSSPixel::ToAppUnits(mXPos); + if (IsDirectionRTL()) { + screenPoint.x -= anchorXOffset; + anchorRect.x -= anchorXOffset; +@@ -1525,7 +1532,7 @@ nsresult nsMenuPopupFrame::SetPopupPosit + screenPoint.x += anchorXOffset; + anchorRect.x += anchorXOffset; + } +- nscoord anchorYOffset = nsPresContext::CSSPixelsToAppUnits(mYPos); ++ nscoord anchorYOffset = CSSPixel::ToAppUnits(mYPos); + screenPoint.y += anchorYOffset; + anchorRect.y += anchorYOffset; + +@@ -1539,10 +1546,8 @@ nsresult nsMenuPopupFrame::SetPopupPosit + // Account for the margin that will end up being added to the screen + // coordinate the next time SetPopupPosition is called. + mAnchorType = MenuPopupAnchorType_Point; +- mScreenRect.x = +- nsPresContext::AppUnitsToIntCSSPixels(screenPoint.x - margin.left); +- mScreenRect.y = +- nsPresContext::AppUnitsToIntCSSPixels(screenPoint.y - margin.top); ++ mScreenRect.x = screenPoint.x - margin.left; ++ mScreenRect.y = screenPoint.y - margin.top; + } + } else { + // The popup is positioned at a screen coordinate. +@@ -1557,11 +1562,11 @@ nsresult nsMenuPopupFrame::SetPopupPosit + if (mAdjustOffsetForContextMenu) { + nsPoint offsetForContextMenuDev; + offsetForContextMenuDev.x = +- nsPresContext::CSSPixelsToAppUnits(LookAndFeel::GetInt( ++ CSSPixel::ToAppUnits(LookAndFeel::GetInt( + LookAndFeel::IntID::ContextMenuOffsetHorizontal)) / + factor; + offsetForContextMenuDev.y = +- nsPresContext::CSSPixelsToAppUnits(LookAndFeel::GetInt( ++ CSSPixel::ToAppUnits(LookAndFeel::GetInt( + LookAndFeel::IntID::ContextMenuOffsetVertical)) / + factor; + offsetForContextMenu.x = +@@ -1571,10 +1576,8 @@ nsresult nsMenuPopupFrame::SetPopupPosit + } + + // next, convert into app units accounting for the zoom +- screenPoint.x = presContext->DevPixelsToAppUnits( +- nsPresContext::CSSPixelsToAppUnits(mScreenRect.x) / factor); +- screenPoint.y = presContext->DevPixelsToAppUnits( +- nsPresContext::CSSPixelsToAppUnits(mScreenRect.y) / factor); ++ screenPoint.x = presContext->DevPixelsToAppUnits(mScreenRect.x / factor); ++ screenPoint.y = presContext->DevPixelsToAppUnits(mScreenRect.y / factor); + anchorRect = nsRect(screenPoint, nsSize(0, 0)); + + // add the margins on the popup +@@ -2377,9 +2380,10 @@ void nsMenuPopupFrame::DestroyFrom(nsIFr + nsBoxFrame::DestroyFrom(aDestructRoot, aPostDestroyData); + } + +-void nsMenuPopupFrame::MoveTo(const CSSIntPoint& aPos, bool aUpdateAttrs) { ++void nsMenuPopupFrame::MoveTo(const CSSPoint& aPos, bool aUpdateAttrs) { + nsIWidget* widget = GetWidget(); +- if ((mScreenRect.x == aPos.x && mScreenRect.y == aPos.y) && ++ nsPoint appUnitsPos = CSSPixel::ToAppUnits(aPos); ++ if ((mScreenRect.x == appUnitsPos.x && mScreenRect.y == appUnitsPos.y) && + (!widget || widget->GetClientOffset() == mLastClientOffset)) { + return; + } +@@ -2393,15 +2397,15 @@ void nsMenuPopupFrame::MoveTo(const CSSI + + // Workaround for bug 788189. See also bug 708278 comment #25 and following. + if (mAdjustOffsetForContextMenu) { +- margin.left += nsPresContext::CSSPixelsToAppUnits( ++ margin.left += CSSPixel::ToAppUnits( + LookAndFeel::GetInt(LookAndFeel::IntID::ContextMenuOffsetHorizontal)); +- margin.top += nsPresContext::CSSPixelsToAppUnits( ++ margin.top += CSSPixel::ToAppUnits( + LookAndFeel::GetInt(LookAndFeel::IntID::ContextMenuOffsetVertical)); + } + + mAnchorType = MenuPopupAnchorType_Point; +- mScreenRect.x = aPos.x - nsPresContext::AppUnitsToIntCSSPixels(margin.left); +- mScreenRect.y = aPos.y - nsPresContext::AppUnitsToIntCSSPixels(margin.top); ++ mScreenRect.x = appUnitsPos.x - margin.left; ++ mScreenRect.y = appUnitsPos.y - margin.top; + + SetPopupPosition(nullptr, true, false); + +@@ -2409,8 +2413,8 @@ void nsMenuPopupFrame::MoveTo(const CSSI + if (aUpdateAttrs && (popup->HasAttr(kNameSpaceID_None, nsGkAtoms::left) || + popup->HasAttr(kNameSpaceID_None, nsGkAtoms::top))) { + nsAutoString left, top; +- left.AppendInt(aPos.x); +- top.AppendInt(aPos.y); ++ left.AppendInt(RoundedToInt(aPos).x); ++ top.AppendInt(RoundedToInt(aPos).y); + popup->SetAttr(kNameSpaceID_None, nsGkAtoms::left, left, false); + popup->SetAttr(kNameSpaceID_None, nsGkAtoms::top, top, false); + } +diff -up firefox-92.0/layout/xul/nsMenuPopupFrame.h.1708709 firefox-92.0/layout/xul/nsMenuPopupFrame.h +--- firefox-92.0/layout/xul/nsMenuPopupFrame.h.1708709 2021-09-01 19:15:06.000000000 +0200 ++++ firefox-92.0/layout/xul/nsMenuPopupFrame.h 2021-09-07 10:46:10.360036429 +0200 +@@ -321,7 +321,7 @@ class nsMenuPopupFrame final : public ns + // If aUpdateAttrs is true, and the popup already has left or top attributes, + // then those attributes are updated to the new location. + // The frame may be destroyed by this method. +- void MoveTo(const mozilla::CSSIntPoint& aPos, bool aUpdateAttrs); ++ void MoveTo(const mozilla::CSSPoint& aPos, bool aUpdateAttrs); + + void MoveToAnchor(nsIContent* aAnchorContent, const nsAString& aPosition, + int32_t aXPos, int32_t aYPos, bool aAttributesOverride); +@@ -370,7 +370,9 @@ class nsMenuPopupFrame final : public ns + + // Return the screen coordinates in CSS pixels of the popup, + // or (-1, -1, 0, 0) if anchored. +- nsIntRect GetScreenAnchorRect() const { return mScreenRect; } ++ mozilla::CSSIntRect GetScreenAnchorRect() const { ++ return mozilla::CSSRect::FromAppUnitsRounded(mScreenRect); ++ } + + mozilla::LayoutDeviceIntPoint GetLastClientOffset() const { + return mLastClientOffset; +@@ -557,7 +559,7 @@ class nsMenuPopupFrame final : public ns + // override mXPos and mYPos. + int32_t mXPos; + int32_t mYPos; +- nsIntRect mScreenRect; ++ nsRect mScreenRect; + // Used for store rectangle which the popup is going to be anchored to, + // we need that for Wayland + #ifdef MOZ_WAYLAND +diff -up firefox-92.0/layout/xul/nsXULPopupManager.cpp.1708709 firefox-92.0/layout/xul/nsXULPopupManager.cpp +--- firefox-92.0/layout/xul/nsXULPopupManager.cpp.1708709 2021-09-01 19:15:01.000000000 +0200 ++++ firefox-92.0/layout/xul/nsXULPopupManager.cpp 2021-09-07 10:33:55.686223973 +0200 +@@ -343,8 +343,7 @@ bool nsXULPopupManager::Rollup(uint32_t + if (popupFrame->IsAnchored()) { + // Check if the popup has a screen anchor rectangle. If not, get the + // rectangle from the anchor element. +- anchorRect = +- CSSIntRect::FromUnknownRect(popupFrame->GetScreenAnchorRect()); ++ anchorRect = popupFrame->GetScreenAnchorRect(); + if (anchorRect.x == -1 || anchorRect.y == -1) { + nsCOMPtr<nsIContent> anchor = popupFrame->GetAnchor(); + +@@ -581,7 +580,7 @@ void nsXULPopupManager::PopupMoved(nsIFr + } else { + CSSPoint cssPos = LayoutDeviceIntPoint::FromUnknownPoint(aPnt) / + menuPopupFrame->PresContext()->CSSToDevPixelScale(); +- menuPopupFrame->MoveTo(RoundedToInt(cssPos), false); ++ menuPopupFrame->MoveTo(cssPos, false); + } + } + diff --git a/mozilla-1725828.patch b/mozilla-1725828.patch new file mode 100644 index 0000000..c891ab6 --- /dev/null +++ b/mozilla-1725828.patch @@ -0,0 +1,53 @@ +diff -up firefox-92.0/dom/media/gmp/GMPChild.cpp.1725828 firefox-92.0/dom/media/gmp/GMPChild.cpp +--- firefox-92.0/dom/media/gmp/GMPChild.cpp.1725828 2021-09-01 19:14:40.000000000 +0200 ++++ firefox-92.0/dom/media/gmp/GMPChild.cpp 2021-09-13 17:32:01.606739188 +0200 +@@ -232,8 +232,14 @@ mozilla::ipc::IPCResult GMPChild::RecvPr + } + #elif defined(XP_LINUX) + constexpr static const char* whitelist[] = { ++ // NSS libraries used by clearkey. + "libfreeblpriv3.so", + "libsoftokn3.so", ++ // glibc libraries merged into libc.so.6; see bug 1725828 and ++ // the corresponding code in GMPParent.cpp. ++ "libdl.so.2", ++ "libpthread.so.0", ++ "librt.so.1", + }; + + nsTArray<nsCString> libs; +@@ -256,7 +262,7 @@ mozilla::ipc::IPCResult GMPChild::RecvPr + } + // End bug 1698718 logging. + +- MOZ_CRASH("Couldn't load lib needed by NSS"); ++ MOZ_CRASH("Couldn't load lib needed by media plugin"); + } + } + } +diff -up firefox-92.0/dom/media/gmp/GMPParent.cpp.1725828 firefox-92.0/dom/media/gmp/GMPParent.cpp +--- firefox-92.0/dom/media/gmp/GMPParent.cpp.1725828 2021-09-13 17:32:01.606739188 +0200 ++++ firefox-92.0/dom/media/gmp/GMPParent.cpp 2021-09-13 17:55:54.902965506 +0200 +@@ -873,8 +873,21 @@ RefPtr<GenericPromise> GMPParent::ParseC + return GenericPromise::CreateAndReject(NS_ERROR_FAILURE, __func__); + } + +- GMPCapability video; ++#ifdef XP_LINUX ++ // These glibc libraries were merged into libc.so.6 as of glibc ++ // 2.34; they now exist only as stub libraries for compatibility and ++ // newly linked code won't depend on them, so we need to ensure ++ // they're loaded for plugins that may have been linked against a ++ // different version of glibc. (See also bug 1725828.) ++ if (!mDisplayName.EqualsASCII("clearkey")) { ++ if (!mLibs.IsEmpty()) { ++ mLibs.AppendLiteral(", "); ++ } ++ mLibs.AppendLiteral("libdl.so.2, libpthread.so.0, librt.so.1"); ++ } ++#endif + ++ GMPCapability video; + nsCString codecsString = NS_ConvertUTF16toUTF8(m.mX_cdm_codecs); + nsTArray<nsCString> codecs; + SplitAt(",", codecsString, codecs); diff --git a/mozilla-1728749.patch b/mozilla-1728749.patch new file mode 100644 index 0000000..08f6217 --- /dev/null +++ b/mozilla-1728749.patch @@ -0,0 +1,16 @@ +diff --git a/browser/actors/WebRTCParent.jsm b/browser/actors/WebRTCParent.jsm +--- a/browser/actors/WebRTCParent.jsm ++++ b/browser/actors/WebRTCParent.jsm +@@ -870,6 +870,11 @@ + ); + item.deviceId = device.id; + item.mediaSource = type; ++ ++ // In this case the OS sharing dialog will be the only option and ++ // can be safely pre-selected. ++ menupopup.parentNode.selectedItem = item; ++ menupopup.parentNode.disabled = true; + break; + } + if (type == "application") { + diff --git a/mozilla-vpn-ad.patch b/mozilla-vpn-ad.patch index bc884f2..ec3505a 100644 --- a/mozilla-vpn-ad.patch +++ b/mozilla-vpn-ad.patch @@ -1,17 +1,24 @@ diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html +index f8a1764..ebf4206 100644 --- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html +++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.html -@@ -54,13 +54,10 @@ +@@ -54,10 +54,11 @@ <div class="info"> <h1 id="info-title" data-l10n-id="about-private-browsing-info-title"></h1> <p id="info-body" data-l10n-id="about-private-browsing-info-description"></p> - <a id="private-browsing-myths" data-l10n-id="about-private-browsing-info-myths"></a> ++<!-- <a id="private-browsing-myths" data-l10n-id="about-private-browsing-info-myths"></a> --> </div> </div> ++ <!-- <div class="promo"> -- <p id="private-browsing-vpn-text" class="vpn-promo" data-l10n-id="about-private-browsing-need-more-privacy"></p> -- <a id="private-browsing-vpn-link" class="vpn-promo" data-l10n-id="about-private-browsing-turn-on-vpn"></a> + <div class="promo-image-large"> + <img src="" alt="" /> +@@ -73,5 +74,6 @@ + </div> + </div> </div> ++ --> </body> </html> diff --git a/remove_addons.patch b/remove_addons.patch index 40fef37..9cbf3fe 100644 --- a/remove_addons.patch +++ b/remove_addons.patch @@ -2,7 +2,7 @@ diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index 269dcb2..ed7c31d 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build -@@ -5,10 +5,7 @@ +@@ -5,11 +5,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += [ @@ -13,6 +13,7 @@ index 269dcb2..ed7c31d 100644 - "report-site-issue", "pictureinpicture", ] + diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 496379c..dd6f359 100644 --- a/browser/locales/Makefile.in @@ -37,10 +38,10 @@ diff --git a/browser/locales/filter.py b/browser/locales/filter.py index bb2e992..7d7768e 100644 --- a/browser/locales/filter.py +++ b/browser/locales/filter.py -@@ -20,7 +20,6 @@ def test(mod, path, entity=None): +@@ -19,7 +19,6 @@ + "devtools/startup", "browser", "browser/extensions/formautofill", - "browser/extensions/fxmonitor", - "browser/extensions/report-site-issue", "extensions/spellcheck", "other-licenses/branding/firefox", @@ -49,10 +50,10 @@ diff --git a/browser/locales/l10n.ini b/browser/locales/l10n.ini index f4cb7ca..4efac13 100644 --- a/browser/locales/l10n.ini +++ b/browser/locales/l10n.ini -@@ -14,7 +14,6 @@ dirs = browser +@@ -13,7 +13,6 @@ + devtools/client devtools/startup browser/extensions/formautofill - browser/extensions/fxmonitor - browser/extensions/report-site-issue [includes] @@ -61,14 +62,13 @@ diff --git a/browser/locales/l10n.toml b/browser/locales/l10n.toml index b9b18fe..af7c583 100644 --- a/browser/locales/l10n.toml +++ b/browser/locales/l10n.toml -@@ -133,10 +133,6 @@ locales = [ - reference = "browser/extensions/fxmonitor/locales/en-US/**" - l10n = "{l}browser/extensions/fxmonitor/**" +@@ -132,10 +132,6 @@ + l10n = "{l}browser/extensions/formautofill/**" --[[paths]] + [[paths]] - reference = "browser/extensions/report-site-issue/locales/en-US/**" - l10n = "{l}browser/extensions/report-site-issue/**" - - [[paths]] +-[[paths]] reference = "services/sync/locales/en-US/**" l10n = "{l}services/sync/**" diff --git a/run-tests-wayland b/run-tests-wayland index 4a3ebda..95ee6f6 100755 --- a/run-tests-wayland +++ b/run-tests-wayland @@ -46,7 +46,7 @@ if [ $RUN_XPCSHELL_TEST -ne 0 ] ; then fi # Basic render testing -export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true --setpref widget.wayland-focus-workaroud=true" +export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true --setpref widget.wayland.test-workarounds.enabled=true" #export TEST_FLAVOUR="" #if [ $RUN_REFTEST -ne 0 ] ; then # ./mach reftest --marionette localhost:$(($(($RANDOM))+2000)) $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR @@ -61,6 +61,8 @@ export TEST_PARAMS="--setpref reftest.ignoreWindowSize=true --setpref widget.way # WebRender testing export TEST_PARAMS="--enable-webrender $TEST_PARAMS" export TEST_FLAVOUR="-wr" +# Use dom/base/test or dom/base/test/chrome for short version +export MOCHITEST_DIR='dom' if [ $RUN_REFTEST -ne 0 ] ; then ./mach reftest $TEST_PARAMS 2>&1 | tee $TEST_DIR/reftest$TEST_FLAVOUR sleep 60 @@ -70,7 +72,7 @@ if [ $RUN_CRASHTEST -ne 0 ] ; then sleep 60 fi if [ $RUN_MOCHITEST -ne 0 ] ; then - ./mach mochitest dom $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR + ./mach mochitest $MOCHITEST_DIR $MOCHITEST_PARAMS $TEST_PARAMS 2>&1 | tee $TEST_DIR/mochitest$TEST_FLAVOUR sleep 60 fi |