Merge branch 'zen-browser:dev' into patch-2

.github/workflows/build.yml

@@ -16,10 +16,10 @@ on:
       update_branch:
         description: 'Update branch with new version'
         required: true
-        default: 'stable'
+        default: 'release'
         type: 'choice'
         options:
-          - 'stable'
+          - 'release'
           - 'twilight'
   workflow_call:
     inputs:
@@ -36,7 +36,7 @@ on:
       update_branch:
         description: 'Update branch with new version'
         required: true
-        default: 'stable'
+        default: 'release'
         type: 'string'
 
 jobs:
@@ -122,7 +122,7 @@ jobs:
           npm i -g @zen-browser/surfer
 
       - name: Bump version
-        if: ${{ inputs.update_version && inputs.update_branch == 'stable' }}
+        if: ${{ inputs.update_version && inputs.update_branch == 'release' }}
         run: |
           pnpm surfer ci --brand ${{ inputs.update_branch }} --bump prerelease
 
@@ -385,7 +385,7 @@ jobs:
 
           if [ "${{ inputs.update_branch }}" = "twilight" ]; then
             sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' AppDir/zen.desktop
-            sed -i -e 's/StartupWMClass=zen-stable/StartupWMClass=zen-twilight/g' AppDir/zen.desktop
+            sed -i -e 's/StartupWMClass=zen-release/StartupWMClass=zen-twilight/g' AppDir/zen.desktop
           fi
 
           APPDIR=AppDir
@@ -425,7 +425,7 @@ jobs:
     needs: [build-data, linux, windows-step-3, check-release, mac, appimage, source, lint]
     runs-on: ubuntu-latest
     environment:
-      name: ${{ inputs.update_branch == 'stable' && 'Deploy-Release' || 'Deploy-Twilight' }}
+      name: ${{ inputs.update_branch == 'release' && 'Deploy-Release' || 'Deploy-Twilight' }}
 
     steps:
       - name: Checkout repository
@@ -464,7 +464,7 @@ jobs:
           cp -a ../linux_update_manifest_x86_64/.  updates/
           cp -a ../linux_update_manifest_aarch64/.  updates/
 
-          if [[ $RELEASE_BRANCH == 'stable' ]]; then
+          if [[ $RELEASE_BRANCH == 'release' ]]; then
             cp -a ../.github/workflows/object/windows-x64-signed-x86_64/update_manifest/.  updates/
             cp -a ../.github/workflows/object/windows-x64-signed-arm64/update_manifest/.  updates/
           else
@@ -518,12 +518,12 @@ jobs:
 
       - name: Release
         uses: marvinpinto/action-automatic-releases@master
-        if: ${{ inputs.update_branch == 'stable' }}
+        if: ${{ inputs.update_branch == 'release' }}
         with:
           repo_token: '${{ secrets.DEPLOY_KEY }}'
           automatic_release_tag: ${{ needs.build-data.outputs.version }}
           prerelease: false
-          title: 'Stable build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
+          title: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
           files: |
             zen.source.tar.gz
             zen.linux-x86_64.tar.bz2
@@ -546,7 +546,7 @@ jobs:
             zen.macos-aarch64.dmg
 
   prepare-flatpak:
-    if: ${{ inputs.create_release && inputs.update_branch == 'stable' }}
+    if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
     permissions: write-all
     name: Prepare Flatpak
     needs: [release, linux, build-data]
@@ -605,7 +605,7 @@ jobs:
         run: sleep 120
 
   release-flatpak:
-    if: ${{ inputs.create_release && inputs.update_branch == 'stable' }}
+    if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
     permissions: write-all
     name: Release Flatpak
     needs: [prepare-flatpak, build-data]

AppDir/zen.desktop

@@ -5,7 +5,7 @@ Exec=zen %u
 Icon=zen
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
-StartupWMClass=zen-stable
+StartupWMClass=zen-release
 Categories=Network;WebBrowser;
 StartupNotify=true
 Terminal=false

build/winsign/sign.ps1

@@ -29,7 +29,7 @@ echo "Downloaded x86_64 artifacts"
 
 mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
 
-pnpm surfer ci --brand stable
+pnpm surfer ci --brand release
 
 function SignAndPackage($name) {
     echo "Executing on $name"

configs/common/mozconfig

@@ -25,6 +25,7 @@ export MOZ_INCLUDE_SOURCE_INFO=1
 ac_add_options --enable-application=browser
 
 if test "$ZEN_RELEASE"; then
+
   ac_add_options --enable-clang-plugin
   ac_add_options --enable-bootstrap
 
@@ -33,6 +34,7 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --disable-debug-symbols
   ac_add_options --disable-debug-js-modules
   ac_add_options --disable-tests
+  ac_add_options --disable-js-shell
 
   ac_add_options --disable-vtune
 

configs/windows/mozconfig

@@ -28,19 +28,17 @@ ac_add_options --disable-bits-download
 ac_add_options --disable-clang-plugin
 
 if test "$SURFER_COMPAT" = "x86_64"; then
-  # FIXME: For some reason, the clang plugin is not working on generic x86_64 builds
-  ac_add_options --disable-clang-plugin
 
   ac_add_options --target=x86_64-pc-windows-msvc
   ac_add_options --enable-eme=widevine
 
   ac_add_options --enable-optimize="-O3 -w -ftree-vectorize"
 
-  export CFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
-  export CPPFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
-  export CXXFLAGS="-flto=thin -mtune=haswell -march=x86-64 -O2 -Qvec -w"
-  export LDFLAGS="-Wl,-O2"
-  export RUSTFLAGS="-Clink-args=--icf=safe -C codegen-units=1 -Ctarget-cpu=x86-64"
+  export CFLAGS="-O3 -Qvec -w"
+  export CPPFLAGS="-O3 -Qvec -w"
+  export CXXFLAGS="-O3 -Qvec -w"
+  export LDFLAGS="-Wl,-O3"
+  export RUSTFLAGS="-Clink-args=--icf=safe"
 elif test "$SURFER_COMPAT" = "aarch64"; then
   ac_add_options --target=aarch64-pc-windows-msvc
   ac_add_options --enable-eme=widevine

docs/contribute.md

@@ -20,17 +20,3 @@ The `stable` branch may have hotfixes directly from the `stable` branch, and the
 # Code Of Conduct
 
 Please read our [Code of Conduct](../CODE_OF_CONDUCT.md) before contributing.
-
-# Releasing/Merging branches
-
-To merge zen twilight branch from the central branch, you can use the following command:
-
-```bash
-sh ./scripts/merge-to-branch.sh twilight
-```
-
-To merge zen stable branch from the twilight branch, you can use the following command:
-
-```bash
-sh ./scripts/merge-to-branch.sh stable
-```

package.json

@@ -36,7 +36,7 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.8.5"
+    "@zen-browser/surfer": "^1.8.6"
   },
   "devDependencies": {
     "husky": "^9.1.7",

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.8.5
-        version: 1.8.5(glob@7.2.3)
+        specifier: ^1.8.6
+        version: 1.8.6(glob@7.2.3)
     devDependencies:
       husky:
         specifier: ^9.1.7
@@ -122,8 +122,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.8.5':
-    resolution: {integrity: sha512-cOkQAoPo+EiTvOBFFcg0Gof52I7XkSEt4OfZZlX4mefk/55fS1Ac8hRyWmlsMsNKO+IBB6cE2VAudXycXIIDsQ==}
+  '@zen-browser/surfer@1.8.6':
+    resolution: {integrity: sha512-S/zGDRlMROdUqy6i6ZzhB8llMFi08XBJ2ypSQjwDKfiCtCB3oUGMPx7ahzI79cY0mvuTLpr5/NERKlR7Wq9nkA==}
     hasBin: true
 
   ansi-escapes@7.0.0:
@@ -1036,7 +1036,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.8.5(glob@7.2.3)':
+  '@zen-browser/surfer@1.8.6(glob@7.2.3)':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2

src/browser/base/content/zen-styles/zen-compact-mode.css

@@ -212,7 +212,7 @@
         & #zen-appcontent-navbar-container:focus-within,
         & #zen-appcontent-navbar-container[zen-user-show],
         & #zen-appcontent-navbar-container[has-popup-menu],
-        & #zen-appcontent-navbar-container:has(*[panelopen='true'], [open='true']) {
+        & #zen-appcontent-navbar-container:has(*:is([panelopen='true'], [open='true']):not(.zen-compact-mode-ignore)) {
           opacity: 1;
           border-top-width: 1px;
 

src/browser/components/tabbrowser/content/tabs-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..84359791101c500ed354da8d0b4bf3c7e8be4563 100644
+index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..8b594d9d13b60c51c6f9306e28178e75b5f49782 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -649,7 +649,7 @@
@@ -11,6 +11,15 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..84359791101c500ed354da8d0b4bf3c7
          let tabsPerRow = 0;
          let position = 0;
          for (let pinnedTab of pinnedTabs) {
+@@ -997,7 +997,7 @@
+           }
+         } else {
+           let pinned = draggedTab.pinned;
+-          let numPinned = gBrowser.pinnedTabCount;
++          let numPinned = gBrowser._numVisiblePinTabs;
+           let tabs = this.visibleTabs.slice(
+             pinned ? 0 : numPinned,
+             pinned ? numPinned : undefined
 @@ -1076,7 +1076,7 @@
                let postTransitionCleanup = () => {
                  tab.removeAttribute("tabdrop-samewindow");
@@ -67,6 +76,15 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..84359791101c500ed354da8d0b4bf3c7
        );
      }
  
+@@ -1778,7 +1780,7 @@
+           let rect = ele => {
+             return window.windowUtils.getBoundsWithoutFlushing(ele);
+           };
+-          let tab = this.visibleTabs[gBrowser.pinnedTabCount];
++          let tab = this.visibleTabs[gBrowser._numVisiblePinTabs];
+           if (tab && rect(tab).width <= this._tabClipWidth) {
+             this.setAttribute("closebuttons", "activetab");
+           } else {
 @@ -1790,10 +1792,12 @@
  
      _handleTabSelect(aInstant) {
@@ -158,6 +176,18 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..84359791101c500ed354da8d0b4bf3c7
          return;
        }
  
+@@ -2622,9 +2626,9 @@
+       function newIndex(aTab, index) {
+         // Don't allow mixing pinned and unpinned tabs.
+         if (aTab.pinned) {
+-          return Math.min(index, gBrowser.pinnedTabCount - 1);
++          return Math.min(index, gBrowser._numVisiblePinTabs - 1);
+         }
+-        return Math.max(index, gBrowser.pinnedTabCount);
++        return Math.max(index, gBrowser._numVisiblePinTabs);
+       }
+     }
+ 
 @@ -2726,12 +2730,14 @@
                selectedTab = {
                  left: selectedTab.left,

src/browser/components/urlbar/UrlbarInput-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..b08cb1d9fee5f76070c70ea928209b15b6146cb3 100644
+index 3ab07e5864b3bb200608e7f619645f92ade129fe..12fe08c48d5ca9f00253e0aa6ebbc867ff471c83 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
-@@ -65,6 +65,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
+@@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
    false
  );
  
@@ -16,17 +16,21 @@ index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..b08cb1d9fee5f76070c70ea928209b15
  const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
  const SEARCH_BUTTON_CLASS = "urlbar-search-button";
  
-@@ -2154,6 +2161,9 @@ export class UrlbarInput {
+@@ -2152,6 +2159,13 @@ export class UrlbarInput {
  
      this.setAttribute("breakout-extend", "true");
  
 +    if (lazy.ZEN_URLBAR_BEHAVIOR == 'float' || (lazy.ZEN_URLBAR_BEHAVIOR == 'floating-on-type' && !this.focusedViaMousedown)) {
 +      this.setAttribute("zen-floating-urlbar", "true");
-+    } else this.removeAttribute("zen-floating-urlbar");
++      this.classList.add("zen-floating-urlbar");
++    } else {
++      this.removeAttribute("zen-floating-urlbar");
++      this.classList.remove("zen-floating-urlbar");
++    }
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
      if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -3901,6 +3911,11 @@ export class UrlbarInput {
+@@ -3875,6 +3889,11 @@ export class UrlbarInput {
    }
  
    _on_click(event) {
@@ -38,7 +42,7 @@ index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..b08cb1d9fee5f76070c70ea928209b15
      if (
        event.target == this.inputField ||
        event.target == this._inputContainer ||
-@@ -4012,9 +4027,12 @@ export class UrlbarInput {
+@@ -3986,9 +4005,12 @@ export class UrlbarInput {
    }
  
    _on_mousedown(event) {
@@ -52,7 +56,7 @@ index c504c9afc43785b5f003bb1f9f1dfbddef38d78b..b08cb1d9fee5f76070c70ea928209b15
  
          if (
            event.target != this.inputField &&
-@@ -4024,8 +4042,8 @@ export class UrlbarInput {
+@@ -3998,8 +4020,8 @@ export class UrlbarInput {
            break;
          }
  

surfer.json

@@ -13,10 +13,10 @@
   },
   "addons": {},
   "brands": {
-    "stable": {
+    "release": {
       "backgroundColor": "#282A33",
       "brandShorterName": "Zen",
-      "brandShortName": "Zen Browser",
+      "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
         "displayVersion": "1.6b",
@@ -36,7 +36,7 @@
     "twilight": {
       "backgroundColor": "#282A33",
       "brandShorterName": "Zen",
-      "brandShortName": "Zen Twilight",
+      "brandShortName": "Zen",
       "brandFullName": "Zen Twilight",
       "release": {
         "displayVersion": "1.6t",