From de2eb304d0b00dacba09e1d1aec01042d4f1c830 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Thu, 25 Aug 2022 09:12:21 -0700 Subject: [PATCH] browser(firefox-beta): roll Firefox to 105.0b2 (#16836) --- browser_patches/firefox-beta/BUILD_NUMBER | 4 +- .../firefox-beta/UPSTREAM_CONFIG.sh | 2 +- .../firefox-beta/patches/bootstrap.diff | 133 ++++++++---------- 3 files changed, 62 insertions(+), 77 deletions(-) diff --git a/browser_patches/firefox-beta/BUILD_NUMBER b/browser_patches/firefox-beta/BUILD_NUMBER index 0c00dc438f..ec985803af 100644 --- a/browser_patches/firefox-beta/BUILD_NUMBER +++ b/browser_patches/firefox-beta/BUILD_NUMBER @@ -1,2 +1,2 @@ -1348 -Changed: yurys@chromium.org Mon Aug 22 16:59:01 PDT 2022 +1349 +Changed: lushnikov@chromium.org Thu 25 Aug 2022 08:30:01 AM PDT diff --git a/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh b/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh index 5f19bdfda5..cd18d7b449 100644 --- a/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh +++ b/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://github.com/mozilla/gecko-dev" BASE_BRANCH="beta" -BASE_REVISION="762e3edda145d3196066dcd86f2eb8806a66a9c7" +BASE_REVISION="ef2a450dd015d4e6e80469b21cab1dd1a52cfbac" diff --git a/browser_patches/firefox-beta/patches/bootstrap.diff b/browser_patches/firefox-beta/patches/bootstrap.diff index 90ea0ed347..aec94354e6 100644 --- a/browser_patches/firefox-beta/patches/bootstrap.diff +++ b/browser_patches/firefox-beta/patches/bootstrap.diff @@ -59,7 +59,7 @@ index 416a1c5497c97ed80cc0f37d72545e36f7e36b4c..b81983cf7153378260a21f6af225e349 * Return XPCOM wrapper for the internal accessible. */ diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp -index 4460774865769609b66c0710f7c83f4d5c02b6fa..2ca95607b9b093218d48f83adc95c514cebe661b 100644 +index 326ed6a0838e50e5ce2bd4439df109c62070facb..19769fbb8d6da365f7f041f8f08fb06d41eb6a8c 100644 --- a/browser/app/winlauncher/LauncherProcessWin.cpp +++ b/browser/app/winlauncher/LauncherProcessWin.cpp @@ -23,6 +23,7 @@ @@ -70,7 +70,7 @@ index 4460774865769609b66c0710f7c83f4d5c02b6fa..2ca95607b9b093218d48f83adc95c514 #include #include -@@ -359,8 +360,19 @@ Maybe LauncherMain(int& argc, wchar_t* argv[], +@@ -412,8 +413,19 @@ Maybe LauncherMain(int& argc, wchar_t* argv[], HANDLE stdHandles[] = {::GetStdHandle(STD_INPUT_HANDLE), ::GetStdHandle(STD_OUTPUT_HANDLE), ::GetStdHandle(STD_ERROR_HANDLE)}; @@ -109,10 +109,10 @@ index b59fe4b1854fec7cb329139f9c6773498fb9de51..29973af04902848808e850b40bf85e5f gmp-clearkey/0.1/manifest.json i686/gmp-clearkey/0.1/manifest.json diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in -index 14e582fc61be808d5b6f3ae7801f43c7b0b743d4..80e400b5c3e316afe2bff1bac16808bad16dc4bd 100644 +index 9229a0bd0e041815331aaf2973afda22c007423d..3ce0e453d4124d110e11877f5bbade776d11cfd4 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -192,6 +192,9 @@ +@@ -196,6 +196,9 @@ @RESPATH@/chrome/remote.manifest #endif @@ -170,7 +170,7 @@ index 040c7b124dec6bb254563bbe74fe50012cb077a3..b4e6b8132786af70e8ad0dce88b67c28 const transportProvider = { setListener(upgradeListener) { diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp -index 4b4c20d5d04e51e5eeb08027c4b48068ee21d703..5529185d2a39e041b7e5021a5f5de63269644a4b 100644 +index 05c2ad8035b2e5312da485ef2028f9482a1f7bdb..0fcb5421bae4bcb9566aa32b57ed966570cdd45c 100644 --- a/docshell/base/BrowsingContext.cpp +++ b/docshell/base/BrowsingContext.cpp @@ -111,6 +111,20 @@ struct ParamTraits @@ -194,7 +194,7 @@ index 4b4c20d5d04e51e5eeb08027c4b48068ee21d703..5529185d2a39e041b7e5021a5f5de632 template <> struct ParamTraits : public ContiguousEnumSerializer< -@@ -2782,6 +2796,40 @@ void BrowsingContext::DidSet(FieldIndex, +@@ -2819,6 +2833,40 @@ void BrowsingContext::DidSet(FieldIndex, PresContextAffectingFieldChanged(); } @@ -236,7 +236,7 @@ index 4b4c20d5d04e51e5eeb08027c4b48068ee21d703..5529185d2a39e041b7e5021a5f5de632 nsString&& aOldValue) { MOZ_ASSERT(IsTop()); diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h -index e0b091feba6ce38e57681c62c386d3b70234de1f..4fae381a8bded7ae004ccb25187b3ace559fea41 100644 +index 6ad869bdd10efa9c87485d4a82e90fa3a0ad50e1..df3b05b581b450ba38056411f7b2befffe6e5f74 100644 --- a/docshell/base/BrowsingContext.h +++ b/docshell/base/BrowsingContext.h @@ -176,10 +176,10 @@ enum class ExplicitActiveStatus : uint8_t { @@ -263,7 +263,7 @@ index e0b091feba6ce38e57681c62c386d3b70234de1f..4fae381a8bded7ae004ccb25187b3ace /* The number of entries added to the session history because of this \ * browsing context. */ \ FIELD(HistoryEntryCount, uint32_t) \ -@@ -893,6 +897,14 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { +@@ -902,6 +906,14 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { return GetPrefersColorSchemeOverride(); } @@ -278,7 +278,7 @@ index e0b091feba6ce38e57681c62c386d3b70234de1f..4fae381a8bded7ae004ccb25187b3ace bool IsInBFCache() const; bool AllowJavascript() const { return GetAllowJavascript(); } -@@ -1047,6 +1059,23 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { +@@ -1059,6 +1071,23 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache { void PresContextAffectingFieldChanged(); @@ -303,7 +303,7 @@ index e0b091feba6ce38e57681c62c386d3b70234de1f..4fae381a8bded7ae004ccb25187b3ace bool CanSet(FieldIndex, bool, ContentParent*) { diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp -index e7f3305fae1c6754974b2a53995080f487d559cf..eaa173262e6cfec0765153fb890588fef768d74c 100644 +index 4341056f5c66d988d208bbc7aceccb7146311e2f..296ae7b5552ac1cdcaa7fef5e2e1ea8b8d13f221 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -15,6 +15,12 @@ @@ -365,7 +365,7 @@ index e7f3305fae1c6754974b2a53995080f487d559cf..eaa173262e6cfec0765153fb890588fe mAllowAuth(mItemType == typeContent), mAllowKeywordFixup(false), mDisableMetaRefreshWhenInactive(false), -@@ -3256,6 +3273,221 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) { +@@ -3255,6 +3272,221 @@ nsDocShell::GetMessageManager(ContentFrameMessageManager** aMessageManager) { return NS_OK; } @@ -609,7 +609,7 @@ index e7f3305fae1c6754974b2a53995080f487d559cf..eaa173262e6cfec0765153fb890588fe return rv; } -@@ -12780,6 +13018,9 @@ class OnLinkClickEvent : public Runnable { +@@ -12781,6 +13019,9 @@ class OnLinkClickEvent : public Runnable { mHandler->OnLinkClickSync(mContent, mLoadState, mNoOpenerImplied, mTriggeringPrincipal); } @@ -619,7 +619,7 @@ index e7f3305fae1c6754974b2a53995080f487d559cf..eaa173262e6cfec0765153fb890588fe return NS_OK; } -@@ -12859,6 +13100,8 @@ nsresult nsDocShell::OnLinkClick( +@@ -12860,6 +13101,8 @@ nsresult nsDocShell::OnLinkClick( nsCOMPtr ev = new OnLinkClickEvent(this, aContent, loadState, noOpenerImplied, aIsTrusted, aTriggeringPrincipal); @@ -629,7 +629,7 @@ index e7f3305fae1c6754974b2a53995080f487d559cf..eaa173262e6cfec0765153fb890588fe } diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h -index 61998bf661a2c765411280e03d0726b227c31a3f..5ba8e2ac8e13ae9d18591fd477e5c9414843e3cc 100644 +index 293bfeee6e0779d15dd6ef60fc06f9969f70f003..55d431c2a69384cae1d74d90ca36272f473ff8db 100644 --- a/docshell/base/nsDocShell.h +++ b/docshell/base/nsDocShell.h @@ -16,6 +16,7 @@ @@ -745,10 +745,10 @@ index 6b85ddd842a6d2e29f86047017b78b2007b99867..e0b56c4f85544580b9a631619fb06799 * This attempts to save any applicable layout history state (like * scroll position) in the nsISHEntry. This is normally done diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp -index b34ad3970c1ecaefeb756b9c2f4ca44727bd8be9..e1ea4bce868c4385d498305bf7c1bbd4de282415 100644 +index 2d744434a271f5bd7636b9ae344cbcb6666739e2..d2b4c2ce06ff61247cb64e64b9b30db268d520c4 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp -@@ -3646,6 +3646,9 @@ void Document::SendToConsole(nsCOMArray& aMessages) { +@@ -3649,6 +3649,9 @@ void Document::SendToConsole(nsCOMArray& aMessages) { } void Document::ApplySettingsFromCSP(bool aSpeculative) { @@ -758,7 +758,7 @@ index b34ad3970c1ecaefeb756b9c2f4ca44727bd8be9..e1ea4bce868c4385d498305bf7c1bbd4 nsresult rv = NS_OK; if (!aSpeculative) { // 1) apply settings from regular CSP -@@ -3703,6 +3706,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) { +@@ -3706,6 +3709,11 @@ nsresult Document::InitCSP(nsIChannel* aChannel) { MOZ_ASSERT(!mScriptGlobalObject, "CSP must be initialized before mScriptGlobalObject is set!"); @@ -770,7 +770,7 @@ index b34ad3970c1ecaefeb756b9c2f4ca44727bd8be9..e1ea4bce868c4385d498305bf7c1bbd4 // If this is a data document - no need to set CSP. if (mLoadedAsData) { return NS_OK; -@@ -4509,6 +4517,10 @@ bool Document::HasFocus(ErrorResult& rv) const { +@@ -4517,6 +4525,10 @@ bool Document::HasFocus(ErrorResult& rv) const { return false; } @@ -781,7 +781,7 @@ index b34ad3970c1ecaefeb756b9c2f4ca44727bd8be9..e1ea4bce868c4385d498305bf7c1bbd4 if (!fm->IsInActiveWindow(bc)) { return false; } -@@ -17974,6 +17986,71 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const { +@@ -17888,6 +17900,71 @@ ColorScheme Document::PreferredColorScheme(IgnoreRFP aIgnoreRFP) const { return LookAndFeel::PreferredColorSchemeForContent(); } @@ -854,10 +854,10 @@ index b34ad3970c1ecaefeb756b9c2f4ca44727bd8be9..e1ea4bce868c4385d498305bf7c1bbd4 if (!sLoadingForegroundTopLevelContentDocument) { return false; diff --git a/dom/base/Document.h b/dom/base/Document.h -index 422ae0179f660b4ff49f1d7e06173d23d5794628..de74cd1b5a2e8ae214be9304a6346067fb541d29 100644 +index 41a5ece69fc8474b572956c37e0b4748dc6c5370..206550a448e0c73f0fb46e542722545e49992db3 100644 --- a/dom/base/Document.h +++ b/dom/base/Document.h -@@ -4016,6 +4016,9 @@ class Document : public nsINode, +@@ -4024,6 +4024,9 @@ class Document : public nsINode, // color-scheme meta tag. ColorScheme DefaultColorScheme() const; @@ -936,10 +936,10 @@ index cb821086b1ac884ba96ef8874211bff16106b206..3b93388637f9ec7493735e9beb6f02a7 dom::MediaCapabilities* MediaCapabilities(); dom::MediaSession* MediaSession(); diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp -index 25b6994c9a42054f97b18d5c4a3e35a0010ee749..cef7ba95112677f1a41beb66db718126601bd151 100644 +index bed527b613ca169fef7d19870a16fe634b57ff25..bca538a001c7c7a1d334b8af2e4f795c0f3d171d 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp -@@ -8505,7 +8505,8 @@ nsresult nsContentUtils::SendMouseEvent( +@@ -8509,7 +8509,8 @@ nsresult nsContentUtils::SendMouseEvent( bool aIgnoreRootScrollFrame, float aPressure, unsigned short aInputSourceArg, uint32_t aIdentifier, bool aToWindow, PreventDefaultResult* aPreventDefault, bool aIsDOMEventSynthesized, @@ -949,7 +949,7 @@ index 25b6994c9a42054f97b18d5c4a3e35a0010ee749..cef7ba95112677f1a41beb66db718126 nsPoint offset; nsCOMPtr widget = GetWidget(aPresShell, &offset); if (!widget) return NS_ERROR_FAILURE; -@@ -8564,6 +8565,7 @@ nsresult nsContentUtils::SendMouseEvent( +@@ -8568,6 +8569,7 @@ nsresult nsContentUtils::SendMouseEvent( event.mTime = PR_IntervalNow(); event.mFlags.mIsSynthesizedForTests = aIsDOMEventSynthesized; event.mExitFrom = exitFrom; @@ -958,7 +958,7 @@ index 25b6994c9a42054f97b18d5c4a3e35a0010ee749..cef7ba95112677f1a41beb66db718126 nsPresContext* presContext = aPresShell->GetPresContext(); if (!presContext) return NS_ERROR_FAILURE; diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h -index de038d0832adb4037d2d076011e433412e85cb83..79c59cb6da7a7746df983614d7eff02f97eddfb0 100644 +index a4446404bd7fa503f9320521d66d60695375b8d5..7b23679ce7affb80b23d0eaf1879548c0d41c519 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -2957,7 +2957,8 @@ class nsContentUtils { @@ -972,7 +972,7 @@ index de038d0832adb4037d2d076011e433412e85cb83..79c59cb6da7a7746df983614d7eff02f static void FirePageShowEventForFrameLoaderSwap( nsIDocShellTreeItem* aItem, diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp -index 972be59520940e93e703312e42c2ef250d2bb4d6..11faf5ab1ab25449ebfbaf41b1dfad15a43096a9 100644 +index 8cee829af918aa0c44049f794746816f73fb7b50..daad61c3fbd526aa941c8c0be28892d7ec00521d 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -683,7 +683,7 @@ nsDOMWindowUtils::SendMouseEvent( @@ -1049,7 +1049,7 @@ index 25c06cd90d552345da4fffbcdb4dfaab02377c97..cc81b234da508405daba42735430dd3f // care of lowering the present active window. This happens in // a separate runnable to avoid touching multiple windows in diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp -index 02e1ad995ba68d69e4353b89464a0259e22d24a0..bb169f97aff4fe707a4fb2be6c5db5eba7e80c49 100644 +index 6b95fcd529cb796741a26c3af2d78d97f8b9fdb8..02010c7e0a5c5cfe9e7fc37d1cd57afcfe12f8d9 100644 --- a/dom/base/nsGlobalWindowOuter.cpp +++ b/dom/base/nsGlobalWindowOuter.cpp @@ -2489,7 +2489,7 @@ nsresult nsGlobalWindowOuter::SetNewDocument(Document* aDocument, @@ -1102,7 +1102,7 @@ index 02e1ad995ba68d69e4353b89464a0259e22d24a0..bb169f97aff4fe707a4fb2be6c5db5eb void nsGlobalWindowOuter::ClearStatus() { SetStatusOuter(u""_ns); } void nsGlobalWindowOuter::SetDocShell(nsDocShell* aDocShell) { -@@ -3769,6 +3788,14 @@ Maybe nsGlobalWindowOuter::GetRDMDeviceSize( +@@ -3770,6 +3789,14 @@ Maybe nsGlobalWindowOuter::GetRDMDeviceSize( } } } @@ -1118,7 +1118,7 @@ index 02e1ad995ba68d69e4353b89464a0259e22d24a0..bb169f97aff4fe707a4fb2be6c5db5eb } diff --git a/dom/base/nsGlobalWindowOuter.h b/dom/base/nsGlobalWindowOuter.h -index a82771c6d0bf1b5d5547e42fa3dad61537381d4a..0a4e153a11972b305a425ecb4fdb427766174a18 100644 +index e8285b0fb892040737ad9de2fa60b192b0a8d37f..fa9d0b219dcfa787ce1629809fbe83578f084b26 100644 --- a/dom/base/nsGlobalWindowOuter.h +++ b/dom/base/nsGlobalWindowOuter.h @@ -333,6 +333,7 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget, @@ -1381,7 +1381,7 @@ index 5c0d2f96a22c6928d6aee5a226032c0944ae7a54..5a7bb1f6cea1946eea143dca4e2f1e19 ~Geolocation(); diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp -index d53de983402c9e0fd2d1bd848563efc04edee616..c635674099390cf412a361430517c200fec5796a 100644 +index cdd330a8efdfd6c3fb54780fabb0d00505e831c9..87df1c6dad398e4914b71e30df0940aa0b1bab71 100644 --- a/dom/html/HTMLInputElement.cpp +++ b/dom/html/HTMLInputElement.cpp @@ -53,6 +53,7 @@ @@ -1406,7 +1406,7 @@ index d53de983402c9e0fd2d1bd848563efc04edee616..c635674099390cf412a361430517c200 return NS_OK; } diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl -index 579043a768c506db54a20d615a3f44a2a55de627..33fdee86da62f1e0cc3caa6e4bc4382be9bf762e 100644 +index 51e3288c4cc8f40309a7c75d36c236f6f21fdfb7..844d362d956884feb41181fe40504de497ada14b 100644 --- a/dom/interfaces/base/nsIDOMWindowUtils.idl +++ b/dom/interfaces/base/nsIDOMWindowUtils.idl @@ -372,7 +372,8 @@ interface nsIDOMWindowUtils : nsISupports { @@ -1630,7 +1630,7 @@ index 8c8a5810fd56512cf37635da1f43757719f06113..d2bc58fcd3b05f989f948839d574d00d return aGlobalOrNull; diff --git a/dom/security/nsCSPUtils.cpp b/dom/security/nsCSPUtils.cpp -index b31ca1000cb1d7b8ca1af74b9ac0313aba053875..54abd38a35fc2b4906760c370d9f96d7f2ade0e2 100644 +index e78ba8eece8dc173a0755c2bbd4031fc9c83ce21..9cc998760258dc5224d71ce20bdd440a600c480e 100644 --- a/dom/security/nsCSPUtils.cpp +++ b/dom/security/nsCSPUtils.cpp @@ -127,6 +127,11 @@ void CSP_ApplyMetaCSPToDoc(mozilla::dom::Document& aDoc, @@ -1669,10 +1669,10 @@ index 2f71b284ee5f7e11f117c447834b48355784448c..ddcc545da1efec5784273b032efa00ad * returned quads are further translated relative to the window * origin -- which is not the layout origin. Further translation diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp -index 88e55560a914f1661b5302a924de519157c25dd9..b86513356488b48cb788acefaaa9905c38c2b05c 100644 +index 2f9beef0bde229a2f414f46d3ec2b10eac5c4f1c..2aa8c6b75b7791e29b6f579718a2d6e250dc4236 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp -@@ -977,7 +977,7 @@ void PrefLanguagesChanged(const char* /* aPrefName */, void* /* aClosure */) { +@@ -981,7 +981,7 @@ void PrefLanguagesChanged(const char* /* aPrefName */, void* /* aClosure */) { AssertIsOnMainThread(); nsTArray languages; @@ -1681,7 +1681,7 @@ index 88e55560a914f1661b5302a924de519157c25dd9..b86513356488b48cb788acefaaa9905c RuntimeService* runtime = RuntimeService::GetService(); if (runtime) { -@@ -1179,8 +1179,7 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) { +@@ -1183,8 +1183,7 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) { } // The navigator overridden properties should have already been read. @@ -1691,7 +1691,7 @@ index 88e55560a914f1661b5302a924de519157c25dd9..b86513356488b48cb788acefaaa9905c mNavigatorPropertiesLoaded = true; } -@@ -1778,6 +1777,13 @@ void RuntimeService::PropagateStorageAccessPermissionGranted( +@@ -1782,6 +1781,13 @@ void RuntimeService::PropagateStorageAccessPermissionGranted( } } @@ -1705,7 +1705,7 @@ index 88e55560a914f1661b5302a924de519157c25dd9..b86513356488b48cb788acefaaa9905c template void RuntimeService::BroadcastAllWorkers(const Func& aFunc) { AssertIsOnMainThread(); -@@ -2193,6 +2199,14 @@ void PropagateStorageAccessPermissionGrantedToWorkers( +@@ -2197,6 +2203,14 @@ void PropagateStorageAccessPermissionGrantedToWorkers( } } @@ -1721,7 +1721,7 @@ index 88e55560a914f1661b5302a924de519157c25dd9..b86513356488b48cb788acefaaa9905c MOZ_ASSERT(!NS_IsMainThread()); MOZ_ASSERT(aCx); diff --git a/dom/workers/RuntimeService.h b/dom/workers/RuntimeService.h -index ef32cc847e8b86319830bb93879aaf809fe464d4..5db3be0dc87e50ff75177194ca734313b22509d6 100644 +index d1a44a19e865fb76cf2b7bfe5e1fbd9c64ec0465..1a44fee6508ea0ef3f48700b83b1185565778cc8 100644 --- a/dom/workers/RuntimeService.h +++ b/dom/workers/RuntimeService.h @@ -110,6 +110,8 @@ class RuntimeService final : public nsIObserver { @@ -1747,7 +1747,7 @@ index d10dabb5c5ff8e17851edf2bd2efc08e74584d8e..53c4070c5fde43b27fb8fbfdcf4c23d8 bool IsWorkerGlobal(JSObject* global); diff --git a/dom/workers/WorkerPrivate.cpp b/dom/workers/WorkerPrivate.cpp -index 96357690e6f056501bef4729291c0c280d43b8e3..6fbcad9a972d61ab1d2de295219c361288ffb381 100644 +index 3c53d24cbf31d01909cbf680eb0b485320607d59..8546618453d78ea507b9feeea362577c0dbd0153 100644 --- a/dom/workers/WorkerPrivate.cpp +++ b/dom/workers/WorkerPrivate.cpp @@ -699,6 +699,18 @@ class UpdateContextOptionsRunnable final : public WorkerControlRunnable { @@ -1803,7 +1803,7 @@ index 96357690e6f056501bef4729291c0c280d43b8e3..6fbcad9a972d61ab1d2de295219c3612 const nsTArray& aLanguages) { WorkerGlobalScope* globalScope = GlobalScope(); diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h -index 1f31c4a6a94491cb6c981655e30e1fd42c4dbfc1..dbfdf4fc27f112e7cadbb768a858323f8ee919d1 100644 +index ae304f38e867c494f279179ac10a1c91b88c5f4e..841b93d297478b28787e134af82e88e1c8eeb5d4 100644 --- a/dom/workers/WorkerPrivate.h +++ b/dom/workers/WorkerPrivate.h @@ -330,6 +330,8 @@ class WorkerPrivate final @@ -2042,10 +2042,10 @@ index dac899f7558b26d6848da8b98ed8a93555c8751a..2a07d67fa1c2840b25085566e84dc3b2 // No boxes to return return; diff --git a/layout/base/PresShell.cpp b/layout/base/PresShell.cpp -index 014b655e374af3bf6f346febb76df4f7484e2e8d..cf62af15fd34fbcbb3d2bc3b00065eb5aee21d62 100644 +index 2b98de7670625e5f3e5312271c4cecc6fb71e0f4..b4100d6f5ec2586ff20ffa24a792d5c6c731ef4d 100644 --- a/layout/base/PresShell.cpp +++ b/layout/base/PresShell.cpp -@@ -10885,7 +10885,9 @@ auto PresShell::ComputeActiveness() const -> Activeness { +@@ -10900,7 +10900,9 @@ auto PresShell::ComputeActiveness() const -> Activeness { if (!browserChild->IsVisible()) { MOZ_LOG(gLog, LogLevel::Debug, (" > BrowserChild %p is not visible", browserChild)); @@ -2057,7 +2057,7 @@ index 014b655e374af3bf6f346febb76df4f7484e2e8d..cf62af15fd34fbcbb3d2bc3b00065eb5 // If the browser is visible but just due to be preserving layers diff --git a/layout/style/GeckoBindings.h b/layout/style/GeckoBindings.h -index 3bc4cd498dc22b7d3db097beb9988c68baf26437..77557e174283e8c151ad540f92ede87f88197c80 100644 +index f055aacef5278e767beb3ee5588533961e148804..e1939bc19edc43f9127883cdd3dca981662baeec 100644 --- a/layout/style/GeckoBindings.h +++ b/layout/style/GeckoBindings.h @@ -575,6 +575,7 @@ void Gecko_MediaFeatures_GetDeviceSize(const mozilla::dom::Document*, @@ -2069,10 +2069,10 @@ index 3bc4cd498dc22b7d3db097beb9988c68baf26437..77557e174283e8c151ad540f92ede87f const mozilla::dom::Document*); mozilla::StylePrefersColorScheme Gecko_MediaFeatures_PrefersColorScheme( diff --git a/layout/style/nsMediaFeatures.cpp b/layout/style/nsMediaFeatures.cpp -index 2ef43008df12886ad00485ef743564774850c2ba..bb53b96ae491146d895e1c32d62dc0f2ea00812f 100644 +index a9d3f075f3587fc1e55544b010864cd0e4b67107..d9ce4a1a7d9e2cd27e20f0ef36132e6599b0bb66 100644 --- a/layout/style/nsMediaFeatures.cpp +++ b/layout/style/nsMediaFeatures.cpp -@@ -260,10 +260,11 @@ bool Gecko_MediaFeatures_MatchesPlatform(StylePlatform aPlatform) { +@@ -264,10 +264,11 @@ bool Gecko_MediaFeatures_MatchesPlatform(StylePlatform aPlatform) { } bool Gecko_MediaFeatures_PrefersReducedMotion(const Document* aDocument) { @@ -2101,10 +2101,10 @@ index f2723e654098ff27542e1eb16a536c11ad0af617..b0b480551ff7d895dfdeb5a980087485 /* Use accelerated SIMD routines. */ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 4e81c2325b0d4a73f6fe52f10a7a6ad593e806ce..541ac135bb854ecf951d4f4dab0aaed1fe8fc051 100644 +index d609cbd2d139630d2c1dd85a82e946828aa14acc..0592eb6ca3312170ef2e86233aa4a2d12297ef55 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -4359,7 +4359,9 @@ pref("devtools.experiment.f12.shortcut_disabled", false); +@@ -4357,7 +4357,9 @@ pref("devtools.experiment.f12.shortcut_disabled", false); // doesn't provide a way to lock the pref pref("dom.postMessage.sharedArrayBuffer.bypassCOOP_COEP.insecure.enabled", false); #else @@ -2128,7 +2128,7 @@ index e869cd28d396aa87c522241d3e63d435ee8dbae6..2d307f089209721d88d231b03e862889 /** * Set the status and reason for the forthcoming synthesized response. diff --git a/netwerk/protocol/http/InterceptedHttpChannel.cpp b/netwerk/protocol/http/InterceptedHttpChannel.cpp -index 56eabba18f021719aa084b5bb616d3602d782a97..1408518cdba2db29e994963c4e21aead2aa573c6 100644 +index 23495ec9ffa1c6a237005e0cd160e27185717fab..086163719d3c720ba92cf04478f486ddaeeb965f 100644 --- a/netwerk/protocol/http/InterceptedHttpChannel.cpp +++ b/netwerk/protocol/http/InterceptedHttpChannel.cpp @@ -662,6 +662,14 @@ void InterceptedHttpChannel::DoAsyncAbort(nsresult aStatus) { @@ -2147,10 +2147,10 @@ index 56eabba18f021719aa084b5bb616d3602d782a97..1408518cdba2db29e994963c4e21aead InterceptedHttpChannel::ResetInterception(bool aBypass) { if (mCanceled) { diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp -index d956b3b5c6ecf6a983689d09e491193519f34ceb..826aabb5b794a2d4028950066ca3036223a35e0c 100644 +index 55c7dbe1ae90d64e5aa993424cc1c5659833582f..a451248676b9b7cdd773a74948eb3b4d442a2b18 100644 --- a/parser/html/nsHtml5TreeOpExecutor.cpp +++ b/parser/html/nsHtml5TreeOpExecutor.cpp -@@ -1330,6 +1330,10 @@ void nsHtml5TreeOpExecutor::UpdateReferrerInfoFromMeta( +@@ -1363,6 +1363,10 @@ void nsHtml5TreeOpExecutor::UpdateReferrerInfoFromMeta( void nsHtml5TreeOpExecutor::AddSpeculationCSP(const nsAString& aCSP) { NS_ASSERTION(NS_IsMainThread(), "Wrong thread!"); @@ -2208,16 +2208,16 @@ index 153722c33b9db6475aa5134ad5b665051ac68658..74324d95f7088c65c3d52ab2a7c40e89 nsCOMPtr nss(do_GetService(PSM_COMPONENT_CONTRACTID)); diff --git a/security/manager/ssl/nsCertOverrideService.h b/security/manager/ssl/nsCertOverrideService.h -index e601df1b13d9b2c028bffe6348d052960c80951c..0d782585199479db6218f4c72ed7b6133e3122b3 100644 +index e22af55d6e94ceba502fabc775500228481e040c..8bbe25701332d6238afe9a31e6b3b83984debbab 100644 --- a/security/manager/ssl/nsCertOverrideService.h +++ b/security/manager/ssl/nsCertOverrideService.h @@ -134,6 +134,7 @@ class nsCertOverrideService final : public nsICertOverrideService, mozilla::Mutex mMutex; - bool mDisableAllSecurityCheck GUARDED_BY(mMutex); -+ mozilla::HashSet mUserContextIdsWithDisabledSecurityChecks GUARDED_BY(mMutex); - nsCOMPtr mSettingsFile GUARDED_BY(mMutex); - nsTHashtable mSettingsTable GUARDED_BY(mMutex); + bool mDisableAllSecurityCheck MOZ_GUARDED_BY(mMutex); ++ mozilla::HashSet mUserContextIdsWithDisabledSecurityChecks MOZ_GUARDED_BY(mMutex); + nsCOMPtr mSettingsFile MOZ_GUARDED_BY(mMutex); + nsTHashtable mSettingsTable MOZ_GUARDED_BY(mMutex); diff --git a/security/manager/ssl/nsICertOverrideService.idl b/security/manager/ssl/nsICertOverrideService.idl index 3862fe6830874c036592fd217cab7ad5f4cd3e27..3166b37db0e52f7f2972d2bcb7a72ed819805794 100644 @@ -2248,7 +2248,7 @@ index a8b0c67ce19d801d2f032d1b59110871a9859787..9d8d689bc4c4fb6aa00ff6c551cbab0d : AppConstants.REMOTE_SETTINGS_SERVER_URL; }, diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs -index 8c93dfa24ce7810f004227fc0430338229a0bc3f..09a1f93dd027394345e910e00b765689490ac2a3 100644 +index 65faf3003964dec306c8d2f58cc2b921b54f8cb9..dd2a4b40d3a45240edca8b0f731e2aa2a5c12bdb 100644 --- a/servo/components/style/gecko/media_features.rs +++ b/servo/components/style/gecko/media_features.rs @@ -224,10 +224,15 @@ pub enum ForcedColors { @@ -2285,7 +2285,7 @@ index 4f7337926efbb086a2be97cdbcb3dca39e27c786..f2005cb726ff153d6b1011d6af0479db // ignored for Linux. const unsigned long CHROME_SUPPRESS_ANIMATION = 0x01000000; diff --git a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm -index 5184d1dcb0618dc15abd28462985040236ddf643..bce45ad2d76098c16e0877fa46f71158c884ea5a 100644 +index 4a152c642f5f763f953158ccb4ea59c7c32b66d7..21e4636abb017201e2e242069071f642501139f3 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm +++ b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm @@ -116,6 +116,12 @@ EnterprisePoliciesManager.prototype = { @@ -2347,7 +2347,7 @@ index 3983d580cd11a8241481876aaf8a924f4f083ad0..0dd75bab6249a4db25dea3cabefd4f8e /** diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm -index 393ff53b8f69aba56d7f4d849e18aaddb0b94f49..f29602b0c7c436dec335bb7d6033750f3499fbbe 100644 +index f499fb84ce2cfd06d7e63b82294d72467339ef8c..c539b9075a6b5443f6d075b5836d9ebd931a3bd9 100644 --- a/toolkit/mozapps/update/UpdateService.jsm +++ b/toolkit/mozapps/update/UpdateService.jsm @@ -3607,6 +3607,8 @@ UpdateService.prototype = { @@ -2427,7 +2427,7 @@ index 9ca3975c99c8bff3829bce1cf49d1235910c3ab8..6606eb02fba53ea8bd401d07460b85b0 // nsDocumentViewer::LoadComplete that doesn't do various things // that are not relevant here because this wasn't an actual diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp -index a66f215e577d29eb1db88899136ccf4eff34a960..67ea697e80608a3d5a3836b01334efe3141e70a1 100644 +index 9abeebcb9e137186b62c7eff02ac8ca2848f5f20..3855b6ed82d8a87f5798525152bcf42c124bcc9f 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -113,6 +113,7 @@ @@ -2890,21 +2890,6 @@ index 2b80eea70e58dd53c34edd9c5fa4415c42bcd632..72ecda7d8ddc7a9f87a954b547f8411e private: ~HeadlessWidget(); bool mEnabled; -diff --git a/widget/windows/nsAppShell.cpp b/widget/windows/nsAppShell.cpp -index e2cf83f3d6ee0b120bb22f46aa873d3bd6436cd0..8ea269c8de520d3a9eed42f99f66ad28f5e63fbc 100644 ---- a/widget/windows/nsAppShell.cpp -+++ b/widget/windows/nsAppShell.cpp -@@ -17,7 +17,9 @@ - #include "WinIMEHandler.h" - #include "mozilla/widget/AudioSession.h" - #include "mozilla/BackgroundHangMonitor.h" --#include "mozilla/BackgroundTasks.h" -+#ifdef MOZ_BACKGROUNDTASKS -+# include "mozilla/BackgroundTasks.h" -+#endif - #include "mozilla/Hal.h" - #include "nsIDOMWakeLockListener.h" - #include "nsIPowerManagerService.h" diff --git a/xpcom/reflect/xptinfo/xptinfo.h b/xpcom/reflect/xptinfo/xptinfo.h index 2456c2c2b58b27cd595880b547ed20fb687a1835..e967c089b2331c7cd36d34e511543fbc84320b7d 100644 --- a/xpcom/reflect/xptinfo/xptinfo.h