From f0b60391a8f742cbff0cf31f1f7e8c8abc2b787e Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Wed, 30 Apr 2025 14:47:46 +0200 Subject: [PATCH] fix: Fixed PGO builds for intel macos, b=(no-bug), c=common, workspaces --- src/testing/profiles/profileserver/user-js.patch | 5 +++-- src/zen/common/ZenUIManager.mjs | 6 +----- src/zen/common/styles/zen-urlbar.css | 2 +- src/zen/workspaces/ZenWorkspaces.mjs | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/testing/profiles/profileserver/user-js.patch b/src/testing/profiles/profileserver/user-js.patch index ccfcc06ae..902641c1d 100644 --- a/src/testing/profiles/profileserver/user-js.patch +++ b/src/testing/profiles/profileserver/user-js.patch @@ -1,8 +1,8 @@ diff --git a/testing/profiles/profileserver/user.js b/testing/profiles/profileserver/user.js -index 19ff7d474f6d22d2d386764e2e6942ce6a324470..b8a915b921e624c416d2ec379a2b54aedfcf9c36 100644 +index 19ff7d474f6d22d2d386764e2e6942ce6a324470..531446847039fd683af52ac7fdfd601bea3cb624 100644 --- a/testing/profiles/profileserver/user.js +++ b/testing/profiles/profileserver/user.js -@@ -8,3 +8,12 @@ +@@ -8,3 +8,13 @@ user_pref("dom.timeout.enable_budget_timer_throttling", false); // Turn off update user_pref("app.update.disabledForTesting", true); @@ -14,4 +14,5 @@ index 19ff7d474f6d22d2d386764e2e6942ce6a324470..b8a915b921e624c416d2ec379a2b54ae +user_pref("zen.watermark.enabled", false); +user_pref("zen.urlbar.replace-newtab", false); +user_pref("zen.testing.enabled", true); ++user_pref("zen.testing.profiling.enabled", true); +user_pref("dom.security.https_only_mode", false); // Dont ask why diff --git a/src/zen/common/ZenUIManager.mjs b/src/zen/common/ZenUIManager.mjs index 9e07487b8..da7266adc 100644 --- a/src/zen/common/ZenUIManager.mjs +++ b/src/zen/common/ZenUIManager.mjs @@ -66,11 +66,7 @@ var gZenUIManager = { tabs.style.removeProperty('flex'); tabs.style.maxHeight = height + 'px'; gZenVerticalTabsManager.actualWindowButtons.removeAttribute('zen-has-hover'); - try { - gURLBar.zenUpdateLayoutBreakout(); - } catch (error) { - console.error('Error updating layout breakout:', error); - } + gZenVerticalTabsManager.recalculateURLBarHeight(); if (!this._preventToolbarRebuild) { setTimeout(() => { ZenWorkspaces.updateTabsContainers(); diff --git a/src/zen/common/styles/zen-urlbar.css b/src/zen/common/styles/zen-urlbar.css index 0224c1b37..8d8d3d0e4 100644 --- a/src/zen/common/styles/zen-urlbar.css +++ b/src/zen/common/styles/zen-urlbar.css @@ -454,7 +454,7 @@ button.popup-notification-dropmarker { font-size: 1.5em !important; width: min(90%, 60rem) !important; } - top: 25vh !important; + top: 22svh !important; transform: translateX(-50%); left: 50% !important; diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs index 31f6d4d88..7662489ec 100644 --- a/src/zen/workspaces/ZenWorkspaces.mjs +++ b/src/zen/workspaces/ZenWorkspaces.mjs @@ -678,7 +678,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature { get workspaceEnabled() { if (typeof this._workspaceEnabled === 'undefined') { - this._workspaceEnabled = this.shouldHaveWorkspaces; + this._workspaceEnabled = this.shouldHaveWorkspaces && !Services.prefs.getBoolPref('zen.testing.profiling.enabled', false); } return this._workspaceEnabled && !window.closed; }