From c5356e9e419070c7acde04170d6747cf4a09458b Mon Sep 17 00:00:00 2001 From: daijro Date: Sun, 18 Aug 2024 04:30:45 -0500 Subject: [PATCH] Cleanup & bump to v129.0-beta.4 - Rename /dom/mask -> /camoucfg - Rename auto-pin-extensions.patch -> pin-addons.patch - Remove redundant comment in juggler/content/FrameTree.js --- .../{dom/mask => camoucfg}/MaskConfig.hpp | 0 additions/{dom/mask => camoucfg}/json.hpp | 0 additions/{dom/mask => camoucfg}/moz.build | 2 +- additions/juggler/content/FrameTree.js | 1 - patches/fingerprint-injection.patch | 32 ++++++------------- patches/font-hijacker.patch | 4 +-- patches/network-patches.patch | 2 +- ...-pin-extensions.patch => pin-addons.patch} | 0 patches/screen-hijacker.patch | 2 +- patches/webrtc-ip-spoofing.patch | 2 +- upstream.sh | 2 +- 11 files changed, 17 insertions(+), 30 deletions(-) rename additions/{dom/mask => camoucfg}/MaskConfig.hpp (100%) rename additions/{dom/mask => camoucfg}/json.hpp (100%) rename additions/{dom/mask => camoucfg}/moz.build (96%) rename patches/{auto-pin-extensions.patch => pin-addons.patch} (100%) diff --git a/additions/dom/mask/MaskConfig.hpp b/additions/camoucfg/MaskConfig.hpp similarity index 100% rename from additions/dom/mask/MaskConfig.hpp rename to additions/camoucfg/MaskConfig.hpp diff --git a/additions/dom/mask/json.hpp b/additions/camoucfg/json.hpp similarity index 100% rename from additions/dom/mask/json.hpp rename to additions/camoucfg/json.hpp diff --git a/additions/dom/mask/moz.build b/additions/camoucfg/moz.build similarity index 96% rename from additions/dom/mask/moz.build rename to additions/camoucfg/moz.build index fb6b421..c7f06bf 100644 --- a/additions/dom/mask/moz.build +++ b/additions/camoucfg/moz.build @@ -13,7 +13,7 @@ EXPORTS += [ LOCAL_INCLUDES += [ "/dom/base", - "/dom/mask", + "/camoucfg", ] FINAL_LIBRARY = "xul" \ No newline at end of file diff --git a/additions/juggler/content/FrameTree.js b/additions/juggler/content/FrameTree.js index e4c4f8d..939cbec 100644 --- a/additions/juggler/content/FrameTree.js +++ b/additions/juggler/content/FrameTree.js @@ -559,7 +559,6 @@ class Frame { } _onGlobalObjectCleared() { - // Causing leaks. const webSocketService = this._frameTree._webSocketEventService; if (this._webSocketListenerInnerWindowId && webSocketService.hasListenerFor(this._webSocketListenerInnerWindowId)) webSocketService.removeListener(this._webSocketListenerInnerWindowId, this._webSocketListener); diff --git a/patches/fingerprint-injection.patch b/patches/fingerprint-injection.patch index c278d6d..d934d9c 100644 --- a/patches/fingerprint-injection.patch +++ b/patches/fingerprint-injection.patch @@ -1,5 +1,5 @@ diff --git a/browser/app/moz.build b/browser/app/moz.build -index 434167c996..c6b47bc835 100644 +index 434167c996..e18a16aee0 100644 --- a/browser/app/moz.build +++ b/browser/app/moz.build @@ -174,3 +174,6 @@ for icon in ("firefox", "document", "newwindow", "newtab", "pbmode", "document_p @@ -8,7 +8,7 @@ index 434167c996..c6b47bc835 100644 ) + +# DOM Mask -+LOCAL_INCLUDES += ["/dom/mask"] ++LOCAL_INCLUDES += ["/camoucfg"] \ No newline at end of file diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index 807cb4ec25..3df0e0f70f 100644 @@ -226,7 +226,7 @@ index 8e577bd9fd..3ed748a75f 100644 BrowsingContext* bc = docshell ? docshell->GetBrowsingContext() : nullptr; diff --git a/dom/base/moz.build b/dom/base/moz.build -index 114402c4a1..a883a2493f 100644 +index 114402c4a1..55daeabe7a 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -641,3 +641,6 @@ GeneratedFile( @@ -235,7 +235,7 @@ index 114402c4a1..a883a2493f 100644 ) + +# DOM Mask -+LOCAL_INCLUDES += ["/dom/mask"] ++LOCAL_INCLUDES += ["/camoucfg"] \ No newline at end of file diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp index 3678ebc59c..03a72fe242 100644 @@ -452,7 +452,7 @@ index a42ac3017d..fadae4a714 100644 if (Preferences::GetBool("dom.battery.test.default")) { return 1.0; diff --git a/dom/battery/moz.build b/dom/battery/moz.build -index 3a90c93c01..35e3227f5e 100644 +index 3a90c93c01..91d673039b 100644 --- a/dom/battery/moz.build +++ b/dom/battery/moz.build @@ -21,3 +21,6 @@ FINAL_LIBRARY = "xul" @@ -461,7 +461,7 @@ index 3a90c93c01..35e3227f5e 100644 MOCHITEST_MANIFESTS += ["test/mochitest.toml"] + +# DOM Mask -+LOCAL_INCLUDES += ["/dom/mask"] ++LOCAL_INCLUDES += ["/camoucfg"] \ No newline at end of file diff --git a/dom/canvas/ClientWebGLContext.cpp b/dom/canvas/ClientWebGLContext.cpp index 4e43425ef9..26bbfdc868 100644 @@ -498,7 +498,7 @@ index 4e43425ef9..26bbfdc868 100644 break; diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build -index 3a533d36d1..8697f8c21f 100644 +index 3a533d36d1..41d74d9b3f 100644 --- a/dom/canvas/moz.build +++ b/dom/canvas/moz.build @@ -221,3 +221,6 @@ if CONFIG["CC_TYPE"] == "gcc": @@ -507,19 +507,7 @@ index 3a533d36d1..8697f8c21f 100644 include("/tools/fuzzing/libfuzzer-config.mozbuild") + +# DOM Mask -+LOCAL_INCLUDES += ["/dom/mask"] -\ No newline at end of file -diff --git a/dom/moz.build b/dom/moz.build -index 88fc49cb73..3d73af36c0 100644 ---- a/dom/moz.build -+++ b/dom/moz.build -@@ -116,3 +116,6 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("gtk", "cocoa", "windows"): - TEST_DIRS += ["plugins/test"] - - SPHINX_TREES["/dom"] = "docs" -+ -+# DOM Mask -+DIRS += ["mask"] ++LOCAL_INCLUDES += ["/camoucfg"] \ No newline at end of file diff --git a/dom/workers/WorkerNavigator.cpp b/dom/workers/WorkerNavigator.cpp index b05e409a84..8e0f7ea657 100644 @@ -580,7 +568,7 @@ index b05e409a84..8e0f7ea657 100644 MOZ_ASSERT(rts); diff --git a/dom/workers/moz.build b/dom/workers/moz.build -index c7818826d1..0be0753e20 100644 +index c7818826d1..2e2e6526e7 100644 --- a/dom/workers/moz.build +++ b/dom/workers/moz.build @@ -112,3 +112,6 @@ MARIONETTE_MANIFESTS += ["test/marionette/manifest.toml"] @@ -589,5 +577,5 @@ index c7818826d1..0be0753e20 100644 BROWSER_CHROME_MANIFESTS += ["test/browser.toml"] + +# DOM Mask -+LOCAL_INCLUDES += ["/dom/mask"] ++LOCAL_INCLUDES += ["/camoucfg"] \ No newline at end of file diff --git a/patches/font-hijacker.patch b/patches/font-hijacker.patch index 0906a46..08fd76c 100644 --- a/patches/font-hijacker.patch +++ b/patches/font-hijacker.patch @@ -37,7 +37,7 @@ index 3d99906827..a9d1191688 100644 include("/tools/fuzzing/libfuzzer-config.mozbuild") + +# DOM Mask -+LOCAL_INCLUDES += ["/dom/mask"] ++LOCAL_INCLUDES += ["/camoucfg"] \ No newline at end of file diff --git a/layout/style/FontFace.cpp b/layout/style/FontFace.cpp index f1a90334ea..47d3a881ac 100644 @@ -155,5 +155,5 @@ index a14ab6a7ac..6e6a727abf 100644 ] + +# DOM Mask -+LOCAL_INCLUDES += ["/dom/mask"] ++LOCAL_INCLUDES += ["/camoucfg"] \ No newline at end of file diff --git a/patches/network-patches.patch b/patches/network-patches.patch index 9b91942..e2b03f5 100644 --- a/patches/network-patches.patch +++ b/patches/network-patches.patch @@ -8,7 +8,7 @@ index b090a56d88..9fe4a5e1e8 100644 include("/tools/fuzzing/libfuzzer-config.mozbuild") + +# DOM Mask -+LOCAL_INCLUDES += ["/dom/mask"] ++LOCAL_INCLUDES += ["/camoucfg"] \ No newline at end of file diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index d0aebdf965..01472ec205 100644 diff --git a/patches/auto-pin-extensions.patch b/patches/pin-addons.patch similarity index 100% rename from patches/auto-pin-extensions.patch rename to patches/pin-addons.patch diff --git a/patches/screen-hijacker.patch b/patches/screen-hijacker.patch index 661dcd2..83d02ce 100644 --- a/patches/screen-hijacker.patch +++ b/patches/screen-hijacker.patch @@ -8,7 +8,7 @@ index a2b3e60fe5..56326fc038 100644 CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"] + +# DOM Mask -+LOCAL_INCLUDES += ["/dom/mask"] ++LOCAL_INCLUDES += ["/camoucfg"] \ No newline at end of file diff --git a/gfx/src/nsDeviceContext.cpp b/gfx/src/nsDeviceContext.cpp index 2bb53010a8..0ff718c0f1 100644 diff --git a/patches/webrtc-ip-spoofing.patch b/patches/webrtc-ip-spoofing.patch index 0d2aa53..6ea0624 100644 --- a/patches/webrtc-ip-spoofing.patch +++ b/patches/webrtc-ip-spoofing.patch @@ -187,5 +187,5 @@ index 05920fc151..34dcf3b9a1 100644 FINAL_LIBRARY = "xul" + +# DOM Mask -+LOCAL_INCLUDES += ["/dom/mask"] ++LOCAL_INCLUDES += ["/camoucfg"] \ No newline at end of file diff --git a/upstream.sh b/upstream.sh index 28b93a1..3f62bc6 100644 --- a/upstream.sh +++ b/upstream.sh @@ -1,2 +1,2 @@ version=129.0 -release=beta.3 +release=beta.4