New commits:
commit 89793d04d1d60dc0fbd3438cef78d86f60d315d2
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
-diff -r ac0e1ee8218f build/pgo/profileserver.py
---- a/build/pgo/profileserver.py Tue Feb 20 13:51:00 2024 +0000
-+++ b/build/pgo/profileserver.py Sat Feb 24 22:47:17 2024 -0800
-@@ -93,19 +93,32 @@
- ),
- path_mappings=path_mappings,
- )
- sp3_httpd.start(block=False)
- print("started SP3 server on port 8000")
+diff -up a/build/pgo/profileserver.py b/build/pgo/profileserver.py
+--- a/build/pgo/profileserver.py 2025-05-26 17:14:58.234802697 +0300
++++ b/build/pgo/profileserver.py 2025-05-26 17:18:38.000686313 +0300
+@@ -97,9 +97,22 @@ if __name__ == "__main__":
locations = ServerLocations()
locations.add_host(host="127.0.0.1", port=PORT,
options="primary,privileged")
@@ -55,18 +50,13 @@ diff -r ac0e1ee8218f build/pgo/profileserver.py
+ for f in filenames:
+ if f.endswith('.gcda'):
+ os.remove(os.path.join(dirpath, f))
-+ else:
++ else
+ old_profraw_files = glob.glob('*.profraw')
-+ for f in old_profraw_files:
-+ os.remove(f)
++ for f in old_profraw_files:
++ os.remove(f)
with TemporaryDirectory() as profilePath:
# TODO: refactor this into mozprofile
- profile_data_dir = os.path.join(build.topsrcdir, "testing",
"profiles")
- with open(os.path.join(profile_data_dir, "profiles.json"), "r") as
fh:
- base_profiles = json.load(fh)["profileserver"]
-
- prefpaths = [
@@ -222,16 +235,21 @@
# Try to move the crash reports to the artifacts even if Firefox
appears
diff --git a/http/firefox/patches/0022-bgo-928126-enable-jxl.patch
b/http/firefox/patches/0022-bgo-928126-enable-jxl.patch
new file mode 100644
index 0000000..bc2f865
--- /dev/null
+++ b/http/firefox/patches/0022-bgo-928126-enable-jxl.patch
@@ -0,0 +1,21 @@
+diff --git a/toolkit/moz.configure b/toolkit/moz.configure
+index c99b4d628c54..0b1b1614620a 100644
+--- a/toolkit/moz.configure
++++ b/toolkit/moz.configure
+@@ -703,9 +703,10 @@ set_define("MOZ_AV1", av1)
+ option("--disable-jxl", help="Disable jxl image support")
+
+
+-@depends("--disable-jxl", milestone.is_nightly)
+-def jxl(value, is_nightly):
+- if is_nightly and value:
++@depends("--disable-jxl")
++def jxl(value):
++ enabled = bool(value)
++ if enabled:
+ return True
+
+
+--
+2.38.1
+
diff --git
a/http/firefox/patches/0022-bmo-1790526-check-for-propagated-BrowsingContext-in-SessionStoreParent.patch
b/http/firefox/patches/0022-bmo-1790526-check-for-propagated-BrowsingContext-in-SessionStoreParent.patch
deleted file mode 100644
index 54a4c2b..0000000
---
a/http/firefox/patches/0022-bmo-1790526-check-for-propagated-BrowsingContext-in-SessionStoreParent.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-
-# HG changeset patch
-# User Eden Chuang <echuang AT mozilla.com>
-# Date 1744130274 0
-# Node ID 4159736c2897215a6d22fc33272e05e370d50f5c
-# Parent 11dc373cc55d14b1ca924ae63703cab228e8b1e1
-Bug 1790526 - Handle the discarded BrowsingContext that propagated to
SessionStoreParent. r=smaug
-
-According to the Pernosco trace, https://static.pernos.co/server/7c640bc4ed587e824fab0ca8aa44f41d1b5595b5/rebuilding.html?redirect=https%3A%2F%2Fpernos.co%2Fdebug%2FAKTDVC62g_oHMo8GmtoA1g%2Findex.html,
this is a case that the propagated BrowingContext has been discarded
already, so it causes aBrowsingContext.GetMaybeDiscarded() get a nullptr.
-
-This patch just check if the propageted BrowsingContext is discarded.
-For the discarded BrowsingContext, try to use its BrowsingContextId to get
the corresponding CanonicalBrowsingContext instead of using the propagated
one.
-
-Differential Revision: https://phabricator.services.mozilla.com/D237702
-
-diff --git a/toolkit/components/sessionstore/SessionStoreParent.cpp
b/toolkit/components/sessionstore/SessionStoreParent.cpp
---- a/toolkit/components/sessionstore/SessionStoreParent.cpp
-+++ b/toolkit/components/sessionstore/SessionStoreParent.cpp
-@@ -194,36 +194,57 @@ mozilla::ipc::IPCResult SessionStorePare
- return IPC_OK();
- }
-
- mozilla::ipc::IPCResult
SessionStoreParent::RecvIncrementalSessionStoreUpdate(
- const MaybeDiscarded<BrowsingContext>& aBrowsingContext,
- const Maybe<FormData>& aFormData, const Maybe<nsPoint>& aScrollPosition,
- uint32_t aEpoch) {
- if (!aBrowsingContext.IsNull()) {
-+ // The passed in BrowsingContext maybe already discarded and its
mRawPtr is
-+ // nullptr here. Let try to use the BrowsingContextId to get its
-+ // Canonical one in the parent process for SessionStore update.
-+ RefPtr<CanonicalBrowsingContext> bc;
-+ if (aBrowsingContext.IsDiscarded()) {
-+ bc = CanonicalBrowsingContext::Get(aBrowsingContext.ContextId());
-+ } else {
-+ bc = aBrowsingContext.GetMaybeDiscarded()->Canonical();
-+ }
-+ if (!bc) {
-+ return IPC_OK();
-+ }
- if (aFormData.isSome()) {
- mHasNewFormData = true;
- }
- if (aScrollPosition.isSome()) {
- mHasNewScrollPosition = true;
- }
-
-- mSessionStore->UpdateSessionStore(
-- aBrowsingContext.GetMaybeDiscarded()->Canonical(), aFormData,
-- aScrollPosition, aEpoch);
-+ mSessionStore->UpdateSessionStore(bc, aFormData, aScrollPosition,
aEpoch);
- }
-
- return IPC_OK();
- }
-
- mozilla::ipc::IPCResult SessionStoreParent::RecvResetSessionStore(
- const MaybeDiscarded<BrowsingContext>& aBrowsingContext, uint32_t
aEpoch) {
- if (!aBrowsingContext.IsNull()) {
-- mSessionStore->RemoveSessionStore(
-- aBrowsingContext.GetMaybeDiscarded()->Canonical());
-+ // The passed in BrowsingContext maybe already discarded and its
mRawPtr is
-+ // nullptr here. Let try to use the BrowsingContextId to get its
-+ // Canonical one in the parent process for SessionStore update.
-+ RefPtr<CanonicalBrowsingContext> bc;
-+ if (aBrowsingContext.IsDiscarded()) {
-+ bc = CanonicalBrowsingContext::Get(aBrowsingContext.ContextId());
-+ } else {
-+ bc = aBrowsingContext.GetMaybeDiscarded()->Canonical();
-+ }
-+ if (!bc) {
-+ return IPC_OK();
-+ }
-+ mSessionStore->RemoveSessionStore(bc);
- }
- return IPC_OK();
- }
-
- void SessionStoreParent::SessionStoreUpdate(
- const Maybe<nsCString>& aDocShellCaps, const Maybe<bool>& aPrivatedMode,
- const MaybeSessionStoreZoom& aZoom, const bool aNeedCollectSHistory,
- const uint32_t& aEpoch) {
-
diff --git a/http/firefox/patches/0023-bgo-928126-enable-jxl.patch
b/http/firefox/patches/0023-bgo-928126-enable-jxl.patch
deleted file mode 100644
index 0871479..0000000
--- a/http/firefox/patches/0023-bgo-928126-enable-jxl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- firefox-133.0.3/toolkit/moz.configure 2025-01-04 17:08:20.913796937
+0100
-+++ firefox-133.0.3/toolkit/moz.configure 2025-01-04 17:09:45.509650260
+0100
-@@ -871,7 +871,6 @@
-
- @depends("--disable-jxl", milestone.is_nightly)
- def jxl(value, is_nightly):
-- if is_nightly and value:
- return True
-
-
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (89793d04d1d60dc0fbd3438cef78d86f60d315d2),
Pavel Vinogradov, 05/26/2025