mirror of
https://github.com/zen-browser/desktop.git
synced 2026-04-28 18:24:20 +00:00
chore: Sync upstream Firefox to version 147.0, p=#11822
* chore: Sync upstream to `Firefox 147.0` * chore: Continued migration, b=no-bug, c=tests * chore: Finish migration without testing, b=no-bug, c=scripts, tabs, media, common, split-view * feat: Finish migration, b=no-bug, c=common, compact-mode, split-view, workspaces * feat: Finish basic migration, b=no-bug, c=kbs, common, folders * feat: Update surfer, b=no-bug, c=scripts
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git a/toolkit/actors/PictureInPictureChild.sys.mjs b/toolkit/actors/PictureInPictureChild.sys.mjs
|
||||
index 25ae1e984e3dbd610b60930492e1fa63ef889b9a..2680f2bdabf9884bc2c68b2db7b2fbedbb8af317 100644
|
||||
index 36652b2d70fd5131d56710a27e7cba350d032da8..13ebbf99b5517b635272d02db740bd3aee1b9ce4 100644
|
||||
--- a/toolkit/actors/PictureInPictureChild.sys.mjs
|
||||
+++ b/toolkit/actors/PictureInPictureChild.sys.mjs
|
||||
@@ -295,6 +295,7 @@ export class PictureInPictureLauncherChild extends JSWindowActorChild {
|
||||
@@ -296,6 +296,7 @@ export class PictureInPictureLauncherChild extends JSWindowActorChild {
|
||||
if (
|
||||
video &&
|
||||
PictureInPictureChild.videoIsPlaying(video) &&
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
|
||||
index ad325b45b882e8444b1b4bfc9c78950cf090b411..14f7d840bb91dfef0887537ef95de733d5591265 100644
|
||||
index 098742100858b266aebc8f764f918c85815f3c5f..71b8f8d71d48229fc96d6c84c635d09012a82250 100644
|
||||
--- a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
|
||||
+++ b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
|
||||
@@ -122,6 +122,9 @@ export class PictureInPictureToggleParent extends JSWindowActorParent {
|
||||
@@ -12,7 +12,7 @@ index ad325b45b882e8444b1b4bfc9c78950cf090b411..14f7d840bb91dfef0887537ef95de733
|
||||
let actor = browsingContext.currentWindowGlobal.getActor(
|
||||
"PictureInPictureLauncher"
|
||||
);
|
||||
@@ -490,7 +493,7 @@ export var PictureInPicture = {
|
||||
@@ -493,7 +496,7 @@ export var PictureInPicture = {
|
||||
// focus the tab's window
|
||||
tab.ownerGlobal.focus();
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/toolkit/components/pictureinpicture/content/player.js b/toolkit/components/pictureinpicture/content/player.js
|
||||
index 8a1088b318dfd321b4e5f34819c689a10e7f87b2..8d1816b27a0c88ab41b654249ae52111129edbf5 100644
|
||||
index 34d92dcfba54de4752036d0e251243729b6c9626..20a0399e3bf6f9827f805ea6975b801ae269646d 100644
|
||||
--- a/toolkit/components/pictureinpicture/content/player.js
|
||||
+++ b/toolkit/components/pictureinpicture/content/player.js
|
||||
@@ -760,6 +760,11 @@ let Player = {
|
||||
@@ -764,6 +764,11 @@ let Player = {
|
||||
document.getElementById("large").click();
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/toolkit/content/widgets/browser-custom-element.mjs b/toolkit/content/widgets/browser-custom-element.mjs
|
||||
index 98cbfdbe56bccc954aecca2b12950c74842fe201..303c86f29b532a7139f36f3cd86dfc72d2df8ab5 100644
|
||||
index bd950fab1b2382738297dff429ad9e6cc68e1ddb..dfda3b7cffec5c3ff35079761283c9baa43951ce 100644
|
||||
--- a/toolkit/content/widgets/browser-custom-element.mjs
|
||||
+++ b/toolkit/content/widgets/browser-custom-element.mjs
|
||||
@@ -495,11 +495,11 @@ export class MozBrowser extends MozElements.MozElementMixin(XULFrameElement) {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/toolkit/content/widgets/findbar.js b/toolkit/content/widgets/findbar.js
|
||||
index 589d96886b1c9a1bd0e819957978a8968402e98b..4df4be8dbbe67063f0e1920baa2db3f5b909b11b 100644
|
||||
index b66dce5bea757fdf6a9bbd656551d876e47aa8a3..bdfb6331d7ebfb283290b1c97601b743421194e3 100644
|
||||
--- a/toolkit/content/widgets/findbar.js
|
||||
+++ b/toolkit/content/widgets/findbar.js
|
||||
@@ -1188,6 +1188,7 @@
|
||||
@@ -1189,6 +1189,7 @@
|
||||
* e.g. <command name="cmd_find" oncommand="gFindBar.onFindCommand();"/>
|
||||
*/
|
||||
onFindCommand() {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
|
||||
index 4f5886c6142f8061f40a54aa3a5d99e47fd4d5ea..c57e169f5c73c4bc9b8253dd99ddb7f3c4547364 100644
|
||||
index 7f6e075c818a6aefdcbdfb8ab04df8daa07499d5..9e2d05a9ce02630b8305d5642b6c0d7cbafb10b2 100644
|
||||
--- a/toolkit/content/widgets/tabbox.js
|
||||
+++ b/toolkit/content/widgets/tabbox.js
|
||||
@@ -11,6 +11,23 @@
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/toolkit/modules/LightweightThemeConsumer.sys.mjs b/toolkit/modules/LightweightThemeConsumer.sys.mjs
|
||||
index 57d5bf70c2584359f09b03932852a6e3fafb1008..39a798817f1a3e4a77a95fc04e9697c7b93ee044 100644
|
||||
index c12ba1cd3891dab6ccf07e0ee069d44cc11f3c8f..d7e35aa2dc93629f74e62d6437e3a064242e8974 100644
|
||||
--- a/toolkit/modules/LightweightThemeConsumer.sys.mjs
|
||||
+++ b/toolkit/modules/LightweightThemeConsumer.sys.mjs
|
||||
@@ -32,7 +32,7 @@ const toolkitVariableMap = [
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/toolkit/modules/ShortcutUtils.sys.mjs b/toolkit/modules/ShortcutUtils.sys.mjs
|
||||
index e52e88a09a281e69ecf15e7b84b8b98736e1dbdd..f47fbe24e0860195e11fe5231ab27e52aad96d0b 100644
|
||||
index 0a2a5ac202fe7fbdd1540254db847d59c3fe2a88..fca3cd0719e51ffa745e8dac050dcefc7bc70f93 100644
|
||||
--- a/toolkit/modules/ShortcutUtils.sys.mjs
|
||||
+++ b/toolkit/modules/ShortcutUtils.sys.mjs
|
||||
@@ -414,13 +414,11 @@ export var ShortcutUtils = {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
|
||||
index 52bca068f90cd8e214900e8f3159e1f7e37fb3e8..bfb5a38258141ed28def7c9a340a61253b0e3274 100644
|
||||
index 226d0c5a93a9a2404e1974001da4e34b7b670067..18ac234b577eb514d3ef3467e24fceb0eb1ec8f8 100644
|
||||
--- a/toolkit/moz.configure
|
||||
+++ b/toolkit/moz.configure
|
||||
@@ -22,6 +22,7 @@ def check_moz_app_id(moz_app_id, build_project):
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
|
||||
index 3562dfc61f6462a4e46ff321d4df4df23f48949d..2afc42cae98a24ecfd129c8a3dd1e7e0a94882ab 100644
|
||||
index 4fe6aaa127d12bfebb9b246cf1bcaeb78aeef506..879831ff1f979f38c677b941fae447f876999d35 100644
|
||||
--- a/toolkit/mozapps/extensions/AddonManager.sys.mjs
|
||||
+++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs
|
||||
@@ -1243,12 +1243,12 @@ var AddonManagerInternal = {
|
||||
@@ -1278,12 +1278,12 @@ var AddonManagerInternal = {
|
||||
ITEM_VERSION: aAddon.version,
|
||||
ITEM_STATUS: addonStatus,
|
||||
APP_ID: Services.appinfo.ID,
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.css b/toolkit/mozapps/extensions/content/aboutaddons.css
|
||||
index 60c64468fb23abc68296ebbe1a6fb7a260ab509c..25b93a2c6b587a50e9a900e822ef06e64959c7d0 100644
|
||||
index da127019467107973300b4df8d9b95e8bfb0e05c..bcee9583654609bdcba55605eebb97be8bec286e 100644
|
||||
--- a/toolkit/mozapps/extensions/content/aboutaddons.css
|
||||
+++ b/toolkit/mozapps/extensions/content/aboutaddons.css
|
||||
@@ -105,6 +105,13 @@ h2 {
|
||||
@@ -106,6 +106,13 @@ h2 {
|
||||
.category[name="theme"] {
|
||||
background-image: url("chrome://mozapps/skin/extensions/category-themes.svg");
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
|
||||
index f1166fb9b8251ee7d631c53c443e5986cbf4d29d..9233941bbdbf235c0ce6ce9b680002f2023d659c 100644
|
||||
index 978d0ac8ae4a82947424c13c20d0f1d274dffe10..e5c7c489f7fff0661f103cdb383364bc8aa423a8 100644
|
||||
--- a/toolkit/themes/shared/aboutReader.css
|
||||
+++ b/toolkit/themes/shared/aboutReader.css
|
||||
@@ -1187,3 +1187,43 @@ pre code {
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/toolkit/themes/shared/design-system/tokens-brand.css b/toolkit/themes/shared/design-system/tokens-brand.css
|
||||
index 3ad65bc44fe06be77c4e5e679bb52bd0813cc972..3906b0bbcbbe6149ed7131460305074f079090a7 100644
|
||||
--- a/toolkit/themes/shared/design-system/tokens-brand.css
|
||||
+++ b/toolkit/themes/shared/design-system/tokens-brand.css
|
||||
@@ -6,6 +6,7 @@
|
||||
* and run `npm run build` to see your changes. */
|
||||
|
||||
@import url("chrome://global/skin/design-system/tokens-shared.css");
|
||||
+@import url("chrome://browser/content/zen-styles/zen-theme.css");
|
||||
|
||||
@layer tokens-foundation {
|
||||
:root,
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
|
||||
index 41f65a1f2c3065631780b02d820f632abdf542af..d15ff979c5d2deecca3d232f68551bec10ba6b8f 100644
|
||||
index c1acf2d6ab3c9a260e73d43af027f34a807e01dc..dbef9778a1582881dd83f4a1dde455308719b2be 100644
|
||||
--- a/toolkit/themes/shared/in-content/common-shared.css
|
||||
+++ b/toolkit/themes/shared/in-content/common-shared.css
|
||||
@@ -66,7 +66,7 @@
|
||||
@@ -63,7 +63,7 @@
|
||||
* this in forced colors mode, as we should be using system colours then.
|
||||
*/
|
||||
:root[dialogroot] {
|
||||
@@ -11,7 +11,7 @@ index 41f65a1f2c3065631780b02d820f632abdf542af..d15ff979c5d2deecca3d232f68551bec
|
||||
}
|
||||
}
|
||||
|
||||
@@ -702,7 +702,7 @@ html|*#categories[last-input-type="mouse"] > html|button.category:focus-visible
|
||||
@@ -696,7 +696,7 @@ html|*#categories[last-input-type="mouse"] > html|button.category:focus-visible
|
||||
fill-opacity: 1;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ index 41f65a1f2c3065631780b02d820f632abdf542af..d15ff979c5d2deecca3d232f68551bec
|
||||
:root {
|
||||
--in-content-sidebar-width: 118px;
|
||||
}
|
||||
@@ -1092,7 +1092,7 @@ xul|*.sidebar-footer-link {
|
||||
@@ -1078,7 +1078,7 @@ xul|*.sidebar-footer-link {
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/toolkit/themes/shared/pictureinpicture/player.css b/toolkit/themes/shared/pictureinpicture/player.css
|
||||
index 67d04f0f5a2ec003c4fa484df72c070afaa825c7..7cb0839d44c5c1988bc8a62d14ecd5e8cb581e2f 100644
|
||||
index 2e502fb075546bab4349f3da97069e764528d763..4ff7f2ee47085c2d2131f54a647468fab81c7d88 100644
|
||||
--- a/toolkit/themes/shared/pictureinpicture/player.css
|
||||
+++ b/toolkit/themes/shared/pictureinpicture/player.css
|
||||
@@ -738,3 +738,17 @@ input:checked + .slider::before {
|
||||
|
||||
Reference in New Issue
Block a user