From 9c88e3a84fdaf2520b59da6fbba3d5ee050c2fe3 Mon Sep 17 00:00:00 2001 From: "mr. m" <91018726+mr-cheffy@users.noreply.github.com> Date: Thu, 7 May 2026 18:28:25 +0200 Subject: [PATCH] no-bug: Sync upstream Firefox to version `150.0.2` (gh-13601) --- README.md | 4 ++-- build/firefox-cache/l10n-last-commit-hash | 2 +- src/zen/glance/ZenGlanceManager.mjs | 12 +++++++----- src/zen/glance/actors/ZenGlanceChild.sys.mjs | 10 ++++++---- surfer.json | 6 +++--- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 7cce689f0..e97baf11b 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne ### Firefox Versions -- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `150.0.1`! 🚀 -- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 150.0.1`! +- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `150.0.2`! 🚀 +- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 150.0.2`! ### Contributing diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash index 11b9258f4..9b5d1a99d 100644 --- a/build/firefox-cache/l10n-last-commit-hash +++ b/build/firefox-cache/l10n-last-commit-hash @@ -1 +1 @@ -e097b3c5ca4139a5b88052379a776782e078356b \ No newline at end of file +73901ca17f4a2159dd4488cea8684e9abbfdcc89 \ No newline at end of file diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs index 9c738cd01..e2d83eb74 100644 --- a/src/zen/glance/ZenGlanceManager.mjs +++ b/src/zen/glance/ZenGlanceManager.mjs @@ -313,16 +313,18 @@ class nsZenGlanceManager extends nsZenDOMOperatedFeature { // content process since it does not take into account scroll. This way, we can // be sure that the coordinates are correct. const tabPanelsRect = gBrowser.tabpanels.getBoundingClientRect(); + const zoomLevel = + this.#currentParentTab?.linkedBrowser.browsingContext.fullZoom || 1; const rect = new DOMRect( - data.clientX + tabPanelsRect.left, - data.clientY + tabPanelsRect.top, - data.width, - data.height + data.clientX / zoomLevel + tabPanelsRect.left, + data.clientY / zoomLevel + tabPanelsRect.top, + data.width / zoomLevel, + data.height / zoomLevel ); return await this.#imageBitmapToObjectURL( await window.browsingContext.currentWindowGlobal.drawSnapshot( rect, - 1, + zoomLevel, "transparent", undefined ) diff --git a/src/zen/glance/actors/ZenGlanceChild.sys.mjs b/src/zen/glance/actors/ZenGlanceChild.sys.mjs index c5da67cd2..10d9fff14 100644 --- a/src/zen/glance/actors/ZenGlanceChild.sys.mjs +++ b/src/zen/glance/actors/ZenGlanceChild.sys.mjs @@ -66,11 +66,13 @@ export class ZenGlanceChild extends JSWindowActorChild { ) { rect = originalTargetRect; } + // Change the rect to make sure we take into account zoom. + const zoom = this.browsingContext.fullZoom; this.sendAsyncMessage("ZenGlance:RecordLinkClickData", { - clientX: rect.left, - clientY: rect.top, - width: rect.width, - height: rect.height, + clientX: rect.left * zoom, + clientY: rect.top * zoom, + width: rect.width * zoom, + height: rect.height * zoom, }); } diff --git a/surfer.json b/surfer.json index 74a24c493..7a146831c 100644 --- a/surfer.json +++ b/surfer.json @@ -5,8 +5,8 @@ "binaryName": "zen", "version": { "product": "firefox", - "version": "150.0.1", - "candidate": "150.0.1", + "version": "150.0.2", + "candidate": "150.0.2", "candidateBuild": 1 }, "buildOptions": { @@ -20,7 +20,7 @@ "brandShortName": "Zen", "brandFullName": "Zen Browser", "release": { - "displayVersion": "1.19.11b", + "displayVersion": "1.19.12b", "github": { "repo": "zen-browser/desktop" },