Bump v20.0.0-nightly.20220429

* refactor: better solution for resizable frameless DCHECK

* fix: also implement TargetForRectin WinFrameView

.circleci/config.yml

@@ -14,7 +14,7 @@ parameters:
     type: boolean
     default: false
   
-  upload-to-storage:
+  upload-to-s3:
     type: string
     default: '1'
 

.circleci/config/base.yml

@@ -5,7 +5,7 @@ parameters:
     type: boolean
     default: false
   
-  upload-to-storage:
+  upload-to-s3:
     type: string
     default: '1'
 
@@ -53,8 +53,14 @@ executors:
         description: "macOS executor size"
         type: enum
         enum: ["macos.x86.medium.gen2", "large"]
+      xcode:
+        description: "xcode version"
+        default: 13.3.0
+        type: enum
+        enum: ["12.4.0", "13.3.0"]
+
     macos:
-      xcode: 13.3.0
+      xcode: << parameters.xcode >>
     resource_class: << parameters.size >>
 
   # Electron Runners
@@ -119,9 +125,6 @@ env-apple-silicon: &env-apple-silicon
   USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1
   npm_config_arch: arm64
 
-env-runner: &env-runner
-  IS_ELECTRON_RUNNER: 1
-
 env-arm64: &env-arm64
   GN_EXTRA_ARGS: 'target_cpu = "arm64" fatal_linker_warnings = false enable_linux_installer = false'
   MKSNAPSHOT_TOOLCHAIN: //build/toolchain/linux:clang_arm64
@@ -216,7 +219,6 @@ step-maybe-cleanup-arm64-mac: &step-maybe-cleanup-arm64-mac
         rm -rf ~/Library/Application\ Support/electron*
         security delete-generic-password -l "Chromium Safe Storage" || echo "✓ Keychain does not contain password from tests"
         security delete-generic-password -l "Electron Test Main Safe Storage" || echo "✓ Keychain does not contain password from tests"
-        security delete-generic-password -a "electron-safe-storage" || echo "✓ Keychain does not contain password from tests"
       elif [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
         XVFB=/usr/bin/Xvfb
         /sbin/start-stop-daemon --stop --exec $XVFB || echo "Xvfb not running"
@@ -347,7 +349,7 @@ step-wait-for-goma: &step-wait-for-goma
           sleep 5
       done
       echo "Goma ready"
-    no_output_timeout: 5m
+    no_output_timeout: 2m
 
 step-restore-brew-cache: &step-restore-brew-cache
   restore_cache:
@@ -455,7 +457,7 @@ step-delete-git-directories: &step-delete-git-directories
     command: |
       if [ "`uname`" == "Darwin" ]; then
         cd src
-        ( find . -type d -name ".git" -not -path "./third_party/angle/*" -not -path "./third_party/dawn/*" -not -path "./electron/*" ) | xargs rm -rf
+        ( find . -type d -name ".git" -not -path "./third_party/angle/*" -not -path "./third_party/dawn/*" ) | xargs rm -rf
       fi
 
 # On macOS the yarn install command during gclient sync was run on a linux
@@ -471,13 +473,6 @@ step-install-npm-deps-on-mac: &step-install-npm-deps-on-mac
         node script/yarn install
       fi
 
-step-install-npm-deps: &step-install-npm-deps
-  run:
-    name: Install node_modules
-    command: |
-      cd src/electron
-      node script/yarn install --frozen-lockfile
-
 # This step handles the differences between the linux "gclient sync"
 # and the expected state on macOS
 step-fix-sync: &step-fix-sync
@@ -509,7 +504,6 @@ step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
     name: Import and trust self-signed codesigning cert on MacOS
     command: |
       if  [ "$TARGET_ARCH" != "arm64" ] && [ "`uname`" == "Darwin" ]; then
-        sudo security authorizationdb write com.apple.trust-settings.admin allow
         cd src/electron
         ./script/codesign/generate-identity.sh
       fi
@@ -526,6 +520,15 @@ step-install-gnutar-on-mac: &step-install-gnutar-on-mac
         ln -fs /usr/local/bin/gtar /usr/local/bin/tar
       fi
 
+step-install-python2-on-mac: &step-install-python2-on-mac
+  run:
+    name: Install python2 on macos
+    command: |
+      if [ "`uname`" == "Darwin" ]; then
+        curl -O https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg
+        sudo installer -pkg python-2.7.18-macosx10.9.pkg -target /
+      fi
+
 step-gn-gen-default: &step-gn-gen-default
   run:
     name: Default GN gen
@@ -548,7 +551,7 @@ step-gn-check: &step-gn-check
 step-electron-build: &step-electron-build
   run:
     name: Electron build
-    no_output_timeout: 60m
+    no_output_timeout: 30m
     command: |
       # On arm platforms we generate a cross-arch ffmpeg that ninja does not seem
       # to realize is not correct / should be rebuilt.  We delete it here so it is
@@ -634,9 +637,9 @@ step-electron-publish: &step-electron-publish
       fi
 
       cd src/electron
-      if [ "$UPLOAD_TO_STORAGE" == "1" ]; then
-        echo 'Uploading Electron release distribution to Azure'
-        script/release/uploaders/upload.py --verbose --UPLOAD_TO_STORAGE
+      if [ "$UPLOAD_TO_S3" == "1" ]; then
+        echo 'Uploading Electron release distribution to S3'
+        script/release/uploaders/upload.py --verbose --upload_to_s3
       else
         echo 'Uploading Electron release distribution to Github releases'
         script/release/uploaders/upload.py --verbose
@@ -651,6 +654,7 @@ step-persist-data-for-tests: &step-persist-data-for-tests
       - src/out/Default/mksnapshot.zip
       - src/out/Default/chromedriver.zip
       - src/out/Default/gen/node_headers
+      - src/out/Default/overlapped-checker
       - src/out/ffmpeg/ffmpeg.zip
       - src/electron
       - src/third_party/electron_node
@@ -826,7 +830,7 @@ step-maybe-zip-symbols: &step-maybe-zip-symbols
       cd src
       export BUILD_PATH="$PWD/out/Default"
       ninja -C out/Default electron:licenses
-      ninja -C out/Default electron:electron_version_file
+      ninja -C out/Default electron:electron_version
       DELETE_DSYMS_AFTER_ZIP=1 electron/script/zip-symbols.py -b $BUILD_PATH
 
 step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
@@ -886,12 +890,12 @@ step-touch-sync-done: &step-touch-sync-done
 step-maybe-restore-src-cache: &step-maybe-restore-src-cache
   restore_cache:
     keys:
-      - v16-src-cache-{{ checksum "src/electron/.depshash" }}
+      - v14-src-cache-{{ checksum "src/electron/.depshash" }}
     name: Restoring src cache
 step-maybe-restore-src-cache-marker: &step-maybe-restore-src-cache-marker
   restore_cache:
     keys:
-      - v16-src-cache-marker-{{ checksum "src/electron/.depshash" }}
+      - v14-src-cache-marker-{{ checksum "src/electron/.depshash" }}
     name: Restoring src cache marker
 
 # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
@@ -906,6 +910,14 @@ step-maybe-restore-git-cache: &step-maybe-restore-git-cache
       - v1-git-cache-{{ checksum "src/electron/.circle-sync-done" }}
     name: Conditionally restoring git cache
 
+step-restore-out-cache: &step-restore-out-cache
+  restore_cache:
+    paths:
+      - ./src/out/Default
+    keys:
+      - v10-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
+    name: Restoring out cache
+
 step-set-git-cache-path: &step-set-git-cache-path
   run:
     name: Set GIT_CACHE_PATH to make gclient to use the cache
@@ -923,6 +935,13 @@ step-save-git-cache: &step-save-git-cache
     key: v1-git-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
     name: Persisting git cache
 
+step-save-out-cache: &step-save-out-cache
+  save_cache:
+    paths:
+      - ./src/out/Default
+    key: v10-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
+    name: Persisting out cache
+
 step-run-electron-only-hooks: &step-run-electron-only-hooks
   run:
     name: Run Electron Only Hooks
@@ -952,16 +971,13 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c
       rm -rf third_party/electron_node/deps/openssl
       rm -rf third_party/electron_node/deps/v8
       rm -rf chrome/test/data/xr/webvr_info
-      rm -rf src/third_party/angle/third_party/VK-GL-CTS/src
-      rm -rf src/third_party/swift-toolchain
-      rm -rf src/third_party/swiftshader/tests/regres/testlists
 
 # Save the src cache based on the deps hash
 step-save-src-cache: &step-save-src-cache
   save_cache:
     paths:
       - /var/portal
-    key: v16-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
+    key: v14-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
     name: Persisting src cache
 step-make-src-cache-marker: &step-make-src-cache-marker
   run:
@@ -971,7 +987,7 @@ step-save-src-cache-marker: &step-save-src-cache-marker
   save_cache:
     paths:
       - .src-cache-marker
-    key: v16-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
+    key: v14-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
 
 step-maybe-early-exit-no-doc-change: &step-maybe-early-exit-no-doc-change
   run:
@@ -985,16 +1001,9 @@ step-ts-compile: &step-ts-compile
   run:
     name: Run TS/JS compile on doc only change
     command: |
-      cd src/electron
-      node script/yarn create-typescript-definitions
-      node script/yarn tsc -p tsconfig.default_app.json --noEmit
-      for f in build/webpack/*.js
-      do
-        out="${f:29}"
-        if [ "$out" != "base.js" ]; then
-          node script/yarn webpack --config $f --output-filename=$out --output-path=./.tmp --env.mode=development
-        fi
-      done
+      cd src
+      ninja -C out/Default electron:default_app_js -j $NUMBER_OF_NINJA_PROCESSES
+      ninja -C out/Default electron:electron_js2c -j $NUMBER_OF_NINJA_PROCESSES
 
 # List of all steps.
 steps-electron-gn-check: &steps-electron-gn-check
@@ -1002,7 +1011,7 @@ steps-electron-gn-check: &steps-electron-gn-check
     - *step-checkout-electron
     - *step-depot-tools-get
     - *step-depot-tools-add-to-path
-    - install-python2-mac
+    - *step-install-python2-on-mac
     - *step-setup-env-for-build
     - *step-setup-goma-for-build
     - *step-generate-deps-hash
@@ -1016,7 +1025,37 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
   steps:
     # Checkout - Copied from steps-checkout
     - *step-checkout-electron
-    - *step-install-npm-deps
+    - *step-depot-tools-get
+    - *step-depot-tools-add-to-path
+    - *step-restore-brew-cache
+    - *step-install-gnutar-on-mac
+    - *step-install-python2-on-mac
+    - *step-get-more-space-on-mac
+    - *step-setup-goma-for-build
+    - *step-generate-deps-hash
+    - *step-touch-sync-done
+    - maybe-restore-portaled-src-cache
+    - *step-maybe-restore-git-cache
+    - *step-set-git-cache-path
+    # This sync call only runs if .circle-sync-done is an EMPTY file
+    - *step-gclient-sync
+    # These next few steps reset Electron to the correct commit regardless of which cache was restored
+    - run:
+        name: Wipe Electron
+        command: rm -rf src/electron
+    - *step-checkout-electron
+    - *step-run-electron-only-hooks
+    - *step-generate-deps-hash-cleanly
+    - *step-mark-sync-done
+    - *step-minimize-workspace-size-from-checkout
+
+    - *step-depot-tools-add-to-path
+    - *step-setup-env-for-build
+    - *step-wait-for-goma
+    - *step-get-more-space-on-mac
+    - *step-install-npm-deps-on-mac
+    - *step-fix-sync
+    - *step-gn-gen-default
 
     #Compile ts/js to verify doc change didn't break anything
     - *step-ts-compile
@@ -1026,7 +1065,7 @@ steps-native-tests: &steps-native-tests
     - attach_workspace:
         at: .
     - *step-depot-tools-add-to-path
-    - install-python2-mac
+    - *step-install-python2-on-mac
     - *step-setup-env-for-build
     - *step-setup-goma-for-build
     - *step-wait-for-goma
@@ -1079,7 +1118,6 @@ steps-tests: &steps-tests
     - *step-setup-linux-for-headless-testing
     - *step-restore-brew-cache
     - *step-fix-known-hosts-linux
-    - install-python2-mac
     - *step-install-signing-cert-on-mac
 
     - run:
@@ -1169,31 +1207,6 @@ steps-test-node: &steps-test-node
 
 # Command Aliases
 commands:
-  install-python2-mac:
-    steps:
-      - restore_cache:
-          keys:
-            - v2.7.18-python-cache-{{ arch }}
-          name: Restore python cache
-      - run:
-          name: Install python2 on macos
-          command: |
-            if [ "`uname`" == "Darwin" ] && [ "$IS_ELECTRON_RUNNER" != "1" ]; then
-              if [ ! -f "python-downloads/python-2.7.18-macosx10.9.pkg" ]; then
-                mkdir python-downloads
-                echo 'Downloading Python 2.7.18'
-                curl -O https://dev-cdn.electronjs.org/python/python-2.7.18-macosx10.9.pkg
-                mv python-2.7.18-macosx10.9.pkg python-downloads
-              else
-                echo 'Using Python install from cache'
-              fi
-              sudo installer -pkg python-downloads/python-2.7.18-macosx10.9.pkg -target /        
-            fi
-      - save_cache:
-          paths:
-            - python-downloads
-          key: v2.7.18-python-cache-{{ arch }}
-          name: Persisting python cache
   maybe-restore-portaled-src-cache:
     parameters:
       halt-if-successful:
@@ -1342,6 +1355,9 @@ commands:
       build:
         type: boolean
         default: true
+      use-out-cache:
+        type: boolean
+        default: true
       restore-src-cache:
         type: boolean
         default: true
@@ -1357,7 +1373,7 @@ commands:
             - run: rm -rf src/electron
       - *step-restore-brew-cache
       - *step-install-gnutar-on-mac
-      - install-python2-mac
+      - *step-install-python2-on-mac
       - *step-save-brew-cache
       - when:
           condition: << parameters.build >>
@@ -1464,11 +1480,15 @@ commands:
             - *step-delete-git-directories
 
             # Electron app
+            - when:
+                condition: << parameters.use-out-cache >>
+                steps:
+                  - *step-restore-out-cache
             - *step-gn-gen-default
             - *step-electron-build
             - *step-maybe-electron-dist-strip
             - step-electron-dist-build:
-                additional-targets: shell_browser_ui_unittests third_party/electron_node:headers electron:hunspell_dictionaries_zip
+                additional-targets: shell_browser_ui_unittests third_party/electron_node:headers third_party/electron_node:overlapped-checker electron:hunspell_dictionaries_zip
 
             - *step-show-goma-stats
 
@@ -1506,6 +1526,22 @@ commands:
           condition: << parameters.build >>
           steps:
             - move_and_store_all_artifacts
+            - run:
+                name: Remove the big things on macOS, this seems to be better on average
+                command: |
+                  if [ "`uname`" == "Darwin" ]; then
+                    mkdir -p src/out/Default
+                    cd src/out/Default
+                    find . -type f -size +50M -delete
+                    mkdir -p gen/electron
+                    cd gen/electron
+                    # These files do not seem to like being in a cache, let us remove them
+                    find . -type f -name '*_pkg_info' -delete
+                  fi
+            - when:
+                condition: << parameters.use-out-cache >>
+                steps:
+                  - *step-save-out-cache
 
             - *step-maybe-notify-slack-failure
 
@@ -1529,7 +1565,7 @@ commands:
             - *step-depot-tools-get
       - *step-depot-tools-add-to-path
       - *step-restore-brew-cache
-      - install-python2-mac
+      - *step-install-python2-on-mac
       - *step-get-more-space-on-mac
       - when:
           condition: << parameters.checkout >>
@@ -1659,6 +1695,7 @@ jobs:
           persist: true
           checkout: false
           checkout-and-assume-cache: true
+          use-out-cache: false
 
   linux-x64-testing-asan:
     executor:
@@ -1675,6 +1712,7 @@ jobs:
       - electron-build:
           persist: true
           checkout: true
+          use-out-cache: false
           build-nonproprietary-ffmpeg: false
 
   linux-x64-testing-no-run-as-node:
@@ -1691,6 +1729,7 @@ jobs:
       - electron-build:
           persist: false
           checkout: true
+          use-out-cache: false
 
   linux-x64-testing-gn-check:
     executor:
@@ -1709,7 +1748,7 @@ jobs:
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1741,6 +1780,7 @@ jobs:
           persist: true
           checkout: false
           checkout-and-assume-cache: true
+          use-out-cache: false
 
   linux-arm-publish:
     executor:
@@ -1752,7 +1792,7 @@ jobs:
       <<: *env-release-build
       <<: *env-32bit-release
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True'
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1783,6 +1823,7 @@ jobs:
           persist: true
           checkout: false
           checkout-and-assume-cache: true
+          use-out-cache: false
 
   linux-arm64-testing-gn-check:
     executor:
@@ -1804,7 +1845,7 @@ jobs:
       <<: *env-arm64
       <<: *env-release-build
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True'
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1852,7 +1893,7 @@ jobs:
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1874,7 +1915,7 @@ jobs:
       <<: *env-mac-large-release
       <<: *env-release-build
       <<: *env-apple-silicon
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -1944,7 +1985,7 @@ jobs:
       <<: *env-mac-large-release
       <<: *env-mas
       <<: *env-release-build
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
     steps:
       - run: echo running
       - when:
@@ -1965,7 +2006,7 @@ jobs:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
       <<: *env-release-build
-      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
       <<: *env-ninja-status
     steps:
       - run: echo running
@@ -2074,6 +2115,7 @@ jobs:
   osx-testing-x64-tests:
     executor:
       name: macos
+      xcode: 12.4.0
       size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
@@ -2087,12 +2129,12 @@ jobs:
       <<: *env-mac-large
       <<: *env-stack-dumping
       <<: *env-apple-silicon
-      <<: *env-runner
     <<: *steps-tests
 
   mas-testing-x64-tests:
     executor:
       name: macos
+      xcode: 12.4.0
       size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
@@ -2106,7 +2148,6 @@ jobs:
       <<: *env-mac-large
       <<: *env-stack-dumping
       <<: *env-apple-silicon
-      <<: *env-runner
     <<: *steps-tests
 
   # Layer 4: Summary.

.github/semantic.yml

@@ -0,0 +1,2 @@
+# Always validate the PR title, and ignore the commits
+titleOnly: true

.github/workflows/electron_woa_testing.yml

@@ -1,178 +0,0 @@
-name: Electron WOA Testing
-
-on:
-  push:    
-    branches: '**'
-  workflow_dispatch:
-    inputs:
-      appveyor_job_id:
-        description: 'Job Id of Appveyor WOA job to test'
-        type: text
-        required: true
-
-jobs:
-  electron-woa-init:
-    if: ${{ github.event_name == 'push' && github.repository == 'electron/electron' }}
-    runs-on: ubuntu-latest
-    steps:
-        - name: Dummy step for push event
-          run: |
-            echo "This job is a needed initialization step for Electron WOA testing.  Another test result will appear once the electron-woa-testing build is done."
-
-  electron-woa-testing:    
-    if: ${{ github.event_name == 'workflow_dispatch' && github.repository == 'electron/electron' }}    
-    runs-on: [self-hosted, woa]  
-    permissions:
-      checks: write
-      pull-requests: write
-    steps:
-    - uses: LouisBrunner/checks-action@v1.1.1
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        name: electron-woa-testing
-        status: in_progress
-        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}    
-        output: |
-          {"summary":"Test In Progress","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}        
-    - name: Clean Workspace
-      run: |
-        Remove-Item * -Recurse -Force
-      shell: powershell
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        path: src\electron
-        fetch-depth: 0
-    - name: Yarn install
-      run: |
-        cd src\electron
-        node script/yarn.js install --frozen-lockfile
-    - name: Download and extract dist.zip for test
-      run: |
-        $localArtifactPath = "$pwd\dist.zip"
-        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/dist.zip"
-        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\Default -y $localArtifactPath
-      shell: powershell
-    - name: Download and extract native test executables for test
-      run: |
-        $localArtifactPath = "src\out\Default\shell_browser_ui_unittests.exe"
-        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/shell_browser_ui_unittests.exe"
-        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-      shell: powershell
-    - name: Download and extract ffmpeg.zip for test
-      run: |
-        $localArtifactPath = "$pwd\ffmpeg.zip"
-        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/ffmpeg.zip"
-        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\ffmpeg $localArtifactPath
-      shell: powershell
-    - name: Download node headers for test
-      run: |
-        $localArtifactPath = "src\node_headers.zip"
-        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/node_headers.zip"
-        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-        cd src
-        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y node_headers.zip
-      shell: powershell
-    - name: Download electron.lib for test
-      run: |
-        $localArtifactPath = "src\out\Default\electron.lib"
-        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/electron.lib"
-        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-      shell: powershell
-    # Uncomment the following block if pdb files are needed to debug issues
-    # - name: Download pdb files for detailed stacktraces
-    #   if: ${{ github.event_name == 'workflow_dispatch' }}
-    #   run: |
-    #     try {
-    #       $localArtifactPath = "src\pdb.zip"
-    #       $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/pdb.zip"
-    #       Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-    #       cd src
-    #       & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y pdb.zip
-    #     } catch {
-    #       Write-Host "There was an exception encountered while downloading pdb files:" $_.Exception.Message
-    #     } finally {
-    #       $global:LASTEXITCODE = 0
-    #     }
-    #   shell: powershell
-    - name: Setup node headers
-      run: |
-        New-Item src\out\Default\gen\node_headers\Release -Type directory
-        Copy-Item -path src\out\Default\electron.lib -destination src\out\Default\gen\node_headers\Release\node.lib
-      shell: powershell
-    - name: Run Electron Main process tests
-      run: |
-        cd src
-        set npm_config_nodedir=%cd%\out\Default\gen\node_headers
-        set npm_config_arch=arm64
-        cd electron
-        node script/yarn test --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion  
-      env:
-        ELECTRON_ENABLE_STACK_DUMPING: true
-        ELECTRON_OUT_DIR: Default
-        IGNORE_YARN_INSTALL_ERROR: 1
-        ELECTRON_TEST_RESULTS_DIR: junit
-        MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
-        MOCHA_REPORTER: mocha-multi-reporters
-        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
-    - name: Run Electron Remote based tests
-      if: ${{ success() || failure() }}
-      run: |
-        cd src
-        set npm_config_nodedir=%cd%\out\Default\gen\node_headers
-        set npm_config_arch=arm64
-        cd electron
-        node script/yarn test --runners=remote --enable-logging --disable-features=CalculateNativeWinOcclusion
-      env:
-        ELECTRON_OUT_DIR: Default
-        IGNORE_YARN_INSTALL_ERROR: 1
-        ELECTRON_TEST_RESULTS_DIR: junit
-        MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
-        MOCHA_REPORTER: mocha-multi-reporters
-        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
-    - name: Verify ffmpeg
-      run: |
-        cd src
-        echo "Verifying non proprietary ffmpeg"
-        python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
-      shell: cmd
-    - name: Kill processes left running from last test run
-      if: ${{ always() }}
-      run: |
-        Get-Process | Where Name -Like "electron*" | Stop-Process
-        Get-Process | Where Name -Like "msedge*" | Stop-Process
-      shell: powershell
-    - name: Delete user app data directories
-      if: ${{ always() }}
-      run: |
-        Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
-      shell: powershell
-    - uses: LouisBrunner/checks-action@v1.1.1
-      if: ${{ success() }}
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        name: electron-woa-testing
-        conclusion: "${{ job.status }}"
-        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-        output: |
-          {"summary":"${{ job.status }}","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}
-    - uses: LouisBrunner/checks-action@v1.1.1
-      if: ${{ success() }}
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        name: electron-woa-testing
-        conclusion: "${{ job.status }}"
-        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-        output: |
-          {"summary":"Job Succeeded","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}          
-    - uses: LouisBrunner/checks-action@v1.1.1
-      if: ${{ ! success() }}
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        name: electron-woa-testing
-        conclusion: "${{ job.status }}"
-        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-        output: |
-          {"summary":"Job Failed","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}                    

.markdownlint.json

@@ -23,5 +23,7 @@
     "br_spaces": 0
   },
   "single-h1": false,
-  "no-inline-html": false
+  "no-inline-html": {
+    "allowed_elements": ["br"]
+  }
 }

BUILD.gn

@@ -79,11 +79,15 @@ if (is_linux) {
     ]
   }
 
+  # Generates electron_gtk_stubs.h header which contains
+  # stubs for extracting function ptrs from the gtk library.
+  # Function signatures for which stubs are required should be
+  # declared in electron_gtk.sigs, currently this file contains
+  # signatures for the functions used with native file chooser
+  # implementation. In future, this file can be extended to contain
+  # gtk4 stubs to switch gtk version in runtime.
   generate_stubs("electron_gtk_stubs") {
-    sigs = [
-      "shell/browser/ui/electron_gdk_pixbuf.sigs",
-      "shell/browser/ui/electron_gtk.sigs",
-    ]
+    sigs = [ "shell/browser/ui/electron_gtk.sigs" ]
     extra_header = "shell/browser/ui/electron_gtk.fragment"
     output_name = "electron_gtk_stubs"
     public_deps = [ "//ui/gtk:gtk_config" ]
@@ -100,14 +104,6 @@ branding = read_file("shell/app/BRANDING.json", "json")
 electron_project_name = branding.project_name
 electron_product_name = branding.product_name
 electron_mac_bundle_id = branding.mac_bundle_id
-electron_version = exec_script("script/print-version.py",
-                               [],
-                               "trim string",
-                               [
-                                 ".git/packed-refs",
-                                 ".git/HEAD",
-                                 "script/lib/get-version.js",
-                               ])
 
 if (is_mas_build) {
   assert(is_mac,
@@ -302,9 +298,12 @@ npm_action("electron_version_args") {
 
   outputs = [ "$target_gen_dir/electron_version.args" ]
 
-  args = rebase_path(outputs) + [ "$electron_version" ]
+  args = rebase_path(outputs)
 
-  inputs = [ "script/generate-version-json.js" ]
+  inputs = [
+    "ELECTRON_VERSION",
+    "script/generate-version-json.js",
+  ]
 }
 
 templated_file("electron_version_header") {
@@ -316,39 +315,6 @@ templated_file("electron_version_header") {
   args_files = get_target_outputs(":electron_version_args")
 }
 
-templated_file("electron_win_rc") {
-  deps = [ ":electron_version_args" ]
-
-  template = "build/templates/electron_rc.tmpl"
-  output = "$target_gen_dir/win-resources/electron.rc"
-
-  args_files = get_target_outputs(":electron_version_args")
-}
-
-copy("electron_win_resource_files") {
-  sources = [
-    "shell/browser/resources/win/electron.ico",
-    "shell/browser/resources/win/resource.h",
-  ]
-  outputs = [ "$target_gen_dir/win-resources/{{source_file_part}}" ]
-}
-
-templated_file("electron_version_file") {
-  deps = [ ":electron_version_args" ]
-
-  template = "build/templates/version_string.tmpl"
-  output = "$root_build_dir/version"
-
-  args_files = get_target_outputs(":electron_version_args")
-}
-
-group("electron_win32_resources") {
-  public_deps = [
-    ":electron_win_rc",
-    ":electron_win_resource_files",
-  ]
-}
-
 action("electron_fuses") {
   script = "build/fuses/build.py"
 
@@ -400,11 +366,11 @@ source_set("electron_lib") {
     "shell/common/api:mojo",
     "//base:base_static",
     "//base/allocator:buildflags",
+    "//chrome:strings",
     "//chrome/app:command_ids",
     "//chrome/app/resources:platform_locale_settings",
     "//components/autofill/core/common:features",
     "//components/certificate_transparency",
-    "//components/embedder_support:browser_util",
     "//components/language/core/browser",
     "//components/net_log",
     "//components/network_hints/browser",
@@ -787,6 +753,7 @@ if (is_mac) {
   electron_helper_name = "$electron_product_name Helper"
   electron_login_helper_name = "$electron_product_name Login Helper"
   electron_framework_version = "A"
+  electron_version = read_file("ELECTRON_VERSION", "trim string")
 
   mac_xib_bundle_data("electron_xibs") {
     sources = [ "shell/common/resources/mac/MainMenu.xib" ]
@@ -944,7 +911,10 @@ if (is_mac) {
       assert(defined(invoker.helper_name_suffix))
 
       output_name = electron_helper_name + invoker.helper_name_suffix
-      deps = [ ":electron_framework+link" ]
+      deps = [
+        ":electron_framework+link",
+        "//base/allocator:early_zone_registration_mac",
+      ]
       if (!is_mas_build) {
         deps += [ "//sandbox/mac:seatbelt" ]
       }
@@ -1104,6 +1074,7 @@ if (is_mac) {
       ":electron_app_plist",
       ":electron_app_resources",
       ":electron_fuses",
+      "//base/allocator:early_zone_registration_mac",
       "//electron/buildflags",
     ]
     if (is_mas_build) {
@@ -1216,7 +1187,6 @@ if (is_mac) {
       ":default_app_asar",
       ":electron_app_manifest",
       ":electron_lib",
-      ":electron_win32_resources",
       ":packed_resources",
       "//components/crash/core/app",
       "//content:sandbox_helper_win",
@@ -1250,7 +1220,8 @@ if (is_mac) {
 
     if (is_win) {
       sources += [
-        "$target_gen_dir/win-resources/electron.rc",
+        # TODO: we should be generating our .rc files more like how chrome does
+        "shell/browser/resources/win/electron.rc",
         "shell/browser/resources/win/resource.h",
       ]
 
@@ -1432,10 +1403,15 @@ group("licenses") {
   ]
 }
 
+copy("electron_version") {
+  sources = [ "ELECTRON_VERSION" ]
+  outputs = [ "$root_build_dir/version" ]
+}
+
 dist_zip("electron_dist_zip") {
   data_deps = [
     ":electron_app",
-    ":electron_version_file",
+    ":electron_version",
     ":licenses",
   ]
   if (is_linux) {

DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '102.0.5005.167',
+    '102.0.4999.0',
   'node_version':
     'v16.14.2',
   'nan_version':

ELECTRON_VERSION

@@ -0,0 +1 @@
+20.0.0-nightly.20220429

appveyor.yml

@@ -11,7 +11,7 @@
 #  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64', 'mips64el'}.
 #      Is used in some publishing scripts, but does NOT affect the Electron binary.
 #      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
-#  - "UPLOAD_TO_STORAGE" Set it to '1' upload a release to the Azure bucket.
+#  - "UPLOAD_TO_S3" Set it to '1' upload a release to the S3 bucket.
 #      Otherwise the release will be uploaded to the Github Releases.
 #      (The value is only checked if "ELECTRON_RELEASE" is defined.)
 #
@@ -23,10 +23,6 @@
 # https://www.appveyor.com/docs/build-configuration/#secure-variables
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
-# Uncomment these lines to enable RDP
-#on_finish:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-
 version: 1.0.{build}
 build_cloud: electron-16-core
 image: vs2019bt-16.16.11
@@ -38,6 +34,16 @@ environment:
   MOCHA_REPORTER: mocha-multi-reporters
   MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
   GOMA_FALLBACK_ON_AUTH_FAILURE: true
+notifications:
+  - provider: Webhook
+    url: https://electron-mission-control.herokuapp.com/rest/appveyor-hook
+    method: POST
+    headers:
+      x-mission-control-secret:
+        secure: 90BLVPcqhJPG7d24v0q/RRray6W3wDQ8uVQlQjOHaBWkw1i8FoA1lsjr2C/v1dVok+tS2Pi6KxDctPUkwIb4T27u4RhvmcPzQhVpfwVJAG9oNtq+yKN7vzHfg7k/pojEzVdJpQLzeJGcSrZu7VY39Q==
+    on_build_success: false
+    on_build_failure: true
+    on_build_status_changed: false
 build_script:
   - ps: >-
       if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
@@ -174,22 +180,25 @@ build_script:
   - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
   - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
   - 7z a node_headers.zip out\Default\gen\node_headers
+  # Temporarily disable symbol generation on 32-bit Windows due to failures  
   - ps: >-
-      if ($env:GN_CONFIG -eq 'release') {
+      if ($env:GN_CONFIG -eq 'release' -And $env:TARGET_ARCH -ne 'ia32') {
         # Needed for msdia140.dll on 64-bit windows
         $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
         ninja -C out/Default electron:electron_symbols
       }
   - ps: >-
       if ($env:GN_CONFIG -eq 'release') {
-        python3 electron\script\zip-symbols.py
-        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+        if ($env:TARGET_ARCH -ne 'ia32') {
+          python electron\script\zip-symbols.py
+          appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+        }
       } else {
         # It's useful to have pdb files when debugging testing builds that are
         # built on CI.
         7z a pdb.zip out\Default\*.pdb
       }
-  - python3 electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
+  - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
 test_script:
   # Workaround for https://github.com/appveyor/ci/issues/2420
   - set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
@@ -210,27 +219,29 @@ test_script:
   - if "%RUN_TESTS%"=="true" ( echo Running remote test suite & node script/yarn test -- --trace-uncaught --runners=remote --runTestFilesSeperately --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )
   - if "%RUN_TESTS%"=="true" ( echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )  
   - cd ..
-  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python3 electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
+  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
   - echo "About to verify mksnapshot"
-  - if "%RUN_TESTS%"=="true" ( echo Verifying mksnapshot & python3 electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd% )
+  - if "%RUN_TESTS%"=="true" ( echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd% )
   - echo "Done verifying mksnapshot"
-  - if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python3 electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
+  - if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
   - echo "Done verifying chromedriver"
 deploy_script:
   - cd electron
   - ps: >-
       if (Test-Path Env:\ELECTRON_RELEASE) {
-        if (Test-Path Env:\UPLOAD_TO_STORAGE) {
-          Write-Output "Uploading Electron release distribution to azure"
-          & python3 script\release\uploaders\upload.py --verbose --upload_to_storage
+        if (Test-Path Env:\UPLOAD_TO_S3) {
+          Write-Output "Uploading Electron release distribution to s3"
+          & python script\release\uploaders\upload.py --verbose --upload_to_s3
         } else {
           Write-Output "Uploading Electron release distribution to github releases"
-          & python3 script\release\uploaders\upload.py --verbose
+          & python script\release\uploaders\upload.py --verbose
         }
       } elseif (Test-Path Env:\TEST_WOA) {
-        node script/release/ci-release-build.js --job=electron-woa-testing --ci=GHA --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
+        node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
       }
 on_finish:
+  # Uncomment this lines to enable RDP
+  #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
   - cd ..
   - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
   - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)
@@ -245,4 +256,5 @@ on_finish:
       if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
         appveyor-retry appveyor PushArtifact pdb.zip
       }
+
   - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )

azure-pipelines-arm.yml

@@ -0,0 +1,121 @@
+steps:
+- task: CopyFiles@2
+  displayName: 'Copy Files to: src/electron'
+  inputs:
+    TargetFolder: src/electron
+
+- bash: |
+    cd src/electron
+    node script/yarn.js install --frozen-lockfile
+  displayName: 'Yarn install'
+
+- bash: |
+    export ZIP_DEST=$PWD/src/out/Default
+    echo "##vso[task.setvariable variable=ZIP_DEST]$ZIP_DEST"
+    mkdir -p $ZIP_DEST
+    cd src/electron
+    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=dist.zip --dest=$ZIP_DEST
+    cd $ZIP_DEST
+    unzip -o dist.zip
+    xattr -cr Electron.app    
+  displayName: 'Download and unzip dist files for test'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+    export FFMPEG_ZIP_DEST=$PWD/src/out/ffmpeg
+    mkdir -p $FFMPEG_ZIP_DEST
+    cd src/electron
+    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=ffmpeg.zip --dest=$FFMPEG_ZIP_DEST
+    cd $FFMPEG_ZIP_DEST
+    unzip -o ffmpeg.zip
+  displayName: 'Download and unzip ffmpeg for test'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+   export NODE_HEADERS_DEST=$PWD/src/out/Default/gen
+   mkdir -p $NODE_HEADERS_DEST
+   cd src/electron
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=node_headers.tar.gz --dest=$NODE_HEADERS_DEST
+   cd $NODE_HEADERS_DEST
+   tar xzf node_headers.tar.gz
+  displayName: 'Download and untar node header files for test'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+   export CROSS_ARCH_SNAPSHOTS=$PWD/src/out/Default/cross-arch-snapshots
+   mkdir -p $CROSS_ARCH_SNAPSHOTS
+   cd src/electron
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/snapshot_blob.bin --dest=$CROSS_ARCH_SNAPSHOTS
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/v8_context_snapshot.arm64.bin --dest=$CROSS_ARCH_SNAPSHOTS
+  displayName: 'Download cross arch snapshot files'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+    cd src
+    export ELECTRON_OUT_DIR=Default
+    export npm_config_arch=arm64
+    (cd electron && node script/yarn test --enable-logging --runners main)
+  displayName: 'Run Electron main tests'
+  timeoutInMinutes: 20
+  env:
+    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
+    IGNORE_YARN_INSTALL_ERROR: 1
+    ELECTRON_TEST_RESULTS_DIR: junit
+
+- bash: |
+    cd src
+    export ELECTRON_OUT_DIR=Default
+    export npm_config_arch=arm64
+    (cd electron && node script/yarn test --enable-logging --runners remote)
+  displayName: 'Run Electron remote tests'
+  timeoutInMinutes: 20
+  condition: succeededOrFailed()
+  env:
+    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
+    IGNORE_YARN_INSTALL_ERROR: 1
+    ELECTRON_TEST_RESULTS_DIR: junit
+
+- bash: |
+    cd src
+    python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
+  displayName: Verify non proprietary ffmpeg
+  timeoutInMinutes: 5
+  condition: succeededOrFailed()
+  env:
+    TARGET_ARCH: arm64
+
+- bash: |
+    cd src
+    echo Verify cross arch snapshot
+    python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --snapshot-files-dir $PWD/out/Default/cross-arch-snapshots
+  displayName: Verify cross arch snapshot
+  timeoutInMinutes: 5
+  condition: succeededOrFailed()
+
+- task: PublishTestResults@2
+  displayName: 'Publish Test Results'
+  inputs:
+    testResultsFiles: '*.xml'
+
+    searchFolder: '$(System.DefaultWorkingDirectory)/src/junit/'
+
+  condition: succeededOrFailed()
+
+- bash: killall Electron || echo "No Electron processes left running"
+  displayName: 'Kill processes left running from last test run'
+  condition: always()
+
+- bash: |
+    rm -rf ~/Library/Application\ Support/Electron*
+    rm -rf ~/Library/Application\ Support/electron*
+  displayName: 'Delete user app data directories'
+  condition: always()
+
+- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
+  displayName: 'Clean Agent Directories'
+
+  condition: always()

azure-pipelines-woa.yml

@@ -0,0 +1,130 @@
+workspace:
+  clean: all
+
+steps:
+- checkout: self
+  path: src\electron
+
+- script: |
+    node script/yarn.js install --frozen-lockfile
+  displayName: 'Yarn install'
+
+- powershell: |
+    $localArtifactPath = "$pwd\dist.zip"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/dist.zip"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -o$(Pipeline.Workspace)\src\out\Default -y $localArtifactPath
+  displayName: 'Download and extract dist.zip for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$(Pipeline.Workspace)\src\out\Default\shell_browser_ui_unittests.exe"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/shell_browser_ui_unittests.exe"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+  displayName: 'Download and extract native test executables for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$pwd\ffmpeg.zip"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/ffmpeg.zip"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -o$(Pipeline.Workspace)\src\out\ffmpeg $localArtifactPath
+  displayName: 'Download and extract ffmpeg.zip for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$(Pipeline.Workspace)\src\node_headers.zip"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/node_headers.zip"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+    cd $(Pipeline.Workspace)\src
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y node_headers.zip
+  displayName: 'Download node headers for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$(Pipeline.Workspace)\src\out\Default\electron.lib"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/electron.lib"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+  displayName: 'Download electron.lib for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+# Uncomment the following block if pdb files are needed to debug issues
+# - powershell: |
+#     try {
+#       $localArtifactPath = "$(Pipeline.Workspace)\src\pdb.zip"
+#       $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/pdb.zip"
+#       Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+#       cd $(Pipeline.Workspace)\src
+#       & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y pdb.zip
+#     } catch {
+#       Write-Host "There was an exception encountered while downloading pdb files:" $_.Exception.Message
+#     } finally {
+#       $global:LASTEXITCODE = 0
+#     }
+#   displayName: 'Download pdb files for detailed stacktraces'
+#   env:
+#     APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    New-Item $(Pipeline.Workspace)\src\out\Default\gen\node_headers\Release -Type directory
+    Copy-Item -path $(Pipeline.Workspace)\src\out\Default\electron.lib -destination $(Pipeline.Workspace)\src\out\Default\gen\node_headers\Release\node.lib
+  displayName: 'Setup node headers'
+
+- script: |
+    cd $(Pipeline.Workspace)\src
+    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
+    set npm_config_arch=arm64
+    cd electron
+    node script/yarn test --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion
+  displayName: 'Run Electron Main process tests'
+  env:
+    ELECTRON_ENABLE_STACK_DUMPING: true
+    ELECTRON_OUT_DIR: Default
+    IGNORE_YARN_INSTALL_ERROR: 1
+    ELECTRON_TEST_RESULTS_DIR: junit
+    MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
+    MOCHA_REPORTER: mocha-multi-reporters
+
+- script: |
+    cd $(Pipeline.Workspace)\src
+    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
+    set npm_config_arch=arm64
+    cd electron
+    node script/yarn test --runners=remote --enable-logging --disable-features=CalculateNativeWinOcclusion
+  displayName: 'Run Electron Remote based tests'
+  env:
+    ELECTRON_OUT_DIR: Default
+    IGNORE_YARN_INSTALL_ERROR: 1
+    ELECTRON_TEST_RESULTS_DIR: junit
+    MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
+    MOCHA_REPORTER: mocha-multi-reporters
+  condition: succeededOrFailed()
+
+- task: PublishTestResults@2
+  displayName: 'Publish Test Results'
+  inputs:
+    testResultsFiles: '*.xml'
+    searchFolder: '$(Pipeline.Workspace)/src/junit/'
+  condition: always()
+
+- script: |
+    cd $(Pipeline.Workspace)\src
+    echo "Verifying non proprietary ffmpeg"
+    python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
+  displayName: 'Verify ffmpeg'
+
+- powershell: |
+    Get-Process | Where Name –Like "electron*" | Stop-Process
+    Get-Process | Where Name –Like "msedge*" | Stop-Process
+  displayName: 'Kill processes left running from last test run'
+  condition: always()
+
+- powershell: |
+    Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
+  displayName: 'Delete user app data directories'
+  condition: always()

build/args/all.gn

@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 106
+node_module_version = 107
 
 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"
@@ -21,9 +21,6 @@ proprietary_codecs = true
 ffmpeg_branding = "Chrome"
 
 enable_basic_printing = true
-
-# Removes DLLs from the build, which are only meant to be used for Chromium development.
-# See https://github.com/electron/electron/pull/17985
 angle_enable_vulkan_validation_layers = false
 dawn_enable_vulkan_validation_layers = false
 
@@ -32,9 +29,16 @@ dawn_enable_vulkan_validation_layers = false
 # See https://chromium-review.googlesource.com/c/chromium/src/+/2774898.
 enable_pseudolocales = false
 
-is_cfi = false
-
 # Make application name configurable at runtime for cookie crypto
 allow_runtime_configurable_key_storage = true
 
+# CET shadow stack is incompatible with v8, until v8 is CET compliant
+# enabling this flag causes main process crashes where CET is enabled
+# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=357
 enable_cet_shadow_stack = false
+
+# For similar reasons, disable CFI, which is not well supported in V8.
+# Chromium doesn't have any problems with this because they do not run
+# V8 in the browser process.
+# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=281
+is_cfi = false

build/extract_symbols.gni

@@ -24,11 +24,7 @@ template("extract_symbols") {
     assert(defined(invoker.binary), "Need binary to dump")
     assert(defined(invoker.symbol_dir), "Need directory for symbol output")
 
-    if (host_os == "win" && target_cpu == "x86") {
-      dump_syms_label = "//third_party/breakpad:dump_syms(//build/toolchain/win:win_clang_x64)"
-    } else {
-      dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)"
-    }
+    dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)"
     dump_syms_binary = get_label_info(dump_syms_label, "root_out_dir") +
                        "/dump_syms$_host_executable_suffix"
 

build/templates/version_string.tmpl

@@ -1 +0,0 @@
-$full_version

chromium_src/BUILD.gn

@@ -55,14 +55,6 @@ static_library("chrome") {
     "//chrome/browser/process_singleton.h",
     "//chrome/browser/process_singleton_internal.cc",
     "//chrome/browser/process_singleton_internal.h",
-    "//chrome/browser/themes/browser_theme_pack.cc",
-    "//chrome/browser/themes/browser_theme_pack.h",
-    "//chrome/browser/themes/custom_theme_supplier.cc",
-    "//chrome/browser/themes/custom_theme_supplier.h",
-    "//chrome/browser/themes/theme_properties.cc",
-    "//chrome/browser/themes/theme_properties.h",
-    "//chrome/browser/ui/color/chrome_color_mixers.cc",
-    "//chrome/browser/ui/color/chrome_color_mixers.h",
     "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc",
     "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h",
     "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc",
@@ -77,11 +69,7 @@ static_library("chrome") {
     "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h",
     "//chrome/browser/ui/exclusive_access/mouse_lock_controller.cc",
     "//chrome/browser/ui/exclusive_access/mouse_lock_controller.h",
-    "//chrome/browser/ui/frame/window_frame_util.cc",
-    "//chrome/browser/ui/frame/window_frame_util.h",
     "//chrome/browser/ui/native_window_tracker.h",
-    "//chrome/browser/ui/ui_features.cc",
-    "//chrome/browser/ui/ui_features.h",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc",
@@ -119,8 +107,6 @@ static_library("chrome") {
       "//chrome/browser/ui/view_ids.h",
       "//chrome/browser/win/chrome_process_finder.cc",
       "//chrome/browser/win/chrome_process_finder.h",
-      "//chrome/browser/win/titlebar_config.cc",
-      "//chrome/browser/win/titlebar_config.h",
       "//chrome/browser/win/titlebar_config.h",
       "//chrome/child/v8_crashpad_support_win.cc",
       "//chrome/child/v8_crashpad_support_win.h",
@@ -142,7 +128,6 @@ static_library("chrome") {
 
   public_deps = [
     "//chrome/browser:dev_ui_browser_resources",
-    "//chrome/browser/ui/color:mixers",
     "//chrome/common",
     "//chrome/common:version_header",
     "//components/keyed_service/content",

docs/README.md

@@ -69,6 +69,9 @@ an issue:
   * [Windows Store](tutorial/windows-store-guide.md)
   * [Snapcraft](tutorial/snapcraft.md)
 * [Updates](tutorial/updates.md)
+  * [Deploying an Update Server](tutorial/updates.md#deploying-an-update-server)
+  * [Implementing Updates in Your App](tutorial/updates.md#implementing-updates-in-your-app)
+  * [Applying Updates](tutorial/updates.md#applying-updates)
 * [Getting Support](tutorial/support.md)
 
 ## Detailed Tutorials

docs/api/app.md

@@ -484,6 +484,7 @@ Returns:
 * `argv` string[] - An array of the second instance's command line arguments
 * `workingDirectory` string - The second instance's working directory
 * `additionalData` unknown - A JSON object of additional data passed from the second instance
+* `ackCallback` unknown - A function that can be used to send data back to the second instance
 
 This event will be emitted inside the primary instance of your application
 when a second instance has been executed and calls `app.requestSingleInstanceLock()`.
@@ -495,12 +496,35 @@ non-minimized.
 
 **Note:** If the second instance is started by a different user than the first, the `argv` array will not include the arguments.
 
+**Note:** `ackCallback` allows the user to send data back to the
+second instance during the `app.requestSingleInstanceLock()` flow.
+This callback can be used for cases where the second instance
+needs to obtain additional information from the first instance
+before quitting.
+
+Currently, the limit on the message size is kMaxMessageLength,
+or around 32kB. To be safe, keep the amount of data passed to 31kB at most.
+
+In order to call the callback, `event.preventDefault()` must be called, first.
+If the callback is not called in either case, `null` will be sent back.
+If `event.preventDefault()` is not called, but `ackCallback` is called
+by the user in the event, then the behaviour is undefined.
+
 This event is guaranteed to be emitted after the `ready` event of `app`
 gets emitted.
 
 **Note:** Extra command line arguments might be added by Chromium,
 such as `--original-process-start-time`.
 
+### Event: 'first-instance-ack'
+
+Returns:
+
+* `event` Event
+* `additionalData` unknown - A JSON object of additional data passed from the first instance, in response to the first instance's `second-instance` event.
+
+This event will be emitted within the second instance during the call to `app.requestSingleInstanceLock()`, when the first instance calls the `ackCallback` provided by the `second-instance` event handler.
+
 ## Methods
 
 The `app` object has the following methods:
@@ -582,6 +606,10 @@ You should seek to use the `steal` option as sparingly as possible.
 
 Hides all application windows without minimizing them.
 
+### `app.isHidden()` _macOS_
+
+Returns `boolean` - `true` if the application—including all of its windows—is hidden (e.g. with `Command-H`), `false` otherwise.
+
 ### `app.show()` _macOS_
 
 Shows application windows after they were hidden. Does not automatically focus
@@ -609,7 +637,6 @@ Returns `string` - The current application directory.
     * `~/Library/Application Support` on macOS
   * `userData` The directory for storing your app's configuration files, which by
     default it is the `appData` directory appended with your app's name.
-  * `cache`
   * `temp` Temporary directory.
   * `exe` The current executable file.
   * `module` The `libchromiumcontent` library.
@@ -961,6 +988,13 @@ starts:
 const { app } = require('electron')
 let myWindow = null
 
+app.on('first-instance-ack', (event, additionalData) => {
+  // Print out the ack received from the first instance.
+  // Note this event handler must come before the requestSingleInstanceLock call.
+  // Expected output: '{"myAckKey":"myAckValue"}'
+  console.log(JSON.stringify(additionalData))
+})
+
 const additionalData = { myKey: 'myValue' }
 const gotTheLock = app.requestSingleInstanceLock(additionalData)
 
@@ -968,14 +1002,19 @@ if (!gotTheLock) {
   app.quit()
 } else {
   app.on('second-instance', (event, commandLine, workingDirectory, additionalData) => {
+    // We must call preventDefault if we're sending back data.
+    event.preventDefault()
     // Print out data received from the second instance.
-    console.log(additionalData)
+    // Expected output: '{"myKey":"myValue"}'
+    console.log(JSON.stringify(additionalData))
 
     // Someone tried to run a second instance, we should focus our window.
     if (myWindow) {
       if (myWindow.isMinimized()) myWindow.restore()
       myWindow.focus()
     }
+    const ackData = { myAckKey: 'myAckValue' }
+    ackCallback(ackData)
   })
 
   // Create myWindow, load the rest of the app, etc...

docs/api/browser-view.md

@@ -11,6 +11,9 @@ relative to its owning window. It is meant to be an alternative to the
 
 Process: [Main](../glossary.md#main-process)
 
+This module cannot be used until the `ready` event of the `app`
+module is emitted.
+
 ### Example
 
 ```javascript

docs/api/browser-window.md

@@ -4,6 +4,9 @@
 
 Process: [Main](../glossary.md#main-process)
 
+This module cannot be used until the `ready` event of the `app`
+module is emitted.
+
 ```javascript
 // In the main process.
 const { BrowserWindow } = require('electron')
@@ -243,8 +246,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `trafficLightPosition` [Point](structures/point.md) (optional) _macOS_ -
     Set a custom position for the traffic light buttons in frameless windows.
   * `roundedCorners` boolean (optional) _macOS_ - Whether frameless window
-    should have rounded corners on macOS. Default is `true`. Setting this property
-    to `false` will prevent the window from being fullscreenable.
+    should have rounded corners on macOS. Default is `true`.
   * `fullscreenWindowTitle` boolean (optional) _macOS_ _Deprecated_ - Shows
     the title in the title bar in full screen mode on macOS for `hiddenInset`
     titleBarStyle. Default is `false`.

docs/api/context-bridge.md

@@ -35,7 +35,7 @@ page you load in your renderer executes code in this world.
 
 When `contextIsolation` is enabled in your `webPreferences` (this is the default behavior since Electron 12.0.0), your `preload` scripts run in an
 "Isolated World".  You can read more about context isolation and what it affects in the
-[security](../tutorial/security.md#3-enable-context-isolation-for-remote-content) docs.
+[security](../tutorial/security.md#3-enable-context-isolation) docs.
 
 ## Methods
 

docs/api/safe-storage.md

@@ -18,8 +18,8 @@ The `safeStorage` module has the following methods:
 
 Returns `boolean` - Whether encryption is available.
 
-On Linux, returns true if the app has emitted the `ready` event and the secret key is available.
-On MacOS, returns true if Keychain is available.
+On Linux, returns true if the secret key is
+available. On MacOS, returns true if Keychain is available.
 On Windows, returns true once the app has emitted the `ready` event.
 
 ### `safeStorage.encryptString(plainText)`

docs/api/session.md

@@ -610,7 +610,7 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
     * `notifications` - Request notification creation and the ability to display them in the user's system tray.
     * `midi` - Request MIDI access in the `webmidi` API.
     * `midiSysex` - Request the use of system exclusive messages in the `webmidi` API.
-    * `pointerLock` - Request to directly interpret mouse movements as an input method. Click [here](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API) to know more. These requests always appear to originate from the main frame.
+    * `pointerLock` - Request to directly interpret mouse movements as an input method. Click [here](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API) to know more.
     * `fullscreen` - Request for the app to enter fullscreen mode.
     * `openExternal` - Request to open links in external applications.
     * `unknown` - An unrecognized permission request
@@ -1025,7 +1025,7 @@ is emitted.
 
 #### `ses.getStoragePath()`
 
-Returns `string | null` - The absolute file system path where data for this
+A `string | null` indicating the absolute file system path where data for this
 session is persisted on disk.  For in memory sessions this returns `null`.
 
 ### Instance Properties

docs/api/tray.md

@@ -25,20 +25,15 @@ app.whenReady().then(() => {
 })
 ```
 
-__Platform Considerations__
-
-If you want to keep exact same behaviors on all platforms, you should not
-rely on the `click` event; instead, always attach a context menu to the tray icon.
-
-__Linux__
+__Platform limitations:__
 
+* On Linux the app indicator will be used if it is supported, otherwise
+  `GtkStatusIcon` will be used instead.
 * On Linux distributions that only have app indicator support, you have to
   install `libappindicator1` to make the tray icon work.
-* The app indicator will be used if it is supported, otherwise
-  `GtkStatusIcon` will be used instead.
 * App indicator will only be shown when it has a context menu.
-* The `click` event is ignored when using the app indicator.
-* In order for changes made to individual `MenuItem`s to take effect,
+* When app indicator is used on Linux, the `click` event is ignored.
+* On Linux in order for changes made to individual `MenuItem`s to take effect,
   you have to call `setContextMenu` again. For example:
 
 ```javascript
@@ -60,16 +55,10 @@ app.whenReady().then(() => {
 })
 ```
 
-__MacOS__
+* On Windows it is recommended to use `ICO` icons to get best visual effects.
 
-* Icons passed to the Tray constructor should be [Template Images](native-image.md#template-image).
-* To make sure your icon isn't grainy on retina monitors, be sure your `@2x` image is 144dpi.
-* If you are bundling your application (e.g., with webpack for development), be sure that the file names are not being mangled or hashed. The filename needs to end in Template, and the `@2x` image needs to have the same filename as the standard image, or MacOS will not magically invert your image's colors or use the high density image.
-* 16x16 (72dpi) and 32x32@2x (144dpi) work well for most icons.
-
-__Windows__
-
-* It is recommended to use `ICO` icons to get best visual effects.
+If you want to keep exact same behaviors on all platforms, you should not
+rely on the `click` event and always attach a context menu to the tray icon.
 
 ### `new Tray(image, [guid])`
 

docs/api/web-contents.md

@@ -1635,8 +1635,6 @@ Opens the devtools.
 When `contents` is a `<webview>` tag, the `mode` would be `detach` by default,
 explicitly passing an empty `mode` can force using last used dock state.
 
-On Windows, if Windows Control Overlay is enabled, Devtools will be opened with `mode: 'detach'`.
-
 #### `contents.closeDevTools()`
 
 Closes the devtools.

docs/api/web-frame-main.md

@@ -16,7 +16,7 @@ win.loadURL('https://twitter.com')
 
 win.webContents.on(
   'did-frame-navigate',
-  (event, url, httpResponseCode, httpStatusText, isMainFrame, frameProcessId, frameRoutingId) => {
+  (event, url, isMainFrame, frameProcessId, frameRoutingId) => {
     const frame = webFrameMain.fromId(frameProcessId, frameRoutingId)
     if (frame) {
       const code = 'document.body.innerHTML = document.body.innerHTML.replaceAll("heck", "h*ck")'
@@ -144,16 +144,6 @@ ipcRenderer.on('port', (e, msg) => {
 
 A `string` representing the current URL of the frame.
 
-#### `frame.origin` _Readonly_
-
-A `string` representing the current origin of the frame, serialized according
-to [RFC 6454](https://www.rfc-editor.org/rfc/rfc6454). This may be different
-from the URL. For instance, if the frame is a child window opened to
-`about:blank`, then `frame.origin` will return the parent frame's origin, while
-`frame.url` will return the empty string. Pages without a scheme/host/port
-triple origin will have the serialized origin of `"null"` (that is, the string
-containing the letters n, u, l, l).
-
 #### `frame.top` _Readonly_
 
 A `WebFrameMain | null` representing top frame in the frame hierarchy to which `frame`

docs/breaking-changes.md

@@ -36,10 +36,7 @@ requires unsafe mode), so Electron is unable to support this feature on Linux.
 
 ## Planned Breaking API Changes (19.0)
 
-### Removed: IA32 Linux binaries
-
-This is a result of Chromium 102.0.4999.0 dropping support for IA32 Linux.
-This concludes the [removal of support for IA32 Linux](#removed-ia32-linux-support).
+None
 
 ## Planned Breaking API Changes (18.0)
 
@@ -375,7 +372,7 @@ value.
 In Electron 12, `contextIsolation` will be enabled by default.  To restore
 the previous behavior, `contextIsolation: false` must be specified in WebPreferences.
 
-We [recommend having contextIsolation enabled](tutorial/security.md#3-enable-context-isolation-for-remote-content) for the security of your application.
+We [recommend having contextIsolation enabled](tutorial/security.md#3-enable-context-isolation) for the security of your application.
 
 Another implication is that `require()` cannot be used in the renderer process unless
 `nodeIntegration` is `true` and `contextIsolation` is `false`.
@@ -1206,10 +1203,6 @@ not present, then the native module will fail to load on Windows, with an error
 message like `Cannot find module`. See the [native module
 guide](/docs/tutorial/using-native-node-modules.md) for more.
 
-### Removed: IA32 Linux support
-
-Electron 18 will no longer run on 32-bit Linux systems. See [discontinuing support for 32-bit Linux](https://www.electronjs.org/blog/linux-32bit-support) for more information.
-
 ## Breaking API Changes (3.0)
 
 The following list includes the breaking API changes in Electron 3.0.

docs/faq.md

@@ -135,7 +135,7 @@ is only available in renderer processes.
 
 If [sub-pixel anti-aliasing](https://alienryderflex.com/sub_pixel/) is deactivated, then fonts on LCD screens can look blurry. Example:
 
-![Subpixel rendering example](images/subpixel-rendering-screenshot.gif)
+![subpixel rendering example]
 
 Sub-pixel anti-aliasing needs a non-transparent background of the layer containing the font glyphs. (See [this issue](https://github.com/electron/electron/issues/6344#issuecomment-420371918) for more info).
 
@@ -161,3 +161,4 @@ Notice that just setting the background in the CSS does not have the desired eff
 [indexed-db]: https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API
 [message-port]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
 [browser-window]: api/browser-window.md
+[subpixel rendering example]: images/subpixel-rendering-screenshot.gif

docs/fiddles/features/web-serial/main.js

@@ -28,16 +28,12 @@ function createWindow () {
     if (permission === 'serial' && details.securityOrigin === 'file:///') {
       return true
     }
-    
-    return false
   })
 
   mainWindow.webContents.session.setDevicePermissionHandler((details) => {
     if (details.deviceType === 'serial' && details.origin === 'file://') {
       return true
     }
-    
-    return false
   })
   
   mainWindow.loadFile('index.html')

docs/fiddles/tutorial-first-app/index.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <meta
-      http-equiv="X-Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <title>Hello from Electron renderer!</title>
-  </head>
-  <body>
-    <h1>Hello from Electron renderer!</h1>
-    <p>👋</p>
-    <p id="info"></p>
-  </body>
-  <script src="./renderer.js"></script>
-</html>

docs/fiddles/tutorial-first-app/main.js

@@ -1,26 +0,0 @@
-const { app, BrowserWindow } = require('electron');
-
-const createWindow = () => {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-  });
-
-  win.loadFile('index.html');
-};
-
-app.whenReady().then(() => {
-  createWindow();
-
-  app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) {
-      createWindow();
-    }
-  });
-});
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
-});

docs/fiddles/tutorial-preload/index.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <meta
-      http-equiv="X-Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <title>Hello from Electron renderer!</title>
-  </head>
-  <body>
-    <h1>Hello from Electron renderer!</h1>
-    <p>👋</p>
-    <p id="info"></p>
-  </body>
-  <script src="./renderer.js"></script>
-</html>

docs/fiddles/tutorial-preload/main.js

@@ -1,30 +0,0 @@
-const { app, BrowserWindow } = require('electron');
-const path = require('path');
-
-const createWindow = () => {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js'),
-    },
-  });
-
-  win.loadFile('index.html');
-};
-
-app.whenReady().then(() => {
-  createWindow();
-
-  app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) {
-      createWindow();
-    }
-  });
-});
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
-});

docs/fiddles/tutorial-preload/preload.js

@@ -1,7 +0,0 @@
-const { contextBridge } = require('electron');
-
-contextBridge.exposeInMainWorld('versions', {
-  node: () => process.versions.node,
-  chrome: () => process.versions.chrome,
-  electron: () => process.versions.electron,
-});

docs/fiddles/tutorial-preload/renderer.js

@@ -1,2 +0,0 @@
-const information = document.getElementById('info');
-information.innerText = `This app is using Chrome (v${versions.chrome()}), Node.js (v${versions.node()}), and Electron (v${versions.electron()})`;

docs/tutorial/application-distribution.md

@@ -1,26 +1,26 @@
----
-title: 'Application Packaging'
-description: 'To distribute your app with Electron, you need to package and rebrand it. To do this, you can either use specialized tooling or manual approaches.'
-slug: application-distribution
-hide_title: false
----
+# Application Distribution
 
-To distribute your app with Electron, you need to package and rebrand it. To do this, you
-can either use specialized tooling or manual approaches.
+## Overview
+
+To distribute your app with Electron, you need to package and rebrand it.
+To do this, you can either use specialized tooling or manual approaches.
 
 ## With tooling
 
-There are a couple tools out there that exist to package and distribute your Electron app.
-We recommend using [Electron Forge](https://www.electronforge.io). You can check out
-its documentation directly, or refer to the [Packaging and Distribution](./tutorial-5-packaging.md)
-part of the Electron tutorial.
+You can use the following tools to distribute your application:
 
-## Manual packaging
+* [electron-forge](https://github.com/electron-userland/electron-forge)
+* [electron-builder](https://github.com/electron-userland/electron-builder)
+* [electron-packager](https://github.com/electron/electron-packager)
 
-If you prefer the manual approach, there are 2 ways to distribute your application:
+These tools will take care of all the steps you need to take to end up with a
+distributable Electron application, such as bundling your application,
+rebranding the executable, and setting the right icons.
 
-- With prebuilt binaries
-- With an app source code archive
+You can check the example of how to package your app with `electron-forge` in
+the [Quick Start guide](quick-start.md#package-and-distribute-your-application).
+
+## Manual distribution
 
 ### With prebuilt binaries
 
@@ -29,19 +29,21 @@ binaries](https://github.com/electron/electron/releases). Next, the folder
 containing your app should be named `app` and placed in Electron's resources
 directory as shown in the following examples.
 
-:::note
-The location of Electron's prebuilt binaries is indicated
+> *NOTE:* the location of Electron's prebuilt binaries is indicated
 with `electron/` in the examples below.
-:::
 
-```plain title='macOS'
+*On macOS:*
+
+```plaintext
 electron/Electron.app/Contents/Resources/app/
 ├── package.json
 ├── main.js
 └── index.html
 ```
 
-```plain title='Windows and Linux'
+*On Windows and Linux:*
+
+```plaintext
 electron/resources/app
 ├── package.json
 ├── main.js
@@ -52,7 +54,7 @@ Then execute `Electron.app` on macOS, `electron` on Linux, or `electron.exe`
 on Windows, and Electron will start as your app. The `electron` directory
 will then be your distribution to deliver to users.
 
-### With an app source code archive (asar)
+### With an app source code archive
 
 Instead of shipping your app by copying all of its source files, you can
 package your app into an [asar] archive to improve the performance of reading
@@ -63,12 +65,16 @@ To use an `asar` archive to replace the `app` folder, you need to rename the
 archive to `app.asar`, and put it under Electron's resources directory like
 below, and Electron will then try to read the archive and start from it.
 
-```plain title='macOS'
+*On macOS:*
+
+```plaintext
 electron/Electron.app/Contents/Resources/
 └── app.asar
 ```
 
-```plain title='Windows'
+*On Windows and Linux:*
+
+```plaintext
 electron/resources/
 └── app.asar
 ```
@@ -81,44 +87,47 @@ You can find more details on how to use `asar` in the
 After bundling your app into Electron, you will want to rebrand Electron
 before distributing it to users.
 
-- **Windows:** You can rename `electron.exe` to any name you like, and edit
-  its icon and other information with tools like [rcedit](https://github.com/electron/rcedit).
-- **Linux:** You can rename the `electron` executable to any name you like.
-- **macOS:** You can rename `Electron.app` to any name you want, and you also have to rename
-  the `CFBundleDisplayName`, `CFBundleIdentifier` and `CFBundleName` fields in the
-  following files:
+#### macOS
 
-  - `Electron.app/Contents/Info.plist`
-  - `Electron.app/Contents/Frameworks/Electron Helper.app/Contents/Info.plist`
+You can rename `Electron.app` to any name you want, and you also have to rename
+the `CFBundleDisplayName`, `CFBundleIdentifier` and `CFBundleName` fields in the
+following files:
 
-  You can also rename the helper app to avoid showing `Electron Helper` in the
-  Activity Monitor, but make sure you have renamed the helper app's executable
-  file's name.
+* `Electron.app/Contents/Info.plist`
+* `Electron.app/Contents/Frameworks/Electron Helper.app/Contents/Info.plist`
 
-  The structure of a renamed app would be like:
+You can also rename the helper app to avoid showing `Electron Helper` in the
+Activity Monitor, but make sure you have renamed the helper app's executable
+file's name.
 
-```plain
+The structure of a renamed app would be like:
+
+```plaintext
 MyApp.app/Contents
 ├── Info.plist
 ├── MacOS/
-│   └── MyApp
+│   └── MyApp
 └── Frameworks/
     └── MyApp Helper.app
         ├── Info.plist
         └── MacOS/
-            └── MyApp Helper
+            └── MyApp Helper
 ```
 
-:::note
+#### Windows
 
-it is also possible to rebrand Electron by changing the product name and
+You can rename `electron.exe` to any name you like, and edit its icon and other
+information with tools like [rcedit](https://github.com/electron/rcedit).
+
+#### Linux
+
+You can rename the `electron` executable to any name you like.
+
+### Rebranding by rebuilding Electron from source
+
+It is also possible to rebrand Electron by changing the product name and
 building it from source. To do this you need to set the build argument
 corresponding to the product name (`electron_product_name = "YourProductName"`)
 in the `args.gn` file and rebuild.
 
-Keep in mind this is not recommended as setting up the environment to compile
-from source is not trivial and takes significant time.
-
-:::
-
 [asar]: https://github.com/electron/asar

docs/tutorial/code-signing.md

@@ -1,20 +1,14 @@
----
-title: 'Code Signing'
-description: 'Code signing is a security technology that you use to certify that an app was created by you.'
-slug: code-signing
-hide_title: false
----
+# Code Signing
 
 Code signing is a security technology that you use to certify that an app was
-created by you. You should sign your application so it does not trigger any
-operating system security checks.
+created by you.
 
-On macOS, the system can detect any change to the app, whether the change is
+On macOS the system can detect any change to the app, whether the change is
 introduced accidentally or by malicious code.
 
 On Windows, the system assigns a trust level to your code signing certificate
 which if you don't have, or if your trust level is low, will cause security
-dialogs to appear when users start using your application. Trust level builds
+dialogs to appear when users start using your application.  Trust level builds
 over time so it's better to start code signing as early as possible.
 
 While it is possible to distribute unsigned apps, it is not recommended. Both
@@ -22,19 +16,20 @@ Windows and macOS will, by default, prevent either the download or the execution
 of unsigned applications. Starting with macOS Catalina (version 10.15), users
 have to go through multiple manual steps to open unsigned applications.
 
-![macOS Catalina Gatekeeper warning: The app cannot be opened because the developer cannot be verified](../images/gatekeeper.png)
+![macOS Catalina Gatekeeper warning: The app cannot be opened because the
+developer cannot be verified](../images/gatekeeper.png)
 
 As you can see, users get two options: Move the app straight to the trash or
 cancel running it. You don't want your users to see that dialog.
 
 If you are building an Electron app that you intend to package and distribute,
-it should be code signed.
+it should be code-signed.
 
-## Signing & notarizing macOS builds
+# Signing & notarizing macOS builds
 
-Properly preparing macOS applications for release requires two steps. First, the
-app needs to be code signed. Then, the app needs to be uploaded to Apple for a
-process called **notarization**, where automated systems will further verify that
+Properly preparing macOS applications for release requires two steps: First, the
+app needs to be code-signed. Then, the app needs to be uploaded to Apple for a
+process called "notarization", where automated systems will further verify that
 your app isn't doing anything to endanger its users.
 
 To start the process, ensure that you fulfill the requirements for signing and
@@ -47,18 +42,18 @@ notarizing your app:
 Electron's ecosystem favors configuration and freedom, so there are multiple
 ways to get your application signed and notarized.
 
-### Using Electron Forge
+## `electron-forge`
 
 If you're using Electron's favorite build tool, getting your application signed
 and notarized requires a few additions to your configuration. [Forge](https://electronforge.io) is a
 collection of the official Electron tools, using [`electron-packager`],
 [`electron-osx-sign`], and [`electron-notarize`] under the hood.
 
-Let's take a look at an example `package.json` configuration with all required fields. Not all of them are
-required: the tools will be clever enough to automatically find a suitable `identity`, for instance,
-but we recommend that you are explicit.
+Let's take a look at an example configuration with all required fields. Not all
+of them are required: the tools will be clever enough to automatically find a
+suitable `identity`, for instance, but we recommend that you are explicit.
 
-```json title="package.json" {7}
+```json
 {
   "name": "my-app",
   "version": "0.0.1",
@@ -74,7 +69,7 @@ but we recommend that you are explicit.
         },
         "osxNotarize": {
           "appleId": "felix@felix.fun",
-          "appleIdPassword": "my-apple-id-password"
+          "appleIdPassword": "my-apple-id-password",
         }
       }
     }
@@ -82,11 +77,11 @@ but we recommend that you are explicit.
 }
 ```
 
-The `entitlements.plist` file referenced here needs the following macOS-specific entitlements
+The `plist` file referenced here needs the following macOS-specific entitlements
 to assure the Apple security mechanisms that your app is doing these things
 without meaning any harm:
 
-```xml title="entitlements.plist"
+```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -109,7 +104,7 @@ file](https://github.com/electron/fiddle/blob/master/forge.config.js).
 If you plan to access the microphone or camera within your app using Electron's APIs, you'll also
 need to add the following entitlements:
 
-```xml title="entitlements.plist"
+```xml
 <key>com.apple.security.device.audio-input</key>
 <true/>
 <key>com.apple.security.device.camera</key>
@@ -118,26 +113,28 @@ need to add the following entitlements:
 
 If these are not present in your app's entitlements when you invoke, for example:
 
-```js title="main.js"
+```js
 const { systemPreferences } = require('electron')
+
 const microphone = systemPreferences.askForMediaAccess('microphone')
 ```
 
 Your app may crash. See the Resource Access section in [Hardened Runtime](https://developer.apple.com/documentation/security/hardened_runtime) for more information and entitlements you may need.
 
-### Using Electron Builder
+## `electron-builder`
 
 Electron Builder comes with a custom solution for signing your application. You
 can find [its documentation here](https://www.electron.build/code-signing).
 
-### Using Electron Packager
+## `electron-packager`
 
 If you're not using an integrated build pipeline like Forge or Builder, you
 are likely using [`electron-packager`], which includes [`electron-osx-sign`] and
 [`electron-notarize`].
 
 If you're using Packager's API, you can pass [in configuration that both signs
-and notarizes your application](https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html).
+and notarizes your
+application](https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html).
 
 ```js
 const packager = require('electron-packager')
@@ -158,11 +155,11 @@ packager({
 })
 ```
 
-The `entitlements.plist` file referenced here needs the following macOS-specific entitlements
+The `plist` file referenced here needs the following macOS-specific entitlements
 to assure the Apple security mechanisms that your app is doing these things
 without meaning any harm:
 
-```xml title="entitlements.plist"
+```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -178,11 +175,11 @@ without meaning any harm:
 Up until Electron 12, the `com.apple.security.cs.allow-unsigned-executable-memory` entitlement was required
 as well. However, it should not be used anymore if it can be avoided.
 
-### Signing Mac App Store applications
+## Mac App Store
 
 See the [Mac App Store Guide].
 
-## Signing Windows builds
+# Signing Windows builds
 
 Before signing Windows builds, you must do the following:
 
@@ -193,140 +190,31 @@ Before signing Windows builds, you must do the following:
 You can get a code signing certificate from a lot of resellers. Prices vary, so
 it may be worth your time to shop around. Popular resellers include:
 
-- [digicert](https://www.digicert.com/code-signing/microsoft-authenticode.htm)
-- [Sectigo](https://sectigo.com/ssl-certificates-tls/code-signing)
-- Amongst others, please shop around to find one that suits your needs! 😄
+* [digicert](https://www.digicert.com/code-signing/microsoft-authenticode.htm)
+* [Sectigo](https://sectigo.com/ssl-certificates-tls/code-signing)
+* Amongst others, please shop around to find one that suits your needs, Google
+  is your friend 😄
 
-:::caution Keep your certificate password private
-Your certificate password should be a **secret**. Do not share it publicly or
-commit it to your source code.
-:::
+There are a number of tools for signing your packaged app:
 
-### Using Electron Forge
+* [`electron-winstaller`] will generate an installer for windows and sign it for
+  you
+* [`electron-forge`] can sign installers it generates through the
+  Squirrel.Windows or MSI targets.
+* [`electron-builder`] can sign some of its windows targets
 
-Once you have a code signing certificate file (`.pfx`), you can sign
-[Squirrel.Windows][maker-squirrel] and [MSI][maker-msi] installers in Electron Forge
-with the `certificateFile` and `certificatePassword` fields in their respective
-configuration objects.
-
-For example, if you keep your Forge config in your `package.json` file and are
-creating a Squirrel.Windows installer:
-
-```json {9-15} title='package.json'
-{
-  "name": "my-app",
-  "version": "0.0.1",
-  //...
-  "config": {
-    "forge": {
-      "packagerConfig": {},
-      "makers": [
-        {
-          "name": "@electron-forge/maker-squirrel",
-          "config": {
-            "certificateFile": "./cert.pfx",
-            "certificatePassword": "this-is-a-secret"
-          }
-        }
-      ]
-    }
-  }
-  //...
-}
-```
-
-### Using electron-winstaller (Squirrel.Windows)
-
-[`electron-winstaller`] is a package that can generate Squirrel.Windows installers for your
-Electron app. This is the tool used under the hood by Electron Forge's
-[Squirrel.Windows Maker][maker-squirrel]. If you're not using Electron Forge and want to use
-`electron-winstaller` directly, use the `certificateFile` and `certificatePassword` configuration
-options when creating your installer.
-
-```js {10-11}
-const electronInstaller = require('electron-winstaller')
-// NB: Use this syntax within an async function, Node does not have support for
-//     top-level await as of Node 12.
-try {
-  await electronInstaller.createWindowsInstaller({
-    appDirectory: '/tmp/build/my-app-64',
-    outputDirectory: '/tmp/build/installer64',
-    authors: 'My App Inc.',
-    exe: 'myapp.exe',
-    certificateFile: './cert.pfx',
-    certificatePassword: 'this-is-a-secret',
-  })
-  console.log('It worked!')
-} catch (e) {
-  console.log(`No dice: ${e.message}`)
-}
-```
-
-For full configuration options, check out the [`electron-winstaller`] repository!
-
-### Using electron-wix-msi (WiX MSI)
-
-[`electron-wix-msi`] is a package that can generate MSI installers for your
-Electron app. This is the tool used under the hood by Electron Forge's [MSI Maker][maker-msi].
-
-If you're not using Electron Forge and want to use `electron-wix-msi` directly, use the
-`certificateFile` and `certificatePassword` configuration options
-or pass in parameters directly to [SignTool.exe] with the `signWithParams` option.
-
-```js {12-13}
-import { MSICreator } from 'electron-wix-msi'
-
-// Step 1: Instantiate the MSICreator
-const msiCreator = new MSICreator({
-  appDirectory: '/path/to/built/app',
-  description: 'My amazing Kitten simulator',
-  exe: 'kittens',
-  name: 'Kittens',
-  manufacturer: 'Kitten Technologies',
-  version: '1.1.2',
-  outputDirectory: '/path/to/output/folder',
-  certificateFile: './cert.pfx',
-  certificatePassword: 'this-is-a-secret',
-})
-
-// Step 2: Create a .wxs template file
-const supportBinaries = await msiCreator.create()
-
-// 🆕 Step 2a: optionally sign support binaries if you
-// sign you binaries as part of of your packaging script
-supportBinaries.forEach(async (binary) => {
-  // Binaries are the new stub executable and optionally
-  // the Squirrel auto updater.
-  await signFile(binary)
-})
-
-// Step 3: Compile the template to a .msi file
-await msiCreator.compile()
-```
-
-For full configuration options, check out the [`electron-wix-msi`] repository!
-
-### Using Electron Builder
-
-Electron Builder comes with a custom solution for signing your application. You
-can find [its documentation here](https://www.electron.build/code-signing).
-
-### Signing Windows Store applications
+## Windows Store
 
 See the [Windows Store Guide].
 
-[apple developer program]: https://developer.apple.com/programs/
+[Apple Developer Program]: https://developer.apple.com/programs/
 [`electron-builder`]: https://github.com/electron-userland/electron-builder
 [`electron-forge`]: https://github.com/electron-userland/electron-forge
 [`electron-osx-sign`]: https://github.com/electron-userland/electron-osx-sign
 [`electron-packager`]: https://github.com/electron/electron-packager
 [`electron-notarize`]: https://github.com/electron/electron-notarize
 [`electron-winstaller`]: https://github.com/electron/windows-installer
-[`electron-wix-msi`]: https://github.com/felixrieseberg/electron-wix-msi
-[xcode]: https://developer.apple.com/xcode
+[Xcode]: https://developer.apple.com/xcode
 [signing certificates]: https://github.com/electron/electron-osx-sign/wiki/1.-Getting-Started#certificates
-[mac app store guide]: ./mac-app-store-submission-guide.md
-[windows store guide]: ./windows-store-guide.md
-[maker-squirrel]: https://www.electronforge.io/config/makers/squirrel.windows
-[maker-msi]: https://www.electronforge.io/config/makers/wix-msi
-[signtool.exe]: https://docs.microsoft.com/en-us/dotnet/framework/tools/signtool-exe
+[Mac App Store Guide]: mac-app-store-submission-guide.md
+[Windows Store Guide]: windows-store-guide.md

docs/tutorial/distribution-overview.md

@@ -1,54 +0,0 @@
----
-title: 'Distribution Overview'
-description: 'To distribute your app with Electron, you need to package and rebrand it. To do this, you can either use specialized tooling or manual approaches.'
-slug: distribution-overview
-hide_title: false
----
-
-Once your app is ready for production, there are a couple steps you need to take before
-you can deliver it to your users.
-
-## Packaging
-
-To distribute your app with Electron, you need to package all your resources and assets
-into an executable and rebrand it. To do this, you can either use specialized tooling
-or do it manually. See the [Application Packaging][application-packaging] tutorial
-for more information.
-
-## Code signing
-
-Code signing is a security technology that you use to certify that an app was
-created by you. You should sign your application so it does not trigger the
-security checks of your user's operating system.
-
-To get started with each operating system's code signing process, please read the
-[Code Signing][code-signing] docs.
-
-## Publishing
-
-Once your app is packaged and signed, you can freely distribute your app directly
-to users by uploading your installers online.
-
-To reach more users, you can also choose to upload your app to each operating system's
-digital distribution platform (i.e. app store). These require another build step aside
-from your direct download app. For more information, check out each individual app store guide:
-
-- [Mac App Store][mac-app]
-- [Windows Store][windows-store]
-- [Snapcraft (Linux)][snapcraft]
-
-## Updating
-
-Electron's auto-updater allows you to deliver application updates to users
-without forcing them to manually download new versions of your application.
-Check out the [Updating Applications][updates] guide for details on implementing automatic updates
-with Electron.
-
-<!-- Link labels -->
-
-[application-packaging]: ./application-distribution.md
-[code-signing]: ./code-signing.md
-[mac-app]: ./mac-app-store-submission-guide.md
-[windows-store]: ./windows-store-guide.md
-[snapcraft]: ./snapcraft.md
-[updates]: ./updates.md

docs/tutorial/electron-timelines.md

@@ -22,12 +22,11 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 | 12.0.0 | -- | 2020-Nov-19 | 2021-Mar-02 | M89 | v14.16 | 🚫 |
 | 13.0.0 | -- | 2021-Mar-04 | 2021-May-25 | M91 | v14.16 | 🚫 |
 | 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | M93 | v14.17 | 🚫 |
-| 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 | 🚫 |
-| 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 | 🚫 |
+| 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 | ✅ |
+| 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 | ✅ |
 | 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 | ✅ |
 | 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | M100 | v16.13 | ✅ |
-| 19.0.0 | 2022-Mar-31 | 2022-Apr-26 | 2022-May-24 | M102 | v16.14 | ✅ |
-| 20.0.0 | 2022-May-26 | 2022-Jun-21 | 2022-Aug-02 | M104 | TBD | ✅ |
+| 19.0.0 | 2022-Mar-31 | 2022-Apr-26 | 2022-May-24 | M102 | TBD | ✅ |
 
 **Notes:**
 

docs/tutorial/examples.md

@@ -1,56 +0,0 @@
----
-title: 'Examples Overview'
-description: 'A set of examples for common Electron features'
-slug: examples
-hide_title: false
----
-
-# Examples Overview
-
-In this section, we have collected a set of guides for common features
-that you may want to implement in your Electron application. Each guide
-contains a practical example in a minimal, self-contained example app.
-The easiest way to run these examples is by downloading [Electron Fiddle][fiddle].
-
-Once Fiddle is installed, you can press on the "Open in Fiddle" button that you
-will find below code samples like the following one:
-
-```fiddle docs/fiddles/quick-start
-window.addEventListener('DOMContentLoaded', () => {
-  const replaceText = (selector, text) => {
-    const element = document.getElementById(selector)
-    if (element) element.innerText = text
-  }
-
-  for (const type of ['chrome', 'node', 'electron']) {
-    replaceText(`${type}-version`, process.versions[type])
-  }
-})
-```
-
-If there is still something that you do not know how to do, please take a look at the [API][app]
-as there is a chance it might be documented just there (and also open an issue requesting the
-guide!).
-
-<!-- guide-table-start -->
-
-| Guide                 | Description                                                                                                         |
-| :-------------------- | ------------------------------------------------------------------------------------------------------------------- |
-| [Message ports]       | This guide provides some examples of how you might use MessagePorts in your app to communicate different processes. |
-| [Device access]       | Learn how to access the device hardware (Bluetooth, USB, Serial).                                                   |
-| [Keyboard shortcuts]  | Configure local and global keyboard shortcuts for your Electron application.                                        |
-| [Multithreading]      | With Web Workers, it is possible to run JavaScript in OS-level threads                                              |
-| [Offscreen rendering] | Offscreen rendering lets you obtain the content of a BrowserWindow in a bitmap, so it can be rendered anywhere.     |
-| [Spellchecker]        | Learn how to use the built-in spellchecker, set languages, etc.                                                     |
-| [Web embeds]          | Discover the different ways to embed third-party web content in your application.                                   |
-
-<!-- guide-table-end -->
-
-## How to...?
-
-You can find the full list of "How to?" in the sidebar. If there is
-something that you would like to do that is not documented, please join
-our [Discord server][] and let us know!
-
-[discord server]: https://discord.com/invite/electron
-[fiddle]: https://www.electronjs.org/fiddle

docs/tutorial/in-app-purchases.md

@@ -116,7 +116,7 @@ inAppPurchase.getProducts(PRODUCT_IDS).then(products => {
     console.log(`The price of ${product.localizedTitle} is ${product.formattedPrice}.`)
   })
 
-  // Ask the user which product he/she wants to purchase.
+  // Ask the user which product they want to purchase.
   const selectedProduct = products[0]
   const selectedQuantity = 1
 

docs/tutorial/introduction.md

@@ -1,11 +1,10 @@
----
-title: 'Introduction'
-description: 'Welcome to the Electron documentation! If this is your first time developing an Electron app, read through this Getting Started section to get familiar with the basics. Otherwise, feel free to explore our guides and API documentation!'
-slug: /latest/
-hide_title: false
----
+# Introduction
 
-# What is Electron?
+Welcome to the Electron documentation! If this is your first time developing
+an Electron app, read through this Getting Started section to get familiar with the
+basics. Otherwise, feel free to explore our guides and API documentation!
+
+## What is Electron?
 
 Electron is a framework for building desktop applications using JavaScript,
 HTML, and CSS. By embedding [Chromium][chromium] and [Node.js][node] into its
@@ -13,12 +12,20 @@ binary, Electron allows you to maintain one JavaScript codebase and create
 cross-platform apps that work on Windows, macOS, and Linux — no native development
 experience required.
 
-## Getting started
+## Prerequisites
 
-We recommend you to start with the [tutorial], which guides you through the
-process of developing an Electron app and distributing it to users.
-The [examples] and [API documentation] are also good places to browse around
-and discover new things.
+These docs operate under the assumption that the reader is familiar with both
+Node.js and general web development. If you need to get more comfortable with
+either of these areas, we recommend the following resources:
+
+* [Getting started with the Web (MDN)][mdn-guide]
+* [Introduction to Node.js][node-guide]
+
+Moreover, you'll have a better time understanding how Electron works if you get
+acquainted with Chromium's process model. You can get a brief overview of
+Chrome architecture with the [Chrome comic][comic], which was released alongside
+Chrome's launch back in 2008. Although it's been over a decade since then, the
+core principles introduced in the comic remain helpful to understand Electron.
 
 ## Running examples with Electron Fiddle
 
@@ -32,45 +39,21 @@ a code block. If you have Fiddle installed, this button will open a
 `fiddle.electronjs.org` link that will automatically load the example into Fiddle,
 no copy-pasting required.
 
-```fiddle docs/fiddles/quick-start
-```
-
-## What is in the docs?
-
-All the official documentation is available from the sidebar. These
-are the different categories and what you can expect on each one:
-
-- **Tutorial**: An end-to-end guide on how to create and publish your first Electron
-  application.
-- **Processes in Electron**: In-depth reference on Electron processes and how to work with them.
-- **Best Practices**: Important checklists to keep in mind when developing an Electron app.
-- **Examples**: Quick references to add features to your Electron app.
-- **Development**: Miscellaneous development guides.
-- **Distribution**: Learn how to distribute your app to end users.
-- **Testing and debugging**: How to debug JavaScript, write tests, and other tools used
-  to create quality Electron applications.
-- **References**: Useful links to better understand how the Electron project works
-  and is organized.
-- **Contributing**: Compiling Electron and making contributions can be daunting.
-  We try to make it easier in this section.
-
 ## Getting help
 
 Are you getting stuck anywhere? Here are a few links to places to look:
 
-- If you need help with developing your app, our [community Discord server][discord]
-  is a great place to get advice from other Electron app developers.
-- If you suspect you're running into a bug with the `electron` package, please check
-  the [GitHub issue tracker][issue-tracker] to see if any existing issues match your
-  problem. If not, feel free to fill out our bug report template and submit a new issue.
+* If you need help with developing your app, our [community Discord server][discord]
+is a great place to get advice from other Electron app developers.
+* If you suspect you're running into a bug with the `electron` package, please check
+the [GitHub issue tracker][issue-tracker] to see if any existing issues match your
+problem. If not, feel free to fill out our bug report template and submit a new issue.
 
-<!-- Links -->
-
-[tutorial]: tutorial-1-prerequisites.md
-[api documentation]: ../api/app.md
 [chromium]: https://www.chromium.org/
-[discord]: https://discord.com/invite/APGC3k5yaH
-[examples]: examples.md
+[node]: https://nodejs.org/
+[mdn-guide]: https://developer.mozilla.org/en-US/docs/Learn/Getting_started_with_the_web
+[node-guide]: https://nodejs.dev/learn
+[comic]: https://www.google.com/googlebooks/chrome/
 [fiddle]: https://electronjs.org/fiddle
 [issue-tracker]: https://github.com/electron/electron/issues
-[node]: https://nodejs.org/
+[discord]: https://discord.gg/electronjs

docs/tutorial/message-ports.md

@@ -8,7 +8,8 @@ your app.
 
 Here is a very brief example of what a MessagePort is and how it works:
 
-```js title='renderer.js (Renderer Process)'
+```js
+// renderer.js ///////////////////////////////////////////////////////////////
 // MessagePorts are created in pairs. A connected pair of message ports is
 // called a channel.
 const channel = new MessageChannel()
@@ -27,7 +28,8 @@ port2.postMessage({ answer: 42 })
 ipcRenderer.postMessage('port', null, [port1])
 ```
 
-```js title='main.js (Main Process)'
+```js
+// main.js ///////////////////////////////////////////////////////////////////
 // In the main process, we receive the port.
 ipcMain.on('port', (event) => {
   // When we receive a MessagePort in the main process, it becomes a
@@ -82,84 +84,14 @@ process, you can listen for the `close` event by calling `port.on('close',
 
 ## Example use cases
 
-### Setting up a MessageChannel between two renderers
-
-In this example, the main process sets up a MessageChannel, then sends each port
-to a different renderer. This allows renderers to send messages to each other
-without needing to use the main process as an in-between.
-
-```js title='main.js (Main Process)'
-const { BrowserWindow, app, MessageChannelMain } = require('electron')
-
-app.whenReady().then(async () => {
-  // create the windows.
-  const mainWindow = new BrowserWindow({
-    show: false,
-    webPreferences: {
-      contextIsolation: false,
-      preload: 'preloadMain.js'
-    }
-  })
-
-  const secondaryWindow = BrowserWindow({
-    show: false,
-    webPreferences: {
-      contextIsolation: false,
-      preload: 'preloadSecondary.js'
-    }
-  })
-
-  // set up the channel.
-  const { port1, port2 } = new MessageChannelMain()
-
-  // once the webContents are ready, send a port to each webContents with postMessage.
-  mainWindow.once('ready-to-show', () => {
-    mainWindow.webContents.postMessage('port', null, [port1])
-  })
-
-  secondaryWindow.once('ready-to-show', () => {
-    secondaryWindow.webContents.postMessage('port', null, [port2])
-  })
-})
-```
-
-Then, in your preload scripts you receive the port through IPC and set up the
-listeners.
-
-```js title='preloadMain.js and preloadSecondary.js (Preload scripts)'
-const { ipcRenderer } = require('electron')
-
-ipcRenderer.on('port', e => {
-  // port received, make it globally available.
-  window.electronMessagePort = e.ports[0]
-
-  window.electronMessagePort.onmessage = messageEvent => {
-    // handle message
-  }
-})
-```
-
-In this example messagePort is bound to the `window` object directly. It is better
-to use `contextIsolation` and set up specific contextBridge calls for each of your
-expected messages, but for the simplicity of this example we don't. You can find an
-example of context isolation further down this page at [Communicating directly between the main process and the main world of a context-isolated page](#communicating-directly-between-the-main-process-and-the-main-world-of-a-context-isolated-page)
-
-That means window.messagePort is globally available and you can call
-`postMessage` on it from anywhere in your app to send a message to the other
-renderer.
-
-```js title='renderer.js (Renderer Process)'
-// elsewhere in your code to send a message to the other renderers message handler
-window.electronMessagePort.postmessage('ping')
-```
-
 ### Worker process
 
 In this example, your app has a worker process implemented as a hidden window.
 You want the app page to be able to communicate directly with the worker
 process, without the performance overhead of relaying via the main process.
 
-```js title='main.js (Main Process)'
+```js
+// main.js ///////////////////////////////////////////////////////////////////
 const { BrowserWindow, app, ipcMain, MessageChannelMain } = require('electron')
 
 app.whenReady().then(async () => {
@@ -197,7 +129,8 @@ app.whenReady().then(async () => {
 })
 ```
 
-```html  title='worker.html'
+```html
+<!-- worker.html ------------------------------------------------------------>
 <script>
 const { ipcRenderer } = require('electron')
 
@@ -220,7 +153,8 @@ ipcRenderer.on('new-client', (event) => {
 </script>
 ```
 
-```html  title='app.html'
+```html
+<!-- app.html --------------------------------------------------------------->
 <script>
 const { ipcRenderer } = require('electron')
 
@@ -248,7 +182,9 @@ Electron's built-in IPC methods only support two modes: fire-and-forget
 can implement a "response stream", where a single request responds with a
 stream of data.
 
-```js title='renderer.js (Renderer Process)'
+```js
+// renderer.js ///////////////////////////////////////////////////////////////
+
 const makeStreamingRequest = (element, callback) => {
   // MessageChannels are lightweight--it's cheap to create a new one for each
   // request.
@@ -277,7 +213,9 @@ makeStreamingRequest(42, (data) => {
 // We will see "got response data: 42" 10 times.
 ```
 
-```js  title='main.js (Main Process)'
+```js
+// main.js ///////////////////////////////////////////////////////////////////
+
 ipcMain.on('give-me-a-stream', (event, msg) => {
   // The renderer has sent us a MessagePort that it wants us to send our
   // response over.
@@ -304,7 +242,8 @@ the renderer are delivered to the isolated world, rather than to the main
 world. Sometimes you want to deliver messages to the main world directly,
 without having to step through the isolated world.
 
-```js title='main.js (Main Process)'
+```js
+// main.js ///////////////////////////////////////////////////////////////////
 const { BrowserWindow, app, MessageChannelMain } = require('electron')
 const path = require('path')
 
@@ -339,7 +278,8 @@ app.whenReady().then(async () => {
 })
 ```
 
-```js title='preload.js (Preload Script)'
+```js
+// preload.js ////////////////////////////////////////////////////////////////
 const { ipcRenderer } = require('electron')
 
 // We need to wait until the main world is ready to receive the message before
@@ -357,7 +297,8 @@ ipcRenderer.on('main-world-port', async (event) => {
 })
 ```
 
-```html title='index.html'
+```html
+<!-- index.html ------------------------------------------------------------->
 <script>
 window.onmessage = (event) => {
   // event.source === window means the message is coming from the preload

docs/tutorial/process-model.md

@@ -1,17 +1,10 @@
----
-title: 'Process Model'
-description: 'Electron inherits its multi-process architecture from Chromium, which makes the framework architecturally very similar to a modern web browser. This guide will expand on the concepts applied in the tutorial.'
-slug: process-model
-hide_title: false
----
-
 # Process Model
 
 Electron inherits its multi-process architecture from Chromium, which makes the framework
-architecturally very similar to a modern web browser. This guide will expand on the
-concepts applied in the [Tutorial][tutorial].
+architecturally very similar to a modern web browser. In this guide, we'll expound on
+the conceptual knowledge of Electron that we applied in the minimal [quick start app][].
 
-[tutorial]: ./tutorial-1-prerequisites.md
+[quick start app]: ./quick-start.md
 
 ## Why not a single process?
 
@@ -34,10 +27,10 @@ visualizes this model:
 ![Chrome's multi-process architecture](../images/chrome-processes.png)
 
 Electron applications are structured very similarly. As an app developer, you control
-two types of processes: [main](#the-main-process) and [renderer](#the-renderer-process).
-These are analogous to Chrome's own browser and renderer processes outlined above.
+two types of processes: main and renderer. These are analogous to Chrome's own browser
+and renderer processes outlined above.
 
-[chrome comic]: https://www.google.com/googlebooks/chrome/
+[Chrome Comic]: https://www.google.com/googlebooks/chrome/
 
 ## The main process
 
@@ -47,7 +40,7 @@ to `require` modules and use all of Node.js APIs.
 
 ### Window management
 
-The main process' primary purpose is to create and manage application windows with the
+The primary purpose of the main process is to create and manage application windows with the
 [`BrowserWindow`][browser-window] module.
 
 Each instance of the `BrowserWindow` class creates an application window that loads
@@ -75,7 +68,7 @@ When a `BrowserWindow` instance is destroyed, its corresponding renderer process
 terminated as well.
 
 [browser-window]: ../api/browser-window.md
-[web-embed]: ../tutorial/web-embeds.md
+[web-embed]: ./web-embeds.md
 [web-contents]: ../api/web-contents.md
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 
@@ -97,7 +90,7 @@ app.on('window-all-closed', () => {
 ```
 
 [app]: ../api/app.md
-[quick-start-lifecycle]: ../tutorial/quick-start.md#manage-your-windows-lifecycle
+[quick-start-lifecycle]: ./quick-start.md#manage-your-windows-lifecycle
 
 ### Native APIs
 
@@ -112,7 +105,7 @@ For a full list of Electron's main process modules, check out our API documentat
 
 Each Electron app spawns a separate renderer process for each open `BrowserWindow`
 (and each web embed). As its name implies, a renderer is responsible for
-_rendering_ web content. For all intents and purposes, code ran in renderer processes
+*rendering* web content. For all intents and purposes, code ran in renderer processes
 should behave according to web standards (insofar as Chromium does, at least).
 
 Therefore, all user interfaces and app functionality within a single browser
@@ -122,22 +115,18 @@ web.
 Although explaining every web spec is out of scope for this guide, the bare minimum
 to understand is:
 
-- An HTML file is your entry point for the renderer process.
-- UI styling is added through Cascading Style Sheets (CSS).
-- Executable JavaScript code can be added through `<script>` elements.
+* An HTML file is your entry point for the renderer process.
+* UI styling is added through Cascading Style Sheets (CSS).
+* Executable JavaScript code can be added through `<script>` elements.
 
 Moreover, this also means that the renderer has no direct access to `require`
 or other Node.js APIs. In order to directly include NPM modules in the renderer,
 you must use the same bundler toolchains (for example, `webpack` or `parcel`) that you
 use on the web.
 
-:::warning
-
-Renderer processes can be spawned with a full Node.js environment for ease of
-development. Historically, this used to be the default, but this feature was disabled
-for security reasons.
-
-:::
+> Note: Renderer processes can be spawned with a full Node.js environment for ease of
+> development. Historically, this used to be the default, but this feature was disabled
+> for security reasons.
 
 At this point, you might be wondering how your renderer process user interfaces
 can interact with Node.js and Electron's native desktop functionality if these
@@ -146,9 +135,8 @@ way to import Electron's content scripts.
 
 ## Preload scripts
 
-<!-- Note: This guide doesn't take sandboxing into account, which might fundamentally
+<!-- Note: This guide doesn't take sandboxing into account, which might fundamentally 
 change the statements here. -->
-
 Preload scripts contain code that executes in a renderer process before its web content
 begins loading. These scripts run within the renderer context, but are granted more
 privileges by having access to Node.js APIs.
@@ -161,8 +149,8 @@ const { BrowserWindow } = require('electron')
 //...
 const win = new BrowserWindow({
   webPreferences: {
-    preload: 'path/to/preload.js',
-  },
+    preload: 'path/to/preload.js'
+  }
 })
 //...
 ```
@@ -177,7 +165,7 @@ the [`contextIsolation`][context-isolation] default.
 
 ```js title='preload.js'
 window.myAPI = {
-  desktop: true,
+  desktop: true
 }
 ```
 
@@ -196,7 +184,7 @@ securely:
 const { contextBridge } = require('electron')
 
 contextBridge.exposeInMainWorld('myAPI', {
-  desktop: true,
+  desktop: true
 })
 ```
 
@@ -207,15 +195,14 @@ console.log(window.myAPI)
 
 This feature is incredibly useful for two main purposes:
 
-- By exposing [`ipcRenderer`][ipcrenderer] helpers to the renderer, you can use
+* By exposing [`ipcRenderer`][ipcRenderer] helpers to the renderer, you can use
   inter-process communication (IPC) to trigger main process tasks from the
   renderer (and vice-versa).
-- If you're developing an Electron wrapper for an existing web app hosted on a remote
+* If you're developing an Electron wrapper for an existing web app hosted on a remote
   URL, you can add custom properties onto the renderer's `window` global that can
   be used for desktop-only logic on the web client's side.
 
 [window-mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Window
 [context-isolation]: ./context-isolation.md
 [context-bridge]: ../api/context-bridge.md
-[ipcrenderer]: ../api/ipc-renderer.md
-[tutorial]: ./tutorial-1-prerequisites.md
+[ipcRenderer]: ../api/ipc-renderer.md

docs/tutorial/quick-start.md

@@ -131,6 +131,7 @@ folder of your project:
     <meta charset="UTF-8">
     <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
     <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
+    <meta http-equiv="X-Content-Security-Policy" content="default-src 'self'; script-src 'self'">
     <title>Hello World!</title>
   </head>
   <body>
@@ -426,6 +427,7 @@ window.addEventListener('DOMContentLoaded', () => {
     <meta charset="UTF-8">
     <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
     <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
+    <meta http-equiv="X-Content-Security-Policy" content="default-src 'self'; script-src 'self'">
     <title>Hello World!</title>
   </head>
   <body>

docs/tutorial/security.md

@@ -99,7 +99,7 @@ You should at least follow these steps to improve the security of your applicati
 
 1. [Only load secure content](#1-only-load-secure-content)
 2. [Disable the Node.js integration in all renderers that display remote content](#2-do-not-enable-nodejs-integration-for-remote-content)
-3. [Enable context isolation in all renderers that display remote content](#3-enable-context-isolation-for-remote-content)
+3. [Enable context isolation in all renderers](#3-enable-context-isolation)
 4. [Enable process sandboxing](#4-enable-process-sandboxing)
 5. [Use `ses.setPermissionRequestHandler()` in all sessions that load remote content](#5-handle-session-permission-requests-from-remote-content)
 6. [Do not disable `webSecurity`](#6-do-not-disable-websecurity)
@@ -225,7 +225,7 @@ do consume Node.js modules or features. Preload scripts continue to have access
 to `require` and other Node.js features, allowing developers to expose a custom
 API to remotely loaded content via the [contextBridge API](../api/context-bridge.md).
 
-### 3. Enable Context Isolation for remote content
+### 3. Enable Context Isolation
 
 :::info
 This recommendation is the default behavior in Electron since 12.0.0.

docs/tutorial/tutorial-1-prerequisites.md

@@ -1,143 +0,0 @@
----
-title: 'Prerequisites'
-description: 'This guide will step you through the process of creating a barebones Hello World app in Electron, similar to electron/electron-quick-start.'
-slug: tutorial-prerequisites
-hide_title: false
----
-
-:::info Follow along the tutorial
-
-This is **part 1** of the Electron tutorial.
-
-1. **[Prerequisites][prerequisites]**
-1. [Building your First App][building your first app]
-1. [Using Preload Scripts][preload]
-1. [Adding Features][features]
-1. [Packaging Your Application][packaging]
-1. [Publishing and Updating][updates]
-
-:::
-
-Electron is a framework for building desktop applications using JavaScript,
-HTML, and CSS. By embedding [Chromium][chromium] and [Node.js][node] into a
-single binary file, Electron allows you to create cross-platform apps that
-work on Windows, macOS, and Linux with a single JavaScript codebase.
-
-This tutorial will guide you through the process of developing a desktop
-application with Electron and distributing it to end users.
-
-## Assumptions
-
-Electron is a native wrapper layer for web apps and is run in a Node.js environment.
-Therefore, this tutorial assumes you are generally familiar with Node and
-front-end web development basics. If you need to do some background reading before
-continuing, we recommend the following resources:
-
-- [Getting started with the Web (MDN Web Docs)][mdn-guide]
-- [Introduction to Node.js][node-guide]
-
-## Required tools
-
-### Code editor
-
-You will need a text editor to write your code. We recommend using [Visual Studio Code],
-although you can choose whichever one you prefer.
-
-### Command line
-
-Throughout the tutorial, we will ask you to use various command-line interfaces (CLIs). You can
-type these commands into your system's default terminal:
-
-- Windows: Command Prompt or PowerShell
-- macOS: Terminal
-- Linux: varies depending on distribution (e.g. GNOME Terminal, Konsole)
-
-Most code editors also come with an integrated terminal, which you can also use.
-
-### Git and GitHub
-
-Git is a commonly-used version control system for source code, and GitHub is a collaborative
-development platform built on top of it. Although neither is strictly necessary to building
-an Electron application, we will use GitHub releases to set up automatic updates later
-on in the tutorial. Therefore, we'll require you to:
-
-- [Create a GitHub account](https://github.com/join)
-- [Install Git](https://github.com/git-guides/install-git)
-
-If you're unfamiliar with how Git works, we recommend reading GitHub's [Git guides]. You can also
-use the [GitHub Desktop] app if you prefer using a visual interface over the command line.
-
-We recommend that you create a local Git repository and publish it to GitHub before starting
-the tutorial, and commit your code after every step.
-
-:::info Installing Git via GitHub Desktop
-
-GitHub Desktop will install the latest version of Git on your system if you don't already have
-it installed.
-
-:::
-
-### Node.js and npm
-
-To begin developing an Electron app, you need to install the [Node.js][node-download]
-runtime and its bundled npm package manager onto your system. We recommend that you
-use the latest long-term support (LTS) version.
-
-:::tip
-
-Please install Node.js using pre-built installers for your platform.
-You may encounter incompatibility issues with different development tools otherwise.
-If you are using macOS, we recommend using a package manager like [Homebrew] or
-[nvm] to avoid any directory permission issues.
-
-:::
-
-To check that Node.js was installed correctly, you can use the `-v` flag when
-running the `node` and `npm` commands. These should print out the installed
-versions.
-
-```sh
-$ node -v
-v16.14.2
-$ npm -v
-8.7.0
-```
-
-:::caution
-
-Although you need Node.js installed locally to scaffold an Electron project,
-Electron **does not use your system's Node.js installation to run its code**. Instead, it
-comes bundled with its own Node.js runtime. This means that your end users do not
-need to install Node.js themselves as a prerequisite to running your app.
-
-To check which version of Node.js is running in your app, you can access the global
-[`process.versions`] variable in the main process or preload script. You can also reference
-the list of versions in the [electron/releases] repository.
-
-:::
-
-<!-- Links -->
-
-[chromium]: https://www.chromium.org/
-[electron/releases]: https://github.com/electron/releases/blob/master/readme.md#releases
-[homebrew]: https://brew.sh/
-[mdn-guide]: https://developer.mozilla.org/en-US/docs/Learn/
-[node]: https://nodejs.org/
-[node-guide]: https://nodejs.dev/learn
-[node-download]: https://nodejs.org/en/download/
-[nvm]: https://github.com/nvm-sh/nvm
-[process-model]: ./process-model.md
-[`process.versions`]: https://nodejs.org/api/process.html#processversions
-[github]: https://github.com/
-[git guides]: https://github.com/git-guides/
-[github desktop]: https://desktop.github.com/
-[visual studio code]: https://code.visualstudio.com/
-
-<!-- Tutorial links -->
-
-[prerequisites]: tutorial-1-prerequisites.md
-[building your first app]: tutorial-2-first-app.md
-[preload]: tutorial-3-preload.md
-[features]: tutorial-4-adding-features.md
-[packaging]: tutorial-5-packaging.md
-[updates]: tutorial-6-publishing-updating.md

docs/tutorial/tutorial-2-first-app.md

@@ -1,480 +0,0 @@
----
-title: 'Building your First App'
-description: 'This guide will step you through the process of creating a barebones Hello World app in Electron, similar to electron/electron-quick-start.'
-slug: tutorial-first-app
-hide_title: false
----
-
-:::info Follow along the tutorial
-
-This is **part 2** of the Electron tutorial.
-
-1. [Prerequisites][prerequisites]
-1. **[Building your First App][building your first app]**
-1. [Using Preload Scripts][preload]
-1. [Adding Features][features]
-1. [Packaging Your Application][packaging]
-1. [Publishing and Updating][updates]
-
-:::
-
-## Learning goals
-
-In this part of the tutorial, you will learn how to set up your Electron project
-and write a minimal starter application. By the end of this section,
-you should be able to run a working Electron app in development mode from
-your terminal.
-
-## Setting up your project
-
-:::caution Avoid WSL
-
-If you are on a Windows machine, please do not use [Windows Subsystem for Linux][wsl] (WSL)
-when following this tutorial as you will run into issues when trying to execute the
-application.
-
-<!--https://www.electronforge.io/guides/developing-with-wsl-->
-
-:::
-
-### Initializing your npm project
-
-Electron apps are scaffolded using npm, with the package.json file
-as an entry point. Start by creating a folder and initializing an npm package
-within it with `npm init`.
-
-```sh npm2yarn
-mkdir my-electron-app && cd my-electron-app
-npm init
-```
-
-This command will prompt you to configure some fields in your package.json.
-There are a few rules to follow for the purposes of this tutorial:
-
-- _entry point_ should be `main.js` (you will be creating that file soon).
-- _author_, _license_, and _description_ can be any value, but will be necessary for
-  [packaging][packaging] later on.
-
-Then, install Electron into your app's **devDependencies**, which is the list of external
-development-only package dependencies not required in production.
-
-:::info Why is Electron a devDependency?
-
-This may seem counter-intuitive since your production code is running Electron APIs.
-However, packaged apps will come bundled with the Electron binary, eliminating the need to specify
-it as a production dependency.
-
-:::
-
-```sh npm2yarn
-npm install electron --save-dev
-```
-
-Your package.json file should look something like this after initializing your package
-and installing Electron. You should also now have a `node_modules` folder containing
-the Electron executable, as well as a `package-lock.json` lockfile that specifies
-the exact dependency versions to install.
-
-```json title='package.json'
-{
-  "name": "my-electron-app",
-  "version": "1.0.0",
-  "description": "Hello World!",
-  "main": "main.js",
-  "author": "Jane Doe",
-  "license": "MIT",
-  "devDependencies": {
-    "electron": "19.0.0"
-  }
-}
-```
-
-:::info Advanced Electron installation steps
-
-If installing Electron directly fails, please refer to our [Advanced Installation][installation]
-documentation for instructions on download mirrors, proxies, and troubleshooting steps.
-
-:::
-
-### Adding a .gitignore
-
-The [`.gitignore`][gitignore] file specifies which files and directories to avoid tracking
-with Git. You should place a copy of [GitHub's Node.js gitignore template][gitignore-template]
-into your project's root folder to avoid committing your project's `node_modules` folder.
-
-## Running an Electron app
-
-:::tip Further reading
-
-Read [Electron's process model][process-model] documentation to better
-understand how Electron's multiple processes work together.
-
-:::
-
-The [`main`][package-json-main] script you defined in package.json is the entry point of any
-Electron application. This script controls the **main process**, which runs in a Node.js
-environment and is responsible for controlling your app's lifecycle, displaying native
-interfaces, performing privileged operations, and managing renderer processes
-(more on that later).
-
-Before creating your first Electron app, you will first use a trivial script to ensure your
-main process entry point is configured correctly. Create a `main.js` file in the root folder
-of your project with a single line of code:
-
-```js title='main.js'
-console.log(`Hello from Electron 👋`)
-```
-
-Because Electron's main process is a Node.js runtime, you can execute arbitrary Node.js code
-with the `electron` command (you can even use it as a [REPL]). To execute this script,
-add `electron .` to the `start` command in the [`scripts`][package-scripts]
-field of your package.json. This command will tell the Electron executable to look for the main
-script in the current directory and run it in dev mode.
-
-```json {8-10} title='package.json'
-{
-  "name": "my-electron-app",
-  "version": "1.0.0",
-  "description": "Hello World!",
-  "main": "main.js",
-  "author": "Jane Doe",
-  "license": "MIT",
-  "scripts": {
-    "start": "electron ."
-  },
-  "devDependencies": {
-    "electron": "^19.0.0"
-  }
-}
-```
-
-```sh npm2yarn
-npm run start
-```
-
-Your terminal should print out `Hello from Electron 👋`. Congratulations,
-you have executed your first line of code in Electron! Next, you will learn
-how to create user interfaces with HTML and load that into a native window.
-
-## Loading a web page into a BrowserWindow
-
-In Electron, each window displays a web page that can be loaded either from a local HTML
-file or a remote web address. For this example, you will be loading in a local file. Start
-by creating a barebones web page in an `index.html` file in the root folder of your project:
-
-```html title='index.html'
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <meta
-      http-equiv="X-Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <title>Hello from Electron renderer!</title>
-  </head>
-  <body>
-    <h1>Hello from Electron renderer!</h1>
-    <p>👋</p>
-  </body>
-</html>
-```
-
-Now that you have a web page, you can load it into an Electron [BrowserWindow][browser-window].
-Replace the contents your `main.js` file with the following code. We will explain each
-highlighted block separately.
-
-```js {1,3-10,12-14} title='main.js' showLineNumbers
-const { app, BrowserWindow } = require('electron')
-
-const createWindow = () => {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-  })
-
-  win.loadFile('index.html')
-}
-
-app.whenReady().then(() => {
-  createWindow()
-})
-```
-
-### Importing modules
-
-```js title='main.js (Line 1)'
-const { app, BrowserWindow } = require('electron')
-```
-
-In the first line, we are importing two Electron modules
-with CommonJS module syntax:
-
-- [app][app], which controls your application's event lifecycle.
-- [BrowserWindow][browser-window], which creates and manages app windows.
-
-:::info Capitalization conventions
-
-You might have noticed the capitalization difference between the **a**pp
-and **B**rowser**W**indow modules. Electron follows typical JavaScript conventions here,
-where PascalCase modules are instantiable class constructors (e.g. BrowserWindow, Tray,
-Notification) whereas camelCase modules are not instantiable (e.g. app, ipcRenderer, webContents).
-
-:::
-
-:::warning ES Modules in Electron
-
-[ECMAScript modules](https://nodejs.org/api/esm.html) (i.e. using `import` to load a module)
-are currently not directly supported in Electron. You can find more information about the
-state of ESM in Electron in [electron/electron#21457](https://github.com/electron/electron/issues/21457).
-
-:::
-
-### Writing a reusable function to instantiate windows
-
-The `createWindow()` function loads your web page into a new BrowserWindow instance:
-
-```js title='main.js (Lines 3-10)'
-const createWindow = () => {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-  })
-
-  win.loadFile('index.html')
-}
-```
-
-### Calling your function when the app is ready
-
-```js title='main.js (Lines 12-14)'
-app.whenReady().then(() => {
-  createWindow()
-})
-```
-
-Many of Electron's core modules are Node.js [event emitters] that adhere to Node's asynchronous
-event-driven architecture. The app module is one of these emitters.
-
-In Electron, BrowserWindows can only be created after the app module's [`ready`][app-ready] event
-is fired. You can wait for this event by using the [`app.whenReady()`][app-when-ready] API and
-calling `createWindow()` once its promise is fulfilled.
-
-:::info
-
-You typically listen to Node.js events by using an emitter's `.on` function.
-
-```diff
-+ app.on('ready').then(() => {
-- app.whenReady().then(() => {
-  createWindow()
-})
-```
-
-However, Electron exposes `app.whenReady()` as a helper specifically for the `ready` event to
-avoid subtle pitfalls with directly listening to that event in particular.
-See [electron/electron#21972](https://github.com/electron/electron/pull/21972) for details.
-
-:::
-
-At this point, running your Electron application's `start` command should successfully
-open a window that displays your web page!
-
-Each web page your app displays in a window will run in a separate process called a
-**renderer** process (or simply _renderer_ for short). Renderer processes have access
-to the same JavaScript APIs and tooling you use for typical front-end web
-development, such as using [webpack] to bundle and minify your code or [React][react]
-to build your user interfaces.
-
-## Managing your app's window lifecycle
-
-Application windows behave differently on each operating system. Rather than
-enforce these conventions by default, Electron gives you the choice to implement
-them in your app code if you wish to follow them. You can implement basic window
-conventions by listening for events emitted by the app and BrowserWindow modules.
-
-:::tip Process-specific control flow
-
-Checking against Node's [`process.platform`][node-platform] variable can help you
-to run code conditionally on certain platforms. Note that there are only three
-possible platforms that Electron can run in: `win32` (Windows), `linux` (Linux),
-and `darwin` (macOS).
-
-:::
-
-### Quit the app when all windows are closed (Windows & Linux)
-
-On Windows and Linux, closing all windows will generally quit an application entirely.
-To implement this pattern in your Electron app, listen for the app module's
-[`window-all-closed`][window-all-closed] event, and call [`app.quit()`][app-quit]
-to exit your app if the user is not on macOS.
-
-```js
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') app.quit()
-})
-```
-
-### Open a window if none are open (macOS)
-
-In contrast, macOS apps generally continue running even without any windows open.
-Activating the app when no windows are available should open a new one.
-
-To implement this feature, listen for the app module's [`activate`][activate]
-event, and call your existing `createWindow()` method if no BrowserWindows are open.
-
-Because windows cannot be created before the `ready` event, you should only listen for
-`activate` events after your app is initialized. Do this by only listening for activate
-events inside your existing `whenReady()` callback.
-
-```js
-app.whenReady().then(() => {
-  createWindow()
-
-  app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) createWindow()
-  })
-})
-```
-
-## Final starter code
-
-```fiddle docs/fiddles/tutorial-first-app
-
-```
-
-## Optional: Debugging from VS Code
-
-If you want to debug your application using VS Code, you need to attach VS Code to
-both the main and renderer processes. Here is a sample configuration for you to
-run. Create a launch.json configuration in a new `.vscode` folder in your project:
-
-```json title='.vscode/launch.json'
-{
-  "version": "0.2.0",
-  "compounds": [
-    {
-      "name": "Main + renderer",
-      "configurations": ["Main", "Renderer"],
-      "stopAll": true
-    }
-  ],
-  "configurations": [
-    {
-      "name": "Renderer",
-      "port": 9222,
-      "request": "attach",
-      "type": "pwa-chrome",
-      "webRoot": "${workspaceFolder}"
-    },
-    {
-      "name": "Main",
-      "type": "pwa-node",
-      "request": "launch",
-      "cwd": "${workspaceFolder}",
-      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
-      "windows": {
-        "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
-      },
-      "args": [".", "--remote-debugging-port=9222"],
-      "outputCapture": "std",
-      "console": "integratedTerminal"
-    }
-  ]
-}
-```
-
-The "Main + renderer" option will appear when you select "Run and Debug"
-from the sidebar, allowing you to set breakpoints and inspect all the variables among
-other things in both the main and renderer processes.
-
-What we have done in the `launch.json` file is to create 3 configurations:
-
-- `Main` is used to start the main process and also expose port 9222 for remote debugging
-  (`--remote-debugging-port=9222`). This is the port that we will use to attach the debugger
-  for the `Renderer`. Because the main process is a Node.js process, the type is set to
-  `pwa-node` (`pwa-` is the prefix that tells VS Code to use the latest JavaScript debugger).
-- `Renderer` is used to debug the renderer process. Because the main process is the one
-  that creates the process, we have to "attach" to it (`"request": "attach"`) instead of
-  creating a new one.
-  The renderer process is a web one, so the debugger we have to use is `pwa-chrome`.
-- `Main + renderer` is a [compound task] that executes the previous ones simultaneously.
-
-:::caution
-
-Because we are attaching to a process in `Renderer`, it is possible that the first lines of
-your code will be skipped as the debugger will not have had enough time to connect before they are
-being executed.
-You can work around this by refreshing the page or setting a timeout before executing the code
-in development mode.
-
-:::
-
-:::info Further reading
-
-If you want to dig deeper in the debugging area, the following guides provide more information:
-
-- [Application Debugging]
-- [DevTools Extensions][devtools extension]
-
-:::
-
-## Summary
-
-Electron applications are set up using npm packages. The Electron executable should be installed
-in your project's `devDependencies` and can be run in development mode using a script in your
-package.json file.
-
-The executable runs the JavaScript entry point found in the `main` property of your package.json.
-This file controls Electron's **main process**, which runs an instance of Node.js and is
-responsible for your app's lifecycle, displaying native interfaces, performing privileged operations,
-and managing renderer processes.
-
-**Renderer processes** (or renderers for short) are responsible for display graphical content. You can
-load a web page into a renderer by pointing it to either a web address or a local HTML file.
-Renderers behave very similarly to regular web pages and have access to the same web APIs.
-
-In the next section of the tutorial, we will be learning how to augment the renderer process with
-privileged APIs and how to communicate between processes.
-
-<!-- Links -->
-
-[activate]: ../api/app.md#event-activate-macos
-[advanced-installation]: installation.md
-[app]: ../api/app.md
-[app-quit]: ../api/app.md#appquit
-[app-ready]: ../api/app.md#event-ready
-[app-when-ready]: ../api/app.md#appwhenready
-[application debugging]: ./application-debugging.md
-[browser-window]: ../api/browser-window.md
-[commonjs]: https://nodejs.org/docs/../api/modules.html#modules_modules_commonjs_modules
-[compound task]: https://code.visualstudio.com/Docs/editor/tasks#_compound-tasks
-[devtools extension]: ./devtools-extension.md
-[event emitters]: https://nodejs.org/api/events.html#events
-[gitignore]: https://git-scm.com/docs/gitignore
-[gitignore-template]: https://github.com/github/gitignore/blob/main/Node.gitignore
-[installation]: ./installation.md
-[node-platform]: https://nodejs.org/api/process.html#process_process_platform
-[package-json-main]: https://docs.npmjs.com/cli/v7/configuring-npm/package-json#main
-[package-scripts]: https://docs.npmjs.com/cli/v7/using-npm/scripts
-[process-model]: process-model.md
-[react]: https://reactjs.org
-[repl]: ./repl.md
-[sandbox]: ./sandbox.md
-[webpack]: https://webpack.js.org
-[window-all-closed]: ../api/app.md#event-window-all-closed
-[wsl]: https://docs.microsoft.com/en-us/windows/wsl/about#what-is-wsl-2
-
-<!-- Tutorial links -->
-
-[prerequisites]: tutorial-1-prerequisites.md
-[building your first app]: tutorial-2-first-app.md
-[preload]: tutorial-3-preload.md
-[features]: tutorial-4-adding-features.md
-[packaging]: tutorial-5-packaging.md
-[updates]: tutorial-6-publishing-updating.md

docs/tutorial/tutorial-3-preload.md

@@ -1,271 +0,0 @@
----
-title: 'Using Preload Scripts'
-description: 'This guide will step you through the process of creating a barebones Hello World app in Electron, similar to electron/electron-quick-start.'
-slug: tutorial-preload
-hide_title: false
----
-
-:::info Follow along the tutorial
-
-This is **part 3** of the Electron tutorial.
-
-1. [Prerequisites][prerequisites]
-1. [Building your First App][building your first app]
-1. **[Using Preload Scripts][preload]**
-1. [Adding Features][features]
-1. [Packaging Your Application][packaging]
-1. [Publishing and Updating][updates]
-
-:::
-
-## Learning goals
-
-In this part of the tutorial, you will learn what a preload script is and how to use one
-to securely expose privileged APIs into the renderer process. You will also learn how to
-communicate between main and renderer processes with Electron's inter-process
-communication (IPC) modules.
-
-## What is a preload script?
-
-Electron's main process is a Node.js environment that has full operating system access.
-On top of [Electron modules][modules], you can also access [Node.js built-ins][node-api],
-as well as any packages installed via npm. On the other hand, renderer processes run web
-pages and do not run Node.js by default for security reasons.
-
-To bridge Electron's different process types together, we will need to use a special script
-called a **preload**.
-
-## Augmenting the renderer with a preload script
-
-A BrowserWindow's preload script runs in a context that has access to both the HTML DOM
-and a Node.js environment. Preload scripts are injected before a web page loads in the renderer,
-similar to a Chrome extension's [content scripts][content-script]. To add features to your renderer
-that require privileged access, you can define [global] objects through the
-[contextBridge][contextbridge] API.
-
-To demonstrate this concept, you will create a preload script that exposes your app's
-versions of Chrome, Node, and Electron into the renderer.
-
-Add a new `preload.js` script that exposes selected properties of Electron's `process.versions`
-object to the renderer process in a `versions` global variable.
-
-```js title="preload.js"
-const { contextBridge } = require('electron')
-
-contextBridge.exposeInMainWorld('versions', {
-  node: () => process.versions.node,
-  chrome: () => process.versions.chrome,
-  electron: () => process.versions.electron,
-  // we can also expose variables, not just functions
-})
-```
-
-To attach this script to your renderer process, pass its path to the
-`webPreferences.preload` option in the BrowserWindow constructor:
-
-```js {8-10} title="main.js"
-const { app, BrowserWindow } = require('electron')
-const path = require('path')
-
-const createWindow = () => {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js'),
-    },
-  })
-
-  win.loadFile('index.html')
-}
-
-app.whenReady().then(() => {
-  createWindow()
-})
-```
-
-:::info
-
-There are two Node.js concepts that are used here:
-
-- The [`__dirname`][dirname] string points to the path of the currently executing script
-  (in this case, your project's root folder).
-- The [`path.join`][path-join] API joins multiple path segments together, creating a
-  combined path string that works across all platforms.
-
-:::
-
-At this point, the renderer has access to the `versions` global, so let's display that
-information in the window. This variable can be accessed via `window.versions` or simply
-`versions`. Create a `renderer.js` script that uses the [`document.getElementById`]
-DOM API to replace the displayed text for the HTML element with `info` as its `id` property.
-
-```js title="renderer.js"
-const information = document.getElementById('info')
-information.innerText = `This app is using Chrome (v${versions.chrome()}), Node.js (v${versions.node()}), and Electron (v${versions.electron()})`
-```
-
-Then, modify your `index.html` by adding a new element with `info` as its `id` property,
-and attach your `renderer.js` script:
-
-```html {18,20} title="index.html"
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <meta
-      http-equiv="X-Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <title>Hello from Electron renderer!</title>
-  </head>
-  <body>
-    <h1>Hello from Electron renderer!</h1>
-    <p>👋</p>
-    <p id="info"></p>
-  </body>
-  <script src="./renderer.js"></script>
-</html>
-```
-
-After following the above steps, your app should look something like this:
-
-![Electron app showing This app is using Chrome (v102.0.5005.63), Node.js (v16.14.2), and Electron (v19.0.3)](../images/preload-example.png)
-
-And the code should look like this:
-
-```fiddle docs/fiddles/tutorial-preload
-
-```
-
-## Communicating between processes
-
-As we have mentioned above, Electron's main and renderer process have distinct responsibilities
-and are not interchangeable. This means it is not possible to access the Node.js APIs directly
-from the renderer process, nor the HTML Document Object Model (DOM) from the main process.
-
-The solution for this problem is to use Electron's `ipcMain` and `ipcRenderer` modules for
-inter-process communication (IPC). To send a message from your web page to the main process,
-you can set up a main process handler with `ipcMain.handle` and
-then expose a function that calls `ipcRenderer.invoke` to trigger the handler in your preload script.
-
-To illustrate, we will add a global function to the renderer called `ping()`
-that will return a string from the main process.
-
-First, set up the `invoke` call in your preload script:
-
-```js {1,7} title="preload.js"
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInMainWorld('versions', {
-  node: () => process.versions.node,
-  chrome: () => process.versions.chrome,
-  electron: () => process.versions.electron,
-  ping: () => ipcRenderer.invoke('ping'),
-  // we can also expose variables, not just functions
-})
-```
-
-:::caution IPC security
-
-Notice how we wrap the `ipcRenderer.invoke('ping')` call in a helper function rather
-than expose the `ipcRenderer` module directly via context bridge. You **never** want to
-directly expose the entire `ipcRenderer` module via preload. This would give your renderer
-the ability to send arbitrary IPC messages to the main process, which becomes a powerful
-attack vector for malicious code.
-
-:::
-
-Then, set up your `handle` listener in the main process. We do this _before_
-loading the HTML file so that the handler is guaranteed to be ready before
-you send out the `invoke` call from the renderer.
-
-```js {1,11} title="main.js"
-const { ipcMain } = require('electron')
-
-const createWindow = () => {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js'),
-    },
-  })
-  ipcMain.handle('ping', () => 'pong')
-  win.loadFile('index.html')
-}
-```
-
-Once you have the sender and receiver set up, you can now send messages from the renderer
-to the main process through the `'ping'` channel you just defined.
-
-```js title='renderer.js'
-const func = async () => {
-  const response = await window.versions.ping()
-  console.log(response) // prints out 'pong'
-}
-
-func()
-```
-
-:::info
-
-For more in-depth explanations on using the `ipcRenderer` and `ipcMain` modules,
-check out the full [Inter-Process Communication][ipc] guide.
-
-:::
-
-## Summary
-
-A preload script contains code that runs before your web page is loaded into the browser
-window. It has access to both DOM APIs and Node.js environment, and is often used to
-expose privileged APIs to the renderer via the `contextBridge` API.
-
-Because the main and renderer processes have very different responsibilities, Electron
-apps often use the preload script to set up inter-process communication (IPC) interfaces
-to pass arbitrary messages between the two kinds of processes.
-
-In the next part of the tutorial, we will be showing you resources on adding more
-functionality to your app, then teaching you distributing your app to users.
-
-<!-- Links -->
-
-[advanced-installation]: ./installation.md
-[application debugging]: ./application-debugging.md
-[app]: ../api/app.md
-[app-ready]: ../api/app.md#event-ready
-[app-when-ready]: ../api/app.md#appwhenready
-[browser-window]: ../api/browser-window.md
-[commonjs]: https://nodejs.org/docs/latest/api/modules.html#modules_modules_commonjs_modules
-[compound task]: https://code.visualstudio.com/Docs/editor/tasks#_compound-tasks
-[content-script]: https://developer.chrome.com/docs/extensions/mv3/content_scripts/
-[contextbridge]: ../api/context-bridge.md
-[context-isolation]: ./context-isolation.md
-[`document.getelementbyid`]: https://developer.mozilla.org/en-US/docs/Web/API/Document/getElementById
-[devtools-extension]: ./devtools-extension.md
-[dirname]: https://nodejs.org/api/modules.html#modules_dirname
-[global]: https://developer.mozilla.org/en-US/docs/Glossary/Global_object
-[ipc]: ./ipc.md
-[mdn-csp]: https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
-[modules]: ../api/app.md
-[node-api]: https://nodejs.org/dist/latest/docs/api/
-[package-json-main]: https://docs.npmjs.com/cli/v7/configuring-npm/package-json#main
-[package-scripts]: https://docs.npmjs.com/cli/v7/using-npm/scripts
-[path-join]: https://nodejs.org/api/path.html#path_path_join_paths
-[process-model]: ./process-model.md
-[react]: https://reactjs.org
-[sandbox]: ./sandbox.md
-[webpack]: https://webpack.js.org
-
-<!-- Tutorial links -->
-
-[prerequisites]: tutorial-1-prerequisites.md
-[building your first app]: tutorial-2-first-app.md
-[preload]: tutorial-3-preload.md
-[features]: tutorial-4-adding-features.md
-[packaging]: tutorial-5-packaging.md
-[updates]: tutorial-6-publishing-updating.md

docs/tutorial/tutorial-4-adding-features.md

@@ -1,77 +0,0 @@
----
-title: 'Adding Features'
-description: 'In this step of the tutorial, we will share some resources you should read to add features to your application'
-slug: tutorial-adding-features
-hide_title: false
----
-
-:::info Follow along the tutorial
-
-This is **part 4** of the Electron tutorial.
-
-1. [Prerequisites][prerequisites]
-1. [Building your First App][building your first app]
-1. [Using Preload Scripts][preload]
-1. **[Adding Features][features]**
-1. [Packaging Your Application][packaging]
-1. [Publishing and Updating][updates]
-
-:::
-
-## Adding application complexity
-
-If you have been following along, you should have a functional Electron application
-with a static user interface. From this starting point, you can generally progress
-in developing your app in two broad directions:
-
-1. Adding complexity to your renderer process' web app code
-1. Deeper integrations with the operating system and Node.js
-
-It is important to understand the distinction between these two broad concepts. For the
-first point, Electron-specific resources are not necessary. Building a pretty to-do
-list in Electron is just pointing your Electron BrowserWindow to a pretty
-to-do list web app. Ultimately, you are building your renderer's UI using the same tools
-(HTML, CSS, JavaScript) that you would on the web. Therefore, Electron's docs will
-not go in-depth on how to use standard web tools.
-
-On the other hand, Electron also provides a rich set of tools that allow
-you to integrate with the desktop environment, from creating tray icons to adding
-global shortcuts to displaying native menus. It also gives you all the power of a
-Node.js environment in the main process. This set of capabilities separates
-Electron applications from running a website in a browser tab, and are the
-focus of Electron's documentation.
-
-## How-to examples
-
-Electron's documentation has many tutorials to help you with more advanced topics
-and deeper operating system integrations. To get started, check out the
-[How-To Examples][how-to] doc.
-
-:::note Let us know if something is missing!
-
-If you can't find what you are looking for, please let us know on [GitHub] or in
-our [Discord server][discord]!
-
-:::
-
-## What's next?
-
-For the rest of the tutorial, we will be shifting away from application code
-and giving you a look at how you can get your app from your developer machine
-into end users' hands.
-
-<!-- Link labels -->
-
-[discord]: https://discord.com/invite/APGC3k5yaH
-[github]: https://github.com/electron/electronjs.org-new/issues/new
-[how to]: ./examples.md
-[node-platform]: https://nodejs.org/api/process.html#process_process_platform
-
-<!-- Tutorial links -->
-
-[prerequisites]: tutorial-1-prerequisites.md
-[building your first app]: tutorial-2-first-app.md
-[preload]: tutorial-3-preload.md
-[features]: tutorial-4-adding-features.md
-[packaging]: tutorial-5-packaging.md
-[updates]: tutorial-6-publishing-updating.md

docs/tutorial/tutorial-5-packaging.md

@@ -1,225 +0,0 @@
----
-title: 'Packaging Your Application'
-description: 'To distribute your app with Electron, you need to package it and create installers.'
-slug: tutorial-packaging
-hide_title: false
----
-
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
-
-:::info Follow along the tutorial
-
-This is **part 5** of the Electron tutorial.
-
-1. [Prerequisites][prerequisites]
-1. [Building your First App][building your first app]
-1. [Using Preload Scripts][preload]
-1. [Adding Features][features]
-1. **[Packaging Your Application][packaging]**
-1. [Publishing and Updating][updates]
-
-:::
-
-## Learning goals
-
-In this part of the tutorial, we'll be going over the basics of packaging and distributing
-your app with [Electron Forge].
-
-## Using Electron Forge
-
-Electron does not have any tooling for packaging and distribution bundled into its core
-modules. Once you have a working Electron app in dev mode, you need to use
-additional tooling to create a packaged app you can distribute to your users (also known
-as a **distributable**). Distributables can be either installers (e.g. MSI on Windows) or
-portable executable files (e.g. `.app` on macOS).
-
-Electron Forge is an all-in-one tool that handles the packaging and distribution of Electron
-apps. Under the hood, it combines a lot of existing Electron tools (e.g. [`electron-packager`],
-[`@electron/osx-sign`], [`electron-winstaller`], etc.) into a single interface so you do not
-have to worry about wiring them all together.
-
-### Importing your project into Forge
-
-You can install Electron Forge's CLI in your project's `devDependencies` and import your
-existing project with a handy conversion script.
-
-```sh npm2yarn
-npm install --save-dev @electron-forge/cli
-npx electron-forge import
-```
-
-Once the conversion script is done, Forge should have added a few scripts
-to your `package.json` file.
-
-```json title='package.json'
-  //...
-  "scripts": {
-    "start": "electron-forge start",
-    "package": "electron-forge package",
-    "make": "electron-forge make"
-  },
-  //...
-```
-
-:::info CLI documentation
-
-For more information on `make` and other Forge APIs, check out
-the [Electron Forge CLI documentation].
-
-:::
-
-You should also notice that your package.json now has a few more packages installed
-under your `devDependencies`, and contains an added `config.forge` field with an array
-of makers configured. **Makers** are Forge plugins that create distributables from
-your source code. You should see multiple makers in the pre-populated configuration,
-one for each target platform.
-
-### Creating a distributable
-
-To create a distributable, use your project's new `make` script, which runs the
-`electron-forge make` command.
-
-```sh npm2yarn
-npm run make
-```
-
-This `make` command contains two steps:
-
-1. It will first run `electron-forge package` under the hood, which bundles your app
-   code together with the Electron binary. The packaged code is generated into a folder.
-1. It will then use this packaged app folder to create a separate distributable for each
-   configured maker.
-
-After the script runs, you should see an `out` folder containing both the distributable
-and a folder containing the packaged application code.
-
-```plain title='macOS output example'
-out/
-├── out/make/zip/darwin/x64/my-electron-app-darwin-x64-1.0.0.zip
-├── ...
-└── out/my-electron-app-darwin-x64/my-electron-app.app/Contents/MacOS/my-electron-app
-```
-
-The distributable in the `out/make` folder should be ready to launch! You have now
-created your first bundled Electron application.
-
-:::tip Distributable formats
-
-Electron Forge can be configured to create distributables in different OS-specific formats
-(e.g. DMG, deb, MSI, etc.). See Forge's [Makers] documentation for all configuration options.
-
-:::
-
-:::note Packaging without Electron Forge
-
-If you want to manually package your code, or if you're just interested understanding the
-mechanics behind packaging an Electron app, check out the full [Application Packaging]
-documentation.
-
-:::
-
-## Important: signing your code
-
-In order to distribute desktop applications to end users, we _highly recommended_ for you
-to **code sign** your Electron app. Code signing is an important part of shipping
-desktop applications, and is mandatory for the auto-update step in the final part
-of the tutorial.
-
-Code signing is a security technology that you use to certify that a desktop app was
-created by a known source. Windows and macOS have their own OS-specific code signing
-systems that will make it difficult for users to download or launch unsigned applications.
-
-If you already have code signing certificates for Windows and macOS, you can set your
-credentials in your Forge configuration. Otherwise, please refer to the full
-[Code Signing] documentation to learn how to purchase a certificate and for more information
-on the desktop app code signing process.
-
-On macOS, code signing is done at the app packaging level. On Windows, distributable installers
-are signed instead.
-
-<Tabs>
-  <TabItem value="macos" label="macOS" default>
-
-```json title='package.json' {6-18}
-{
-  //...
-  "config": {
-    "forge": {
-      //...
-      "packagerConfig": {
-        "osxSign": {
-          "identity": "Developer ID Application: Felix Rieseberg (LT94ZKYDCJ)",
-          "hardened-runtime": true,
-          "entitlements": "entitlements.plist",
-          "entitlements-inherit": "entitlements.plist",
-          "signature-flags": "library"
-        },
-        "osxNotarize": {
-          "appleId": "felix@felix.fun",
-          "appleIdPassword": "this-is-a-secret"
-        }
-      }
-      //...
-    }
-  }
-  //...
-}
-```
-
-  </TabItem>
-  <TabItem value="windows" label="Windows">
-
-```json title='package.json'  {6-14}
-{
-  //...
-  "config": {
-    "forge": {
-      //...
-      "makers": [
-        {
-          "name": "@electron-forge/maker-squirrel",
-          "config": {
-            "certificateFile": "./cert.pfx",
-            "certificatePassword": "this-is-a-secret"
-          }
-        }
-      ]
-      //...
-    }
-  }
-  //...
-}
-```
-
-  </TabItem>
-</Tabs>
-
-## Summary
-
-Electron applications need to be packaged to be distributed to users. In this tutorial,
-you imported your app into Electron Forge and configured it to package your app and
-generate installers.
-
-In order for your application to be trusted by the user's system, you need to digitally
-certify that the distributable is authentic and untampered by code signing it. Your app
-can be signed through Forge once you configure it to use your code signing certificate
-information.
-
-[`@electron/osx-sign`]: https://github.com/electron/osx-sign
-[application packaging]: ./application-distribution.md
-[code signing]: ./code-signing.md
-[`electron-packager`]: https://github.com/electron/electron-packager
-[`electron-winstaller`]: https://github.com/electron/windows-installer
-[electron forge]: https://www.electronforge.io
-[electron forge cli documentation]: https://www.electronforge.io/cli#commands
-[makers]: https://www.electronforge.io/config/makers
-
-<!-- Tutorial links -->
-
-[prerequisites]: tutorial-1-prerequisites.md
-[building your first app]: tutorial-2-first-app.md
-[preload]: tutorial-3-preload.md
-[features]: tutorial-4-adding-features.md
-[packaging]: tutorial-5-packaging.md
-[updates]: tutorial-6-publishing-updating.md

docs/tutorial/tutorial-6-publishing-updating.md

@@ -1,251 +0,0 @@
----
-title: 'Publishing and Updating'
-description: "There are several ways to update an Electron application. The easiest and officially supported one is taking advantage of the built-in Squirrel framework and Electron's autoUpdater module."
-slug: tutorial-publishing-updating
-hide_title: false
----
-
-:::info Follow along the tutorial
-
-This is **part 6** of the Electron tutorial.
-
-1. [Prerequisites][prerequisites]
-1. [Building your First App][building your first app]
-1. [Using Preload Scripts][preload]
-1. [Adding Features][features]
-1. [Packaging Your Application][packaging]
-1. **[Publishing and Updating][updates]**
-
-:::
-
-## Learning goals
-
-If you've been following along, this is the last step of the tutorial! In this part,
-you will publish your app to GitHub releases and integrate automatic updates
-into your app code.
-
-## Using update.electronjs.org
-
-The Electron maintainers provide a free auto-updating service for open-source apps
-at https://update.electronjs.org. Its requirements are:
-
-- Your app runs on macOS or Windows
-- Your app has a public GitHub repository
-- Builds are published to [GitHub releases]
-- Builds are [code signed][code-signed]
-
-At this point, we'll assume that you have already pushed all your
-code to a public GitHub repository.
-
-:::info Alternative update services
-
-If you're using an alternate repository host (e.g. GitLab or Bitbucket) or if
-you need to keep your code repository private, please refer to our
-[step-by-step guide][update-server] on hosting your own Electron update server.
-
-:::
-
-## Publishing a GitHub release
-
-Electron Forge has [Publisher] plugins that can automate the distribution
-of your packaged application to various sources. In this tutorial, we will
-be using the GitHub Publisher, which will allow us to publish
-our code to GitHub releases.
-
-### Generating a personal access token
-
-Forge cannot publish to any repository on GitHub without permission. You
-need to pass in an authenticated token that gives Forge access to
-your GitHub releases. The easiest way to do this is to
-[create a new personal access token (PAT)][new-pat]
-with the `public_repo` scope, which gives write access to your public repositories.
-**Make sure to keep this token a secret.**
-
-### Setting up the GitHub Publisher
-
-#### Installing the module
-
-Forge's [GitHub Publisher] is a plugin that
-needs to be installed in your project's `devDependencies`:
-
-```sh npm2yarn
-npm install --save-dev @electron-forge/publisher-github
-```
-
-#### Configuring the publisher in Forge
-
-Once you have it installed, you need to set it up in your Forge
-configuration. A full list of options is documented in the Forge's
-[`PublisherGitHubConfig`] API docs.
-
-```json title='package.json' {6-16}
-{
-  //...
-  "config": {
-    "forge": {
-      "publishers": [
-        {
-          "name": "@electron-forge/publisher-github",
-          "config": {
-            "repository": {
-              "owner": "github-user-name",
-              "name": "github-repo-name"
-            },
-            "prerelease": false,
-            "draft": true
-          }
-        }
-      ]
-    }
-  }
-  //...
-}
-```
-
-:::tip Drafting releases before publishing
-
-Notice that you have configured Forge to publish your release as a draft.
-This will allow you to see the release with its generated artifacts
-without actually publishing it to your end users. You can manually
-publish your releases via GitHub after writing release notes and
-double-checking that your distributables work.
-
-:::
-
-#### Setting up your authentication token
-
-You also need to make the Publisher aware of your authentication token.
-By default, it will use the value stored in the `GITHUB_TOKEN` environment
-variable.
-
-### Running the publish command
-
-Add Forge's [publish command] to your npm scripts.
-
-```json {6} title='package.json'
-  //...
-  "scripts": {
-    "start": "electron-forge start",
-    "package": "electron-forge package",
-    "make": "electron-forge make",
-    "publish": "electron-forge publish"
-  },
-  //...
-```
-
-This command will run your configured makers and publish the output distributables to a new
-GitHub release.
-
-```sh npm2yarn
-npm run publish
-```
-
-By default, this will only publish a single distributable for your host operating system and
-architecture. You can publish for different architectures by passing in the `--arch` flag to your
-Forge commands.
-
-The name of this release will correspond to the `version` field in your project's package.json file.
-
-:::tip Tagging releases
-
-Optionally, you can also [tag your releases in Git][git-tag] so that your
-release is associated with a labeled point in your code history. npm comes
-with a handy [`npm version`](https://docs.npmjs.com/cli/v8/commands/npm-version)
-command that can handle the version bumping and tagging for you.
-
-:::
-
-#### Bonus: Publishing in GitHub Actions
-
-Publishing locally can be painful, especially because you can only create distributables
-for your host operating system (i.e. you can't publish a Window `.exe` file from macOS).
-
-A solution for this would be to publish your app via automation workflows
-such as [GitHub Actions], which can run tasks in the
-cloud on Ubuntu, macOS, and Windows. This is the exact approach taken by [Electron Fiddle].
-You can refer to Fiddle's [Build and Release pipeline][fiddle-build]
-and [Forge configuration][fiddle-forge-config]
-for more details.
-
-## Instrumenting your updater code
-
-Now that we have a functional release system via GitHub releases, we now need to tell our
-Electron app to download an update whenever a new release is out. Electron apps do this
-via the [autoUpdater] module, which reads from an update server feed to check if a new version
-is available for download.
-
-The update.electronjs.org service provides an updater-compatible feed. For example, Electron
-Fiddle v0.28.0 will check the endpoint at https://update.electronjs.org/electron/fiddle/darwin/v0.28.0
-to see if a newer GitHub release is available.
-
-After your release is published to GitHub, the update.electronjs.org service should work
-for your application. The only step left is to configure the feed with the autoUpdater module.
-
-To make this process easier, the Electron team maintains the [`update-electron-app`] module,
-which sets up the autoUpdater boilerplate for update.electronjs.org in one function
-call — no configuration required. This module will search for the update.electronjs.org
-feed that matches your project's package.json `"repository"` field.
-
-First, install the module as a runtime dependency.
-
-```sh npm2yarn
-npm install update-electron-app
-```
-
-Then, import the module and call it immediately in the main process.
-
-```js title='main.js'
-require('update-electron-app')()
-```
-
-And that is all it takes! Once your application is packaged, it will update itself for each new
-GitHub release that you publish.
-
-## Summary
-
-In this tutorial, we configured Electron Forge's GitHub Publisher to upload your app's
-distributables to GitHub releases. Since distributables cannot always be generated
-between platforms, we recommend setting up your building and publishing flow
-in a Continuous Integration pipeline if you do not have access to machines.
-
-Electron applications can self-update by pointing the autoUpdater module to an update server feed.
-update.electronjs.org is a free update server provided by Electron for open-source applications
-published on GitHub releases. Configuring your Electron app to use this service is as easy as
-installing and importing the `update-electron-app` module.
-
-If your application is not eligible for update.electronjs.org, you should instead deploy your
-own update server and configure the autoUpdater module yourself.
-
-:::info 🌟 You're done!
-
-From here, you have officially completed our tutorial to Electron. Feel free to explore the
-rest of our docs and happy developing! If you have questions, please stop by our community
-[Discord server].
-
-:::
-
-[autoupdater]: ../api/auto-updater.md
-[code-signed]: ./code-signing.md
-[discord server]: https://discord.com/invite/APGC3k5yaH
-[electron fiddle]: https://electronjs.org/fiddle
-[fiddle-build]: https://github.com/electron/fiddle/blob/master/.github/workflows/build.yaml
-[fiddle-forge-config]: https://github.com/electron/fiddle/blob/master/forge.config.js
-[github actions]: https://github.com/features/actions
-[github publisher]: https://www.electronforge.io/config/publishers/github
-[github releases]: https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository
-[git tag]: https://git-scm.com/book/en/v2/Git-Basics-Tagging
-[new-pat]: https://github.com/settings/tokens/new
-[publish command]: https://www.electronforge.io/cli#publish
-[publisher]: https://www.electronforge.io/config/publishers
-[`publishergithubconfig`]: https://js.electronforge.io/publisher/github/interfaces/publishergithubconfig
-[`update-electron-app`]: https://github.com/electron/update-electron-app
-[update-server]: ./updates.md
-
-<!-- Tutorial links -->
-
-[prerequisites]: tutorial-1-prerequisites.md
-[building your first app]: tutorial-2-first-app.md
-[preload]: tutorial-3-preload.md
-[features]: tutorial-4-adding-features.md
-[packaging]: tutorial-5-packaging.md
-[updates]: tutorial-6-publishing-updating.md

docs/tutorial/updates.md

@@ -1,16 +1,11 @@
----
-title: 'Updating Applications'
-description: "There are several ways to update an Electron application. The easiest and officially supported one is taking advantage of the built-in Squirrel framework and Electron's autoUpdater module."
-slug: updates
-hide_title: false
----
+# Updating Applications
 
-There are several ways to provide automatic updates to your Electron application.
-The easiest and officially supported one is taking advantage of the built-in
+There are several ways to update an Electron application. The easiest and
+officially supported one is taking advantage of the built-in
 [Squirrel](https://github.com/Squirrel) framework and
 Electron's [autoUpdater](../api/auto-updater.md) module.
 
-## Using update.electronjs.org
+## Using `update.electronjs.org`
 
 The Electron team maintains [update.electronjs.org], a free and open-source
 webservice that Electron apps can use to self-update. The service is designed
@@ -18,77 +13,72 @@ for Electron apps that meet the following criteria:
 
 - App runs on macOS or Windows
 - App has a public GitHub repository
-- Builds are published to [GitHub Releases][gh-releases]
-- Builds are [code-signed](./code-signing.md)
+- Builds are published to GitHub Releases
+- Builds are code-signed
 
 The easiest way to use this service is by installing [update-electron-app],
 a Node.js module preconfigured for use with update.electronjs.org.
 
-Install the module using your Node.js package manager of choice:
+Install the module:
 
-```sh npm2yarn
+```sh
 npm install update-electron-app
 ```
 
-Then, invoke the updater from your app's main process file:
+Invoke the updater from your app's main process file:
 
-```js title="main.js"
+```js
 require('update-electron-app')()
 ```
 
 By default, this module will check for updates at app startup, then every ten
-minutes. When an update is found, it will automatically be downloaded in the background.
-When the download completes, a dialog is displayed allowing the user to restart the app.
+minutes. When an update is found, it will automatically be downloaded in the background. When the download completes, a dialog is displayed allowing the user
+to restart the app.
 
 If you need to customize your configuration, you can
-[pass options to update-electron-app][update-electron-app]
+[pass options to `update-electron-app`][update-electron-app]
 or
 [use the update service directly][update.electronjs.org].
 
-## Using other update services
+## Deploying an Update Server
 
 If you're developing a private Electron application, or if you're not
 publishing releases to GitHub Releases, it may be necessary to run your own
 update server.
 
-### Step 1: Deploying an update server
-
 Depending on your needs, you can choose from one of these:
 
 - [Hazel][hazel] – Update server for private or open-source apps which can be
-  deployed for free on [Vercel][vercel]. It pulls from [GitHub Releases][gh-releases]
-  and leverages the power of GitHub's CDN.
+deployed for free on [Vercel][vercel]. It pulls from [GitHub Releases][gh-releases]
+and leverages the power of GitHub's CDN.
 - [Nuts][nuts] – Also uses [GitHub Releases][gh-releases], but caches app
-  updates on disk and supports private repositories.
+updates on disk and supports private repositories.
 - [electron-release-server][electron-release-server] – Provides a dashboard for
-  handling releases and does not require releases to originate on GitHub.
+handling releases and does not require releases to originate on GitHub.
 - [Nucleus][nucleus] – A complete update server for Electron apps maintained by
-  Atlassian. Supports multiple applications and channels; uses a static file store
-  to minify server cost.
+Atlassian. Supports multiple applications and channels; uses a static file store
+to minify server cost.
 
-Once you've deployed your update server, you can instrument your app code to receive and
-apply the updates with Electron's [autoUpdater] module.
+## Implementing Updates in Your App
 
-### Step 2: Receiving updates in your app
+Once you've deployed your update server, continue with importing the required
+modules in your code. The following code might vary for different server
+software, but it works like described when using
+[Hazel][hazel].
 
-First, import the required modules in your main process code. The following code might
-vary for different server software, but it works like described when using [Hazel][hazel].
+**Important:** Please ensure that the code below will only be executed in
+your packaged app, and not in development. You can use
+[electron-is-dev](https://github.com/sindresorhus/electron-is-dev) to check for
+the environment.
 
-:::warning Check your execution environment!
-
-Please ensure that the code below will only be executed in your packaged app, and not in development.
-You can use the [app.isPackaged](../api/app.md#appispackaged-readonly) API to check the environment.
-
-:::
-
-```javascript title='main.js'
+```javascript
 const { app, autoUpdater, dialog } = require('electron')
 ```
 
-Next, construct the URL of the update server feed and tell
+Next, construct the URL of the update server and tell
 [autoUpdater](../api/auto-updater.md) about it:
 
-```javascript title='main.js'
+```javascript
 const server = 'https://your-deployment-url.com'
 const url = `${server}/update/${process.platform}/${app.getVersion()}`
 
@@ -97,32 +87,32 @@ autoUpdater.setFeedURL({ url })
 
 As the final step, check for updates. The example below will check every minute:
 
-```javascript title='main.js'
+```javascript
 setInterval(() => {
   autoUpdater.checkForUpdates()
 }, 60000)
 ```
 
-Once your application is [packaged](./application-distribution.md),
+Once your application is [packaged](../tutorial/application-distribution.md),
 it will receive an update for each new
 [GitHub Release](https://help.github.com/articles/creating-releases/) that you
 publish.
 
-### Step 3: Notifying users when updates are available
+## Applying Updates
 
 Now that you've configured the basic update mechanism for your application, you
 need to ensure that the user will get notified when there's an update. This
-can be achieved using the [autoUpdater API events](../api/auto-updater.md#events):
+can be achieved using the autoUpdater API
+[events](../api/auto-updater.md#events):
 
-```javascript title="main.js"
+```javascript
 autoUpdater.on('update-downloaded', (event, releaseNotes, releaseName) => {
   const dialogOpts = {
     type: 'info',
     buttons: ['Restart', 'Later'],
     title: 'Application Update',
     message: process.platform === 'win32' ? releaseNotes : releaseName,
-    detail:
-      'A new version has been downloaded. Restart the application to apply the updates.',
+    detail: 'A new version has been downloaded. Restart the application to apply the updates.'
   }
 
   dialog.showMessageBox(dialogOpts).then((returnValue) => {
@@ -135,22 +125,16 @@ Also make sure that errors are
 [being handled](../api/auto-updater.md#event-error). Here's an example
 for logging them to `stderr`:
 
-```javascript title="main.js"
-autoUpdater.on('error', (message) => {
+```javascript
+autoUpdater.on('error', message => {
   console.error('There was a problem updating the application')
   console.error(message)
 })
 ```
 
-:::info Handling updates manually
+## Handling Updates Manually
 
-Because the requests made by autoUpdate aren't under your direct control, you may find situations
-that are difficult to handle (such as if the update server is behind authentication). The `url`
-field supports the `file://` protocol, which means that with some effort, you can sidestep the
-server-communication aspect of the process by loading your update from a local directory.
-[Here's an example of how this could work](https://github.com/electron/electron/issues/5020#issuecomment-477636990).
-
-:::
+Because the requests made by Auto Update aren't under your direct control, you may find situations that are difficult to handle (such as if the update server is behind authentication). The `url` field does support files, which means that with some effort, you can sidestep the server-communication aspect of the process. [Here's an example of how this could work](https://github.com/electron/electron/issues/5020#issuecomment-477636990).
 
 [vercel]: https://vercel.com
 [hazel]: https://github.com/vercel/hazel

docs/tutorial/windows-taskbar.md

@@ -41,9 +41,10 @@ as quoted from [MSDN][msdn-jumplist]:
 > confuse the user who does not expect that portion of the destination list to
 > change.
 
-![Taskbar JumpList](../images/windows-taskbar-jumplist.png)
+![IE](https://i-msdn.sec.s-msft.com/dynimg/IC420539.png)
 
-> NOTE: The screenshot above is an example of general tasks for Microsoft Edge
+> NOTE: The screenshot above is an example of general tasks of
+Internet Explorer
 
 Unlike the dock menu in macOS which is a real menu, user tasks in Windows work
 like application shortcuts. For example, when a user clicks a task, the program
@@ -108,7 +109,7 @@ As quoted from [MSDN][msdn-thumbnail]:
 > For example, Windows Media Player might offer standard media transport controls
 > such as play, pause, mute, and stop.
 
-![Thumbnail toolbar](../images/windows-taskbar-thumbnail-toolbar.png)
+![player](https://i-msdn.sec.s-msft.com/dynimg/IC420540.png)
 
 > NOTE: The screenshot above is an example of thumbnail toolbar of Windows
 Media Player
@@ -175,7 +176,7 @@ As quoted from [MSDN][msdn-icon-overlay]:
 > network status, messenger status, or new mail. The user should not be
 > presented with constantly changing overlays or animations.
 
-![Overlay on taskbar button](../images/windows-taskbar-icon-overlay.png)
+![Overlay on taskbar button](https://i-msdn.sec.s-msft.com/dynimg/IC420441.png)
 
 > NOTE: The screenshot above is an example of overlay on a taskbar button
 

electron_paks.gni

@@ -54,6 +54,8 @@ template("electron_extra_paks") {
                            ])
     output = "${invoker.output_dir}/resources.pak"
     sources = [
+      "$root_gen_dir/chrome/browser_resources.pak",
+      "$root_gen_dir/chrome/common_resources.pak",
       "$root_gen_dir/chrome/dev_ui_browser_resources.pak",
       "$root_gen_dir/components/components_resources.pak",
       "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
@@ -65,10 +67,13 @@ template("electron_extra_paks") {
       "$root_gen_dir/net/net_resources.pak",
       "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
       "$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
+      "$root_gen_dir/ui/resources/webui_resources.pak",
       "$target_gen_dir/electron_resources.pak",
     ]
     deps = [
       "//chrome/browser:dev_ui_browser_resources",
+      "//chrome/browser:resources",
+      "//chrome/common:resources",
       "//components/resources",
       "//content:content_resources",
       "//content:dev_ui_content_resources",
@@ -172,22 +177,26 @@ template("electron_paks") {
     }
 
     source_patterns = [
+      "${root_gen_dir}/chrome/locale_settings_",
       "${root_gen_dir}/chrome/platform_locale_settings_",
+      "${root_gen_dir}/chrome/generated_resources_",
+      "${root_gen_dir}/components/strings/components_locale_settings_",
       "${root_gen_dir}/components/strings/components_strings_",
+      "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
+      "${root_gen_dir}/services/strings/services_strings_",
       "${root_gen_dir}/third_party/blink/public/strings/blink_accessibility_strings_",
       "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
-      "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
-      "${root_gen_dir}/extensions/strings/extensions_strings_",
-      "${root_gen_dir}/services/strings/services_strings_",
       "${root_gen_dir}/ui/strings/app_locale_settings_",
       "${root_gen_dir}/ui/strings/ax_strings_",
       "${root_gen_dir}/ui/strings/ui_strings_",
     ]
     deps = [
+      "//chrome/app:generated_resources",
+      "//chrome/app/resources:locale_settings",
       "//chrome/app/resources:platform_locale_settings",
+      "//components/strings:components_locale_settings",
       "//components/strings:components_strings",
       "//device/bluetooth/strings",
-      "//extensions/strings",
       "//services/strings",
       "//third_party/blink/public/strings",
       "//third_party/blink/public/strings:accessibility_strings",

electron_resources.grd

@@ -11,15 +11,8 @@
     <output filename="electron_resources.pak" type="data_package" />
   </outputs>
   <release seq="1" allow_pseudo="false">
-    <messages fallback_to_english="true">
-      <!-- TODO(deepak1556): Add translations,
-           check https://www.chromium.org/developers/design-documents/ui-localization -->
-      <part file="electron_strings.grdp" />
-    </messages>
     <includes>
       <include name="IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE" file="${target_gen_dir}/shell_devtools_discovery_page.html" use_base_dir="false" type="BINDATA" />
-      <include name="IDR_PDF_MANIFEST" file="../chrome/browser/resources/pdf/manifest.json" type="BINDATA" />
-      <include name="IDR_CRYPTOTOKEN_MANIFEST" file="../chrome/browser/resources/cryptotoken/manifest.json" type="BINDATA" />
     </includes>
   </release>
 </grit>

electron_strings.grdp

@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<grit-part>
-  <!-- Windows Caption Buttons -->
-  <message name="IDS_APP_ACCNAME_CLOSE" desc="The accessible name for the Close button.">
-    Close
-  </message>
-  <message name="IDS_APP_ACCNAME_MINIMIZE" desc="The accessible name for the Minimize button.">
-    Minimize
-  </message>
-  <message name="IDS_APP_ACCNAME_MAXIMIZE" desc="The accessible name for the Maximize button.">
-    Maximize
-  </message>
-  <message name="IDS_APP_ACCNAME_RESTORE" desc="The accessible name for the Restore button.">
-    Restore
-  </message>
-
-  <!-- Printing Service -->
-  <message name="IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME" desc="The name of the utility process used for printing conversions.">
-    Printing Service
-  </message>
-  <message name="IDS_PRINT_INVALID_PRINTER_SETTINGS" desc="Message to display when selected printer is not reachable or its settings are invalid.">
-    The selected printer is not available or not installed correctly. <ph name="BR">&lt;br&gt;</ph> Check your printer or try selecting another printer.
-  </message>
-  <message name="IDS_DEFAULT_PRINT_DOCUMENT_TITLE" desc="Default title for a print document">
-    Untitled Document
-  </message>
-  <message name="IDS_UTILITY_PROCESS_PRINT_BACKEND_SERVICE_NAME" desc="The name of the utility process used for backend interactions with printer drivers.">
-    Print Backend Service
-  </message>
-
-  <!-- Desktop Capturer API -->
-  <message name="IDS_DESKTOP_MEDIA_PICKER_SINGLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there is only one monitor.">
-    Entire Screen
-  </message>
-  <message name="IDS_DESKTOP_MEDIA_PICKER_MULTIPLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there are multiple monitors.">
-    {SCREEN_INDEX, plural, =1{Screen #} other{Screen #}}
-  </message>
-
-  <!-- File Select Helper-->
-  <message name="IDS_IMAGE_FILES" desc="The description of the image file extensions in the select file dialog.">
-    Image Files
-  </message>
-  <message name="IDS_AUDIO_FILES" desc="The description of the audio file extensions in the select file dialog.">
-    Audio Files
-  </message>
-  <message name="IDS_VIDEO_FILES" desc="The description of the video file extensions in the select file dialog.">
-    Video Files
-  </message>
-  <message name="IDS_CUSTOM_FILES" desc="The description of the custom file extensions in the select file dialog.">
-    Custom Files
-  </message>
-  <message name="IDS_DEFAULT_DOWNLOAD_FILENAME" desc="Default name for downloaded files when we have no idea what they could be.">
-    download
-  </message>
-
-  <!-- Picture-in-Picture -->
-  <if expr="is_macosx">
-    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
-      Picture in Picture
-    </message>
-  </if>
-  <if expr="not is_macosx">
-    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
-      Picture in picture
-    </message>
-  </if>
-  <message name="IDS_PICTURE_IN_PICTURE_PAUSE_CONTROL_TEXT" desc="Text label of the pause control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently playing.">
-    Pause
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_PLAY_CONTROL_TEXT" desc="Text label of the play control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently paused.">
-    Play
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_REPLAY_CONTROL_TEXT" desc="Text label of the replay control button. The button appears when the user hovers over the Picture-in-Picture window and the video is ended.">
-    Play from the beginning
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_BACK_TO_TAB_CONTROL_TEXT" desc="Text label of the back to tab control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Back to video player
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently unmuted.">
-    Mute
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently muted.">
-    Unmute
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_SKIP_AD_CONTROL_TEXT" desc="Text label of the skip ad control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Skip Ad
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_MUTE_MICROPHONE_TEXT" desc="Text label of the mute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Mute microphone
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_MICROPHONE_TEXT" desc="Text label of the unmute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Unmute microphone
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_TURN_ON_CAMERA_TEXT" desc="Text label of the turn on camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Turn on camera
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_TURN_OFF_CAMERA_TEXT" desc="Text label of the turn off camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Turn off camera
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_HANG_UP_TEXT" desc="Text label of the hang up control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Hang up
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_CLOSE_CONTROL_TEXT" desc="Text label of the close control button. The button appears when the user hovers over the Picture-in-Picture window.">
-    Close
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_RESIZE_HANDLE_TEXT" desc="Text label of the resize handle. The button appears when the user hovers over the Picture-in-Picture window.">
-    Resize
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_PLAY_PAUSE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles between play and pause controls.">
-    Toggle video to play or pause
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles mute state.">
-    Toggle mute
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_NEXT_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes next track action.">
-    Next track
-  </message>
-  <message name="IDS_PICTURE_IN_PICTURE_PREVIOUS_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes previous track action.">
-    Previous track
-  </message>
-  <message name="IDS_SPELLCHECK_DICTIONARY" use_name_for_id="true">
-    en-US
-  </message>
-  <message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
-    en-US,en
-  </message>
-  <if expr="is_win">
-    <message name="IDS_UTILITY_PROCESS_UTILITY_WIN_NAME" desc="The name of the utility process used to handle Windows utility operations.">
-      Windows Utilities
-    </message>
-  </if>
-  <message name="IDS_DOWNLOAD_MORE_ACTIONS"
-          desc="Tooltip of a button on the downloads page that shows a menu with actions like 'Open downloads folder' or 'Clear all'">
-    More actions
-  </message>
-  <!-- Badging -->
-  <message name="IDS_SATURATED_BADGE_CONTENT" desc="The content to display when the application's badge is too large to display to indicate that the badge is more than a given maximum. This string should be as short as possible, preferably only one character beyond the content">
-    <ph name="MAXIMUM_VALUE">$1<ex>99</ex></ph>+
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_SATURATED" desc="The accessibility text which will be read by a screen reader when the notification count is too large to display (e.g. greater than 99).">
-    {MAX_UNREAD_NOTIFICATIONS, plural, =1 {More than 1 unread notification} other {More than # unread notifications}}
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_UNSPECIFIED" desc="The accessibility text which will be read by a screen reader when there are some unspecified number of notifications, or user attention is required">
-    Unread Notifications
-  </message>
-  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS" desc="The accessibility text which will be read by a screen reader when there are notifcatications">
-    {UNREAD_NOTIFICATIONS, plural, =1 {1 Unread Notification} other {# Unread Notifications}}
-  </message>
-  <message name="IDS_HID_CHOOSER_ITEM_WITHOUT_NAME" desc="User option displaying the device IDs for a Human Interface Device (HID) without a device name.">
-        Unknown Device (<ph name="DEVICE_ID">$1<ex>1234:abcd</ex></ph>) </message>
-  <if expr="is_win">
-    <then>
-      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for a graphic (image) on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
-        Unlabeled graphic
-      </message>
-    </then>
-    <else>
-      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for an image on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
-        Unlabeled image
-      </message>
-    </else>
-  </if>
-</grit-part>

filenames.gni

@@ -23,7 +23,6 @@ filenames = {
 
   lib_sources_linux = [
     "shell/browser/browser_linux.cc",
-    "shell/browser/electron_browser_main_parts_linux.cc",
     "shell/browser/lib/power_observer_linux.cc",
     "shell/browser/lib/power_observer_linux.h",
     "shell/browser/linux/unity_service.cc",
@@ -86,8 +85,6 @@ filenames = {
     "shell/browser/ui/message_box_win.cc",
     "shell/browser/ui/tray_icon_win.cc",
     "shell/browser/ui/views/electron_views_delegate_win.cc",
-    "shell/browser/ui/views/win_icon_painter.cc",
-    "shell/browser/ui/views/win_icon_painter.h",
     "shell/browser/ui/views/win_frame_view.cc",
     "shell/browser/ui/views/win_frame_view.h",
     "shell/browser/ui/views/win_caption_button.cc",

lib/browser/.eslintrc.json

@@ -18,4 +18,4 @@
       }
     ]
   }
-}
+}

lib/browser/api/browser-window.ts

@@ -72,8 +72,9 @@ BrowserWindow.getAllWindows = () => {
 
 BrowserWindow.getFocusedWindow = () => {
   for (const window of BrowserWindow.getAllWindows()) {
-    if (!window.isDestroyed() && window.webContents && !window.webContents.isDestroyed()) {
-      if (window.isFocused() || window.webContents.isDevToolsFocused()) return window;
+    const hasWC = window.webContents && !window.webContents.isDestroyed();
+    if (!window.isDestroyed() && hasWC) {
+      if (window.isFocused() || window.isDevToolsFocused()) return window;
     }
   }
   return null;

lib/browser/api/native-theme.ts

@@ -1,3 +1,3 @@
-const { nativeTheme } = process._linkedBinding('electron_browser_native_theme');
+const { nativeTheme } = process._linkedBinding('electron_common_native_theme');
 
 module.exports = nativeTheme;

lib/browser/api/notification.ts

@@ -1,7 +1,7 @@
 const {
   Notification: ElectronNotification,
   isSupported
-} = process._linkedBinding('electron_browser_notification');
+} = process._linkedBinding('electron_common_notification');
 
 ElectronNotification.isSupported = isSupported;
 

lib/browser/api/screen.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 
-const { createScreen } = process._linkedBinding('electron_browser_screen');
+const { createScreen } = process._linkedBinding('electron_common_screen');
 
 let _screen: Electron.Screen;
 

lib/browser/api/web-contents.ts

@@ -504,7 +504,6 @@ WebContents.prototype._callWindowOpenHandler = function (event: Electron.Event,
   if (!this._windowOpenHandler) {
     return defaultResponse;
   }
-
   const response = this._windowOpenHandler(details);
 
   if (typeof response !== 'object') {
@@ -667,15 +666,7 @@ WebContents.prototype._init = function () {
         postBody,
         disposition
       };
-
-      let result: ReturnType<typeof this._callWindowOpenHandler>;
-      try {
-        result = this._callWindowOpenHandler(event, details);
-      } catch (err) {
-        event.preventDefault();
-        throw err;
-      }
-
+      const result = this._callWindowOpenHandler(event, details);
       const options = result.browserWindowConstructorOptions;
       if (!event.defaultPrevented) {
         openGuestWindow({
@@ -706,15 +697,7 @@ WebContents.prototype._init = function () {
         referrer,
         postBody
       };
-
-      let result: ReturnType<typeof this._callWindowOpenHandler>;
-      try {
-        result = this._callWindowOpenHandler(event, details);
-      } catch (err) {
-        event.preventDefault();
-        throw err;
-      }
-
+      const result = this._callWindowOpenHandler(event, details);
       windowOpenOutlivesOpenerOption = result.outlivesOpener;
       windowOpenOverriddenOptions = result.browserWindowConstructorOptions;
       if (!event.defaultPrevented) {

lib/browser/guest-window-manager.ts

@@ -78,19 +78,6 @@ export function openGuestWindow ({ event, embedder, guest, referrer, disposition
     ...browserWindowOptions
   });
 
-  if (!guest) {
-    // When we open a new window from a link (via OpenURLFromTab),
-    // the browser process is responsible for initiating navigation
-    // in the new window.
-    window.loadURL(url, {
-      httpReferrer: referrer,
-      ...(postData && {
-        postData,
-        extraHeaders: formatPostDataHeaders(postData as Electron.UploadRawData[])
-      })
-    });
-  }
-
   handleWindowLifecycleEvents({ embedder, frameName, guest: window, outlivesOpener });
 
   embedder.emit('did-create-window', window, { url, frameName, options: browserWindowOptions, disposition, referrer, postData });
@@ -256,15 +243,6 @@ export function makeWebPreferences ({ embedder, secureOverrideWebPreferences = {
   };
 }
 
-function formatPostDataHeaders (postData: PostData) {
-  if (!postData) return;
-
-  const { contentType, boundary } = parseContentTypeFormat(postData);
-  if (boundary != null) { return `content-type: ${contentType}; boundary=${boundary}`; }
-
-  return `content-type: ${contentType}`;
-}
-
 const MULTIPART_CONTENT_TYPE = 'multipart/form-data';
 const URL_ENCODED_CONTENT_TYPE = 'application/x-www-form-urlencoded';
 

lib/common/.eslintrc.json

@@ -1,23 +0,0 @@
-{
-  "rules": {
-    "no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          "electron",
-          "electron/main",
-          "electron/renderer"
-        ],
-        "patterns": [
-          "./*",
-          "../*",
-          "@electron/internal/browser/*",
-          "@electron/internal/isolated_renderer/*",
-          "@electron/internal/renderer/*",
-          "@electron/internal/sandboxed_worker/*",
-          "@electron/internal/worker/*"
-        ]
-      }
-    ]
-  }
-}

lib/common/api/clipboard.ts

@@ -1,6 +1,5 @@
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-// eslint-disable-next-line no-restricted-imports
 import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
 
 const clipboard = process._linkedBinding('electron_common_clipboard');

lib/isolated_renderer/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-  "rules": {
-    "no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          "electron",
-          "electron/main"
-        ],
-        "patterns": [
-          "./*",
-          "../*",
-          "@electron/internal/browser/*"
-        ]
-      }
-    ]
-  }
-}

lib/renderer/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-  "rules": {
-    "no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          "electron",
-          "electron/main"
-        ],
-        "patterns": [
-          "./*",
-          "../*",
-          "@electron/internal/browser/*"
-        ]
-      }
-    ]
-  }
-}

lib/renderer/common-init.ts

@@ -1,4 +1,4 @@
-import { ipcRenderer } from 'electron/renderer';
+import { ipcRenderer } from 'electron';
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 
 import type * as webViewInitModule from '@electron/internal/renderer/web-view/web-view-init';

lib/renderer/inspector.ts

@@ -2,7 +2,7 @@ import { internalContextBridge } from '@electron/internal/renderer/api/context-b
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
 import { webFrame } from 'electron/renderer';
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
+import { IPC_MESSAGES } from '../common/ipc-messages';
 
 const { contextIsolationEnabled } = internalContextBridge;
 

lib/renderer/security-warnings.ts

@@ -1,8 +1,7 @@
+import { webFrame } from 'electron';
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-const { mainFrame: webFrame } = process._linkedBinding('electron_renderer_web_frame');
-
 let shouldLog: boolean | null = null;
 
 const { platform, execPath, env } = process;

lib/renderer/web-frame-init.ts

@@ -1,4 +1,4 @@
-import { webFrame, WebFrame } from 'electron/renderer';
+import { webFrame, WebFrame } from 'electron';
 import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 

lib/sandboxed_renderer/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-  "rules": {
-    "no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          "electron",
-          "electron/main"
-        ],
-        "patterns": [
-          "./*",
-          "../*",
-          "@electron/internal/browser/*"
-        ]
-      }
-    ]
-  }
-}

lib/worker/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-  "rules": {
-    "no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          "electron",
-          "electron/main"
-        ],
-        "patterns": [
-          "./*",
-          "../*",
-          "@electron/internal/browser/*"
-        ]
-      }
-    ]
-  }
-}

package.json

@@ -1,13 +1,12 @@
 {
   "name": "electron",
-  "version": "0.0.0-development",
+  "version": "20.0.0-nightly.20220429",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {
     "@azure/storage-blob": "^12.9.0",
-    "@electron/asar": "^3.2.1",
-    "@electron/docs-parser": "^1.0.0",
-    "@electron/typescript-definitions": "^8.10.0",
+    "@electron/docs-parser": "^0.12.4",
+    "@electron/typescript-definitions": "^8.9.5",
     "@octokit/auth-app": "^2.10.0",
     "@octokit/rest": "^18.0.3",
     "@primer/octicons": "^10.0.0",
@@ -32,6 +31,7 @@
     "@types/webpack-env": "^1.16.3",
     "@typescript-eslint/eslint-plugin": "^4.4.1",
     "@typescript-eslint/parser": "^4.4.1",
+    "asar": "^3.1.0",
     "aws-sdk": "^2.814.0",
     "check-for-leaks": "^1.2.1",
     "colors": "1.4.0",
@@ -77,7 +77,7 @@
   "scripts": {
     "asar": "asar",
     "generate-version-json": "node script/generate-version-json.js",
-    "lint": "node ./script/lint.js && npm run lint:docs",
+    "lint": "node ./script/lint.js && npm run lint:clang-format && npm run lint:docs",
     "lint:js": "node ./script/lint.js --js",
     "lint:clang-format": "python3 script/run-clang-format.py -r -c shell/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
     "lint:clang-tidy": "ts-node ./script/run-clang-tidy.ts",
@@ -89,12 +89,11 @@
     "lint:docs-relative-links": "python3 ./script/check-relative-doc-links.py",
     "lint:markdownlint": "markdownlint \"*.md\" \"docs/**/*.md\"",
     "lint:js-in-markdown": "standard-markdown docs",
-    "create-api-json": "node script/create-api-json.js",
+    "create-api-json": "electron-docs-parser --dir=./",
     "create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --api=electron-api.json && node spec/ts-smoke/runner.js",
     "gn-typescript-definitions": "npm run create-typescript-definitions && shx cp electron.d.ts",
     "pre-flight": "pre-flight",
     "gn-check": "node ./script/gn-check.js",
-    "gn-format": "python3 script/run-gn-format.py",
     "precommit": "lint-staged",
     "preinstall": "node -e 'process.exit(0)'",
     "prepack": "check-for-leaks",
@@ -125,7 +124,7 @@
     ],
     "*.{gn,gni}": [
       "npm run gn-check",
-      "npm run gn-format"
+      "python3 script/run-gn-format.py"
     ],
     "*.py": [
       "node script/lint.js --py --fix --only --"
@@ -143,4 +142,4 @@
       "node script/gen-hunspell-filenames.js"
     ]
   }
-}
+}

patches/angle/.patches

@@ -1,3 +0,0 @@
-m104_vulkan_fix_garbage_collection_vs_outside-rp-only_flush.patch
-m104_vulkan_fix_xfb_buffer_redefine_to_smaller_size.patch
-cherry-pick-b8636b57b8f2.patch

patches/angle/cherry-pick-b8636b57b8f2.patch

@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jamie Madill <jmadill@chromium.org>
-Date: Mon, 29 Aug 2022 16:25:46 -0400
-Subject: Vulkan: Ensure we sync the draw FB before beingQuery.
-
-Bug: chromium:1354271
-(cherry picked from commit 4ebdac790c76b65abf5703bcef9482c638076195)
-Change-Id: I7b715a9c28badfe58a0ae1a478d2b4e8bbd23c47
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3956939
-Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
-
-diff --git a/src/libANGLE/State.h b/src/libANGLE/State.h
-index f8c1d9daaf31b5edb98edf3ca0a5c1983d6039cb..79403b13a94447c07bf0bfa6f9e6567e43346505 100644
---- a/src/libANGLE/State.h
-+++ b/src/libANGLE/State.h
-@@ -600,6 +600,11 @@ class State : angle::NonCopyable
- 
-     bool isRobustResourceInitEnabled() const { return mRobustResourceInit; }
- 
-+    bool isDrawFramebufferBindingDirty() const
-+    {
-+        return mDirtyBits.test(DIRTY_BIT_DRAW_FRAMEBUFFER_BINDING);
-+    }
-+
-     // Sets the dirty bit for the program executable.
-     angle::Result onProgramExecutableChange(const Context *context, Program *program);
-     // Sets the dirty bit for the program pipeline executable.
-diff --git a/src/libANGLE/renderer/vulkan/QueryVk.cpp b/src/libANGLE/renderer/vulkan/QueryVk.cpp
-index 921adfc6e02984cb9b0ded70065df16f9241e4e7..f806326113d0804862481ac5508f07eab4d5ebe1 100644
---- a/src/libANGLE/renderer/vulkan/QueryVk.cpp
-+++ b/src/libANGLE/renderer/vulkan/QueryVk.cpp
-@@ -302,6 +302,13 @@ angle::Result QueryVk::begin(const gl::Context *context)
- {
-     ContextVk *contextVk = vk::GetImpl(context);
- 
-+    // Ensure that we start with the right RenderPass when we begin a new query.
-+    if (contextVk->getState().isDrawFramebufferBindingDirty())
-+    {
-+        ANGLE_TRY(contextVk->flushCommandsAndEndRenderPass(
-+            RenderPassClosureReason::FramebufferBindingChange));
-+    }
-+
-     mCachedResultValid = false;
- 
-     // Transform feedback query is handled by a CPU-calculated value when emulated.

patches/angle/m104_vulkan_fix_garbage_collection_vs_outside-rp-only_flush.patch

@@ -1,287 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Thu, 4 Aug 2022 12:28:12 -0400
-Subject: M104: Vulkan: Fix garbage collection vs outside-RP-only flush
-
-In https://chromium-review.googlesource.com/c/angle/angle/+/3379231, an
-optimization was implemented such that the excessive recorded texture
-uploads would get flushed early and submitted.  This caused a
-use-after-free bug in the following situation:
-
-* Draw with pipeline A
-* Delete A <--- this puts A in the Context garbage list
-* Upload a lot of data
-
-At this point, the flush threshold could pass and the commands recorded
-outside of the render pass up to this point would be submitted.
-Associated with this submission was the current garbage, including
-pipeline A.  However, the render pass that uses pipeline A is still not
-submitted.
-
-Now if after some time the render pass is still open, but the "completed
-commands" are checked (another set of uploads causing another
-submission, a query status check, etc), the garbage can be cleaned up.
-
-When the render pass closes next and is submitted, the implementation
-attempts to use the pipeline, which is already deleted.
-
-In this change, outside-render-pass-only submissions no longer reference
-the current garbage.  This has the side effect that the temporary
-buffers used for uploading texture data won't be released early.  A
-future optimization may want to separate the garbage list in ContextVk
-to render pass and outside render pass garbage.
-
-Bug: chromium:1337538
-Change-Id: Ibfc11f2b0d166b0c325fced725f23d6b9328ff98
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3821371
-Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com>
-
-diff --git a/src/libANGLE/renderer/vulkan/ContextVk.cpp b/src/libANGLE/renderer/vulkan/ContextVk.cpp
-index 90ecf42b2cc22cee5b74296d7a2f73b77f9a0f2c..41c06dc42810d6c55565686c87adf20367024f05 100644
---- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
-+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
-@@ -2614,14 +2614,16 @@ void ContextVk::addOverlayUsedBuffersCount(vk::CommandBufferHelperCommon *comman
-     }
- }
- 
--angle::Result ContextVk::submitFrame(const vk::Semaphore *signalSemaphore, Serial *submitSerialOut)
-+angle::Result ContextVk::submitFrame(const vk::Semaphore *signalSemaphore,
-+                                     Submit submission,
-+                                     Serial *submitSerialOut)
- {
-     getShareGroupVk()->acquireResourceUseList(
-         std::move(mOutsideRenderPassCommands->getResourceUseList()));
-     getShareGroupVk()->acquireResourceUseList(std::move(mResourceUseList));
-     getShareGroupVk()->acquireResourceUseList(std::move(mRenderPassCommands->getResourceUseList()));
- 
--    ANGLE_TRY(submitCommands(signalSemaphore, submitSerialOut));
-+    ANGLE_TRY(submitCommands(signalSemaphore, submission, submitSerialOut));
- 
-     onRenderPassFinished(RenderPassClosureReason::AlreadySpecifiedElsewhere);
-     return angle::Result::Continue;
-@@ -2633,10 +2635,11 @@ angle::Result ContextVk::submitFrameOutsideCommandBufferOnly(Serial *submitSeria
-     getShareGroupVk()->acquireResourceUseList(
-         std::move(mOutsideRenderPassCommands->getResourceUseList()));
- 
--    return submitCommands(nullptr, submitSerialOut);
-+    return submitCommands(nullptr, Submit::OutsideRenderPassCommandsOnly, submitSerialOut);
- }
- 
- angle::Result ContextVk::submitCommands(const vk::Semaphore *signalSemaphore,
-+                                        Submit submission,
-                                         Serial *submitSerialOut)
- {
-     if (mCurrentWindowSurface)
-@@ -2655,10 +2658,18 @@ angle::Result ContextVk::submitCommands(const vk::Semaphore *signalSemaphore,
-         dumpCommandStreamDiagnostics();
-     }
- 
-+    // Clean up garbage only when submitting all commands.  Otherwise there may be garbage
-+    // associated with commands that are not yet flushed.
-+    vk::GarbageList garbage;
-+    if (submission == Submit::AllCommands)
-+    {
-+        garbage = std::move(mCurrentGarbage);
-+    }
-+
-     ANGLE_TRY(mRenderer->submitFrame(this, hasProtectedContent(), mContextPriority,
-                                      std::move(mWaitSemaphores),
-                                      std::move(mWaitSemaphoreStageMasks), signalSemaphore,
--                                     std::move(mCurrentGarbage), &mCommandPools, submitSerialOut));
-+                                     std::move(garbage), &mCommandPools, submitSerialOut));
- 
-     getShareGroupVk()->releaseResourceUseLists(*submitSerialOut);
-     // Now that we have processed resourceUseList, some of pending garbage may no longer pending
-@@ -6128,7 +6139,7 @@ angle::Result ContextVk::flushAndGetSerial(const vk::Semaphore *signalSemaphore,
-         mHasInFlightStreamedVertexBuffers.reset();
-     }
- 
--    ANGLE_TRY(submitFrame(signalSemaphore, submitSerialOut));
-+    ANGLE_TRY(submitFrame(signalSemaphore, Submit::AllCommands, submitSerialOut));
- 
-     resetPerFramePerfCounters();
- 
-diff --git a/src/libANGLE/renderer/vulkan/ContextVk.h b/src/libANGLE/renderer/vulkan/ContextVk.h
-index 6c6a3797c6e9a387abf13442613088bd5f4341ec..8ed00be4eb19fea01bb2ada65d2c05ad1d3284f4 100644
---- a/src/libANGLE/renderer/vulkan/ContextVk.h
-+++ b/src/libANGLE/renderer/vulkan/ContextVk.h
-@@ -1078,9 +1078,19 @@ class ContextVk : public ContextImpl, public vk::Context, public MultisampleText
- 
-     void writeAtomicCounterBufferDriverUniformOffsets(uint32_t *offsetsOut, size_t offsetsSize);
- 
--    angle::Result submitFrame(const vk::Semaphore *signalSemaphore, Serial *submitSerialOut);
-+    enum class Submit
-+    {
-+        OutsideRenderPassCommandsOnly,
-+        AllCommands,
-+    };
-+
-+    angle::Result submitFrame(const vk::Semaphore *signalSemaphore,
-+                              Submit submission,
-+                              Serial *submitSerialOut);
-     angle::Result submitFrameOutsideCommandBufferOnly(Serial *submitSerialOut);
--    angle::Result submitCommands(const vk::Semaphore *signalSemaphore, Serial *submitSerialOut);
-+    angle::Result submitCommands(const vk::Semaphore *signalSemaphore,
-+                                 Submit submission,
-+                                 Serial *submitSerialOut);
- 
-     angle::Result synchronizeCpuGpuTime();
-     angle::Result traceGpuEventImpl(vk::OutsideRenderPassCommandBuffer *commandBuffer,
-diff --git a/src/tests/gl_tests/VulkanPerformanceCounterTest.cpp b/src/tests/gl_tests/VulkanPerformanceCounterTest.cpp
-index a5021e3248933815e3ac43cc0477671109befb1e..1a4e35592d0573991cc54136c80a9299714162a4 100644
---- a/src/tests/gl_tests/VulkanPerformanceCounterTest.cpp
-+++ b/src/tests/gl_tests/VulkanPerformanceCounterTest.cpp
-@@ -18,6 +18,7 @@
- #include "test_utils/gl_raii.h"
- #include "util/random_utils.h"
- #include "util/shader_utils.h"
-+#include "util/test_utils.h"
- 
- using namespace angle;
- 
-@@ -561,22 +562,21 @@ TEST_P(VulkanPerformanceCounterTest, NewTextureDoesNotBreakRenderPass)
- TEST_P(VulkanPerformanceCounterTest, SubmittingOutsideCommandBufferDoesNotBreakRenderPass)
- {
-     initANGLEFeatures();
--    // http://anglebug.com/6354
- 
--    size_t kMaxBufferToImageCopySize     = 1 << 28;
--    uint32_t kNumSubmits                 = 2;
--    uint32_t expectedRenderPassCount     = getPerfCounters().renderPasses + 1;
--    uint32_t expectedSubmitCommandsCount = getPerfCounters().submittedCommands + kNumSubmits;
-+    constexpr size_t kMaxBufferToImageCopySize     = 1 << 28;
-+    constexpr uint32_t kNumSubmits                 = 2;
-+    uint32_t expectedRenderPassCount               = getPerfCounters().renderPasses + 1;
-+    uint32_t expectedSubmitCommandsCount           = getPerfCounters().submittedCommands + kNumSubmits;
- 
-     // Step 1: Set up a simple 2D texture.
-     GLTexture texture;
--    GLsizei texDim         = 256;
--    uint32_t pixelSizeRGBA = 4;
--    uint32_t textureSize   = texDim * texDim * pixelSizeRGBA;
--    std::vector<GLColor> kInitialData(texDim * texDim, GLColor::green);
-+    constexpr GLsizei kTexDim         = 256;
-+    constexpr uint32_t kPixelSizeRGBA = 4;
-+    constexpr uint32_t kTextureSize   = kTexDim * kTexDim * kPixelSizeRGBA;
-+    std::vector<GLColor> kInitialData(kTexDim * kTexDim, GLColor::green);
- 
-     glBindTexture(GL_TEXTURE_2D, texture);
--    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texDim, texDim, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kTexDim, kTexDim, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-                  kInitialData.data());
-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-@@ -603,13 +603,12 @@ TEST_P(VulkanPerformanceCounterTest, SubmittingOutsideCommandBufferDoesNotBreakR
- 
-     // Step 2: Load a new 2D Texture multiple times with the same Program and Framebuffer. The total
-     // size of the loaded textures must exceed the threshold to submit the outside command buffer.
--    auto maxLoadCount =
--        static_cast<size_t>((kMaxBufferToImageCopySize / textureSize) * kNumSubmits + 1);
--    for (size_t loadCount = 0; loadCount < maxLoadCount; loadCount++)
-+    constexpr size_t kMaxLoadCount = kMaxBufferToImageCopySize / kTextureSize * kNumSubmits + 1;
-+    for (size_t loadCount = 0; loadCount < kMaxLoadCount; loadCount++)
-     {
-         GLTexture newTexture;
-         glBindTexture(GL_TEXTURE_2D, newTexture);
--        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, texDim, texDim, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kTexDim, kTexDim, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-                      kInitialData.data());
-         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-@@ -623,6 +622,96 @@ TEST_P(VulkanPerformanceCounterTest, SubmittingOutsideCommandBufferDoesNotBreakR
-     EXPECT_EQ(getPerfCounters().submittedCommands, expectedSubmitCommandsCount);
- }
- 
-+// Tests that submitting the outside command buffer due to texture upload size does not result in
-+// garbage collection of render pass resources..
-+TEST_P(VulkanPerformanceCounterTest, SubmittingOutsideCommandBufferDoesNotCollectRenderPassGarbage)
-+{
-+    ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
-+
-+    initANGLEFeatures();
-+
-+    uint64_t expectedRenderPassCount = getPerfCounters().renderPasses + 1;
-+    uint64_t submitCommandsCount     = getPerfCounters().vkQueueSubmitCallsTotal;
-+
-+    // Set up a simple 2D texture.
-+    GLTexture texture;
-+    constexpr GLsizei kTexDim = 256;
-+    std::vector<GLColor> kInitialData(kTexDim * kTexDim, GLColor::green);
-+
-+    glBindTexture(GL_TEXTURE_2D, texture);
-+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kTexDim, kTexDim, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-+                 kInitialData.data());
-+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-+
-+    auto quadVerts = GetQuadVertices();
-+
-+    GLBuffer vertexBuffer;
-+    glBindBuffer(GL_ARRAY_BUFFER, vertexBuffer);
-+    glBufferData(GL_ARRAY_BUFFER, quadVerts.size() * sizeof(quadVerts[0]), quadVerts.data(),
-+                 GL_STATIC_DRAW);
-+
-+    ANGLE_GL_PROGRAM(program, essl1_shaders::vs::Texture2D(), essl1_shaders::fs::Texture2D());
-+    glUseProgram(program);
-+
-+    GLint posLoc = glGetAttribLocation(program, essl1_shaders::PositionAttrib());
-+    ASSERT_NE(-1, posLoc);
-+
-+    glVertexAttribPointer(posLoc, 3, GL_FLOAT, GL_FALSE, 0, nullptr);
-+    glEnableVertexAttribArray(posLoc);
-+    ASSERT_GL_NO_ERROR();
-+
-+    // Issue a timestamp query, just for the sake of using it as a means of knowing when a
-+    // submission is finished.  In the Vulkan backend, querying the status of the query results in a
-+    // check of completed submissions, at which point associated garbage is also destroyed.
-+    GLQuery query;
-+    glQueryCounterEXT(query, GL_TIMESTAMP_EXT);
-+
-+    // Issue a draw call, and delete the program
-+    glDrawArrays(GL_TRIANGLES, 0, 6);
-+    ASSERT_GL_NO_ERROR();
-+    program.reset();
-+
-+    ANGLE_GL_PROGRAM(program2, essl1_shaders::vs::Texture2D(), essl1_shaders::fs::Texture2D());
-+    glUseProgram(program2);
-+    ASSERT_EQ(posLoc, glGetAttribLocation(program2, essl1_shaders::PositionAttrib()));
-+
-+    // Issue uploads until there's an implicit submission
-+    while (getPerfCounters().vkQueueSubmitCallsTotal == submitCommandsCount)
-+    {
-+        GLTexture newTexture;
-+        glBindTexture(GL_TEXTURE_2D, newTexture);
-+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, kTexDim, kTexDim, 0, GL_RGBA, GL_UNSIGNED_BYTE,
-+                     kInitialData.data());
-+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-+
-+        glDrawArrays(GL_TRIANGLES, 0, 6);
-+        ASSERT_GL_NO_ERROR();
-+    }
-+
-+    ++submitCommandsCount;
-+    EXPECT_EQ(getPerfCounters().vkQueueSubmitCallsTotal, submitCommandsCount);
-+
-+    // Busy wait until the query results are available.
-+    GLuint ready = GL_FALSE;
-+    while (ready == GL_FALSE)
-+    {
-+        angle::Sleep(0);
-+        glGetQueryObjectuivEXT(query, GL_QUERY_RESULT_AVAILABLE_EXT, &ready);
-+    }
-+
-+    // At this point, the render pass should still not be submitted, and the pipeline that is
-+    // deleted should still not be garbage collected.  Submit the commands and ensure there is no
-+    // crash.
-+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::green);
-+    ++submitCommandsCount;
-+
-+    // Verify counters.
-+    EXPECT_EQ(getPerfCounters().renderPasses, expectedRenderPassCount);
-+    EXPECT_EQ(getPerfCounters().vkQueueSubmitCallsTotal, submitCommandsCount);
-+}
-+
- // Tests that RGB texture should not break renderpass.
- TEST_P(VulkanPerformanceCounterTest, SampleFromRGBTextureDoesNotBreakRenderPass)
- {

patches/angle/m104_vulkan_fix_xfb_buffer_redefine_to_smaller_size.patch

@@ -1,122 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Tue, 26 Jul 2022 21:07:04 -0400
-Subject: M104: Vulkan: Fix xfb buffer redefine to smaller size
-
-In 89e11878b275b15735eaf273ababfa6fd43a2e3d, a use-after-free bug was
-fixed where glBufferData redefined a buffer, leading to a change in
-storage.  This was only tested for the case where the new buffer was
-larger than the old buffer.
-
-When the new buffer is smaller however, another issue remains where the
-buffer size as cached by the transform feedback object used the old
-object's size.  This is worked around in this change, with a fix for the
-real issue (that the buffer state is updated after calling into the
-backend instead of before) coming up.
-
-Bug: chromium:1345042
-Change-Id: I7bafd51b6203a419e5ef123da26b9e1eaf079bf1
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3812556
-Reviewed-by: Ian Elliott <ianelliott@google.com>
-
-diff --git a/src/libANGLE/renderer/vulkan/BufferVk.cpp b/src/libANGLE/renderer/vulkan/BufferVk.cpp
-index 9c9cee78d890f5cc13d8762aa03de9dcf9c00abf..ceb065822984cf44bd4319fb97cb7e4dd49517b2 100644
---- a/src/libANGLE/renderer/vulkan/BufferVk.cpp
-+++ b/src/libANGLE/renderer/vulkan/BufferVk.cpp
-@@ -798,6 +798,7 @@ angle::Result BufferVk::updateBuffer(ContextVk *contextVk,
-     }
-     return angle::Result::Continue;
- }
-+
- angle::Result BufferVk::directUpdate(ContextVk *contextVk,
-                                      const uint8_t *data,
-                                      size_t size,
-diff --git a/src/libANGLE/renderer/vulkan/ContextVk.cpp b/src/libANGLE/renderer/vulkan/ContextVk.cpp
-index 41c06dc42810d6c55565686c87adf20367024f05..1319bf771339210dcb9a3e0ccd0936112c746582 100644
---- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
-+++ b/src/libANGLE/renderer/vulkan/ContextVk.cpp
-@@ -799,7 +799,8 @@ ContextVk::ContextVk(const gl::State &state, gl::ErrorSet *errorSet, RendererVk
-                                                    DIRTY_BIT_DRIVER_UNIFORMS_BINDING,
-                                                    DIRTY_BIT_VIEWPORT,
-                                                    DIRTY_BIT_SCISSOR};
--    if (getFeatures().supportsTransformFeedbackExtension.enabled)
-+    if (getFeatures().supportsTransformFeedbackExtension.enabled ||
-+        getFeatures().emulateTransformFeedback.enabled)
-     {
-         mNewGraphicsCommandBufferDirtyBits.set(DIRTY_BIT_TRANSFORM_FEEDBACK_BUFFERS);
-     }
-diff --git a/src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp b/src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp
-index dbaa4eeedbf36c4a3f6cb818b50bdcac856766c2..f785fe5f7c36033163a77a7e29957ebca6edaf79 100644
---- a/src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp
-+++ b/src/libANGLE/renderer/vulkan/TransformFeedbackVk.cpp
-@@ -362,7 +362,8 @@ void TransformFeedbackVk::onSubjectStateChange(angle::SubjectIndex index,
-         ASSERT(bufferVk->isBufferValid());
-         mBufferHelpers[index] = &bufferVk->getBuffer();
-         mBufferOffsets[index] = binding.getOffset() + mBufferHelpers[index]->getOffset();
--        mBufferSizes[index]   = gl::GetBoundBufferAvailableSize(binding);
-+        mBufferSizes[index]   = std::min<VkDeviceSize>(gl::GetBoundBufferAvailableSize(binding),
-+                                                     mBufferHelpers[index]->getSize());
-         mBufferObserverBindings[index].bind(bufferVk);
- 
-         mXFBBuffersDesc.updateTransformFeedbackBuffer(
-diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
-index af74f258fb3d901dac8a738ca9be53511963137b..22230db0ecb77f16cb2cc494a74225731401a47d 100644
---- a/src/tests/angle_end2end_tests_expectations.txt
-+++ b/src/tests/angle_end2end_tests_expectations.txt
-@@ -161,6 +161,7 @@
- 6738 MAC AMD OPENGL : Texture3DTestES3.PixelUnpackStateTex* = SKIP
- 1296467 MAC OPENGL : VertexAttributeTestES3.emptyBuffer/* = SKIP
- 7203 MAC INTEL OPENGL : CopyTextureTest.CopyToMipmap/* = SKIP
-+7530 MAC NVIDIA OPENGL : TransformFeedbackTest.RenderOnceChangeXfbBufferRenderAgain/* = SKIP
- 
- // BlitFramebufferTest.ScissoredMultisampleStencil failures
- 3496 MAC INTEL OPENGL : BlitFramebufferTest.ScissoredMultisampleStencil/* = SKIP
-diff --git a/src/tests/gl_tests/TransformFeedbackTest.cpp b/src/tests/gl_tests/TransformFeedbackTest.cpp
-index a4e4f86157232de46c6e06ee7b5a6dfa2b8a2261..dc944d4249e0a26708d01bd0bde7efc4d68db3e3 100644
---- a/src/tests/gl_tests/TransformFeedbackTest.cpp
-+++ b/src/tests/gl_tests/TransformFeedbackTest.cpp
-@@ -403,7 +403,6 @@ TEST_P(TransformFeedbackTest, RecordAndDraw)
- // Test that transform feedback can cover multiple render passes.
- TEST_P(TransformFeedbackTest, SpanMultipleRenderPasses)
- {
--
-     // TODO(anglebug.com/4533) This fails after the upgrade to the 26.20.100.7870 driver.
-     ANGLE_SKIP_TEST_IF(IsWindows() && IsIntel() && IsVulkan());
- 
-@@ -4105,6 +4104,36 @@ TEST_P(TransformFeedbackTest, ResumingTransformFeedbackAfterDeletebuffer)
-     ASSERT_GL_ERROR(GL_INVALID_OPERATION);
- }
- 
-+// Test that redefining the transform feedback buffer and starting a new render pass works.
-+TEST_P(TransformFeedbackTest, RenderOnceChangeXfbBufferRenderAgain)
-+{
-+    std::vector<std::string> tfVaryings;
-+    tfVaryings.push_back("gl_Position");
-+    ANGLE_GL_PROGRAM_TRANSFORM_FEEDBACK(drawColor, essl3_shaders::vs::Simple(),
-+                                        essl3_shaders::fs::Red(), tfVaryings,
-+                                        GL_INTERLEAVED_ATTRIBS);
-+
-+    GLBuffer buffer;
-+    glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, buffer);
-+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, 10'000'000, nullptr, GL_DYNAMIC_READ);
-+
-+    glUseProgram(drawColor);
-+    glBeginTransformFeedback(GL_TRIANGLES);
-+
-+    drawQuad(drawColor, essl3_shaders::PositionAttrib(), 0.5f);
-+
-+    // Break the render pass
-+    EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::red);
-+
-+    // Redefine the transform feedback buffer
-+    glBufferData(GL_TRANSFORM_FEEDBACK_BUFFER, 40, nullptr, GL_DYNAMIC_READ);
-+
-+    // Start a new render pass
-+    drawQuad(drawColor, essl3_shaders::PositionAttrib(), 0.5f);
-+
-+    glEndTransformFeedback();
-+}
-+
- GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TransformFeedbackTest);
- ANGLE_INSTANTIATE_TEST_ES3(TransformFeedbackTest);
- 

patches/chromium/.patches

@@ -21,15 +21,11 @@ resource_file_conflict.patch
 scroll_bounce_flag.patch
 mas_blink_no_private_api.patch
 mas_no_private_api.patch
-mas-cfisobjc.patch
 mas-cgdisplayusesforcetogray.patch
-mas-audiodeviceduck.patch
 mas_disable_remote_layer.patch
 mas_disable_remote_accessibility.patch
 mas_disable_custom_window_frame.patch
-mas_avoid_usage_of_abort_report_np.patch
-mas_avoid_usage_of_pthread_fchdir_np.patch
-mas_avoid_usage_of_setapplicationisdaemon_and.patch
+mas_avoid_usage_of_private_macos_apis.patch
 mas_use_public_apis_to_determine_if_a_font_is_a_system_font.patch
 chrome_key_systems.patch
 add_didinstallconditionalfeatures.patch
@@ -58,7 +54,6 @@ feat_add_set_theme_source_to_allow_apps_to.patch
 add_webmessageportconverter_entangleandinjectmessageportchannel.patch
 ignore_rc_check.patch
 remove_usage_of_incognito_apis_in_the_spellchecker.patch
-chore_use_electron_resources_not_chrome_for_spellchecker.patch
 allow_disabling_blink_scheduler_throttling_per_renderview.patch
 hack_plugin_response_interceptor_to_point_to_electron.patch
 feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
@@ -80,7 +75,6 @@ skip_atk_toolchain_check.patch
 worker_feat_add_hook_to_notify_script_ready.patch
 chore_provide_iswebcontentscreationoverridden_with_full_params.patch
 fix_properly_honor_printing_page_ranges.patch
-fix_use_electron_generated_resources.patch
 chore_expose_v8_initialization_isolate_callbacks.patch
 export_gin_v8platform_pageallocator_for_usage_outside_of_the_gin.patch
 fix_export_zlib_symbols.patch
@@ -102,12 +96,11 @@ chore_do_not_use_chrome_windows_in_cryptotoken_webrequestsender.patch
 process_singleton.patch
 fix_expose_decrementcapturercount_in_web_contents_impl.patch
 add_ui_scopedcliboardwriter_writeunsaferawdata.patch
-feat_add_data_parameter_to_processsingleton.patch
-mas_gate_private_enterprise_APIs.patch
 load_v8_snapshot_in_browser_process.patch
-fix_adapt_exclusive_access_for_electron_needs.patch
+fix_patch_out_permissions_checks_in_exclusive_access.patch
 fix_aspect_ratio_with_max_size.patch
 fix_dont_delete_SerialPortManager_on_main_thread.patch
+feat_add_data_transfer_to_requestsingleinstancelock.patch
 fix_crash_when_saving_edited_pdf_files.patch
 port_autofill_colors_to_the_color_pipeline.patch
 build_disable_partition_alloc_on_mac.patch
@@ -115,47 +108,3 @@ fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch
 build_make_libcxx_abi_unstable_false_for_electron.patch
 introduce_ozoneplatform_electron_can_call_x11_property.patch
 make_gtk_getlibgtk_public.patch
-build_disable_print_content_analysis.patch
-feat_move_firstpartysets_to_content_browser_client.patch
-custom_protocols_plzserviceworker.patch
-posix_replace_doubleforkandexec_with_forkandspawn.patch
-cherry-pick-22c61cfae5d1.patch
-remove_default_window_title.patch
-keep_handling_scroll_update_if_you_can.patch
-chore_add_electron_deps_to_gitignores.patch
-chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
-disable_gpu_acceleration_on_vmware_on_linux.patch
-add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
-cherry-pick-94a8bdafc8c6.patch
-fix_mac_build_with_enable_plugins_false.patch
-fix_windows_build_with_enable_plugins_false.patch
-cherry-pick-54e32332750c.patch
-cherry-pick-60d8559e150a.patch
-cherry-pick-54a7927b19f9.patch
-cherry-pick-bd9724c9fe63.patch
-cherry-pick-c643d18a078d.patch
-feat_add_set_can_resize_mutator.patch
-cherry-pick-2083e894852c.patch
-cherry-pick-079105b7ebba.patch
-cherry-pick-51daffbf5cd8.patch
-cherry-pick-9b5207569882.patch
-dpwa_enable_window_controls_overlay_by_default.patch
-cherry-pick-eb4d31309df7.patch
-add_electron_deps_to_license_credits_file.patch
-cherry-pick-fefd6198da31.patch
-cherry-pick-1eb1e18ad41d.patch
-cherry-pick-9bebe8549a36.patch
-cherry-pick-05a0d99c9715.patch
-cherry-pick-cb9dff93f3d4.patch
-build_allow_electron_to_use_exec_script.patch
-cherry-pick-933cc81c6bad.patch
-cherry-pick-67c9cbc784d6.patch
-cherry-pick-d5ffb4dd4112.patch
-cherry-pick-06c87f9f42ff.patch
-refresh_cached_attributes_before_name_computation_traversal.patch
-review_add_clear_children_checks_during_accname_traversal.patch
-cherry-pick-1894458e04a2.patch
-cherry-pick-a1cbf05b4163.patch
-cherry-pick-ac4785387fff.patch
-cherry-pick-81cb17c24788.patch
-fix_crash-on-close_for_mac_udp_sockets.patch

patches/chromium/add_didinstallconditionalfeatures.patch

@@ -23,10 +23,10 @@ index eb6f4c87c4479d5f4fb8e3f85a231fb9cc744a63..11298b413021b4d438195482db253a93
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index f217de19126feeeafee01b2be31ced936696ce20..95966ce7f0eeb0a7f2822bef69b540ac6bfe298d 100644
+index 596dc721842c707844a771d64337e9cf0d82bfcc..b9eea3470139e1833b2b23d3b535b11235e2bc8e 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4489,6 +4489,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4465,6 +4465,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -79,10 +79,10 @@ index a6ba8411384855c82712960375bc949c5c2bd522..fc86ca807c9c1bda9236160580b09415
    if (World().IsMainWorld()) {
      GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
-index f36d04ff77481bd30e0de3f6d45c54dfece4067c..d30f569cd68716b9e963cf0fb5da3f7e65cc215a 100644
+index bca4cbb2b2ba84fe58b5cfeaf190add5803e27c9..b6c9dd3a2a1c9b6667c563d5da86ccb4871ae81f 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
-@@ -303,6 +303,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
+@@ -301,6 +301,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
  
    virtual void DidCreateScriptContext(v8::Local<v8::Context>,
                                        int32_t world_id) = 0;
@@ -92,7 +92,7 @@ index f36d04ff77481bd30e0de3f6d45c54dfece4067c..d30f569cd68716b9e963cf0fb5da3f7e
                                          int32_t world_id) = 0;
    virtual bool AllowScriptExtensions() = 0;
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
-index 5a83dcdf50acc27da2b1fbb3e515cb4316305a3a..86f31acc40a2dd296c34f3ecf5ef6ccd97cbc18c 100644
+index b690ada2d46146b6da38cbb2c688f249ae558464..b03774140883c5bb7de6358f3df95ab8774b9dc7 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
 @@ -275,6 +275,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index 5a83dcdf50acc27da2b1fbb3e515cb4316305a3a..86f31acc40a2dd296c34f3ecf5ef6ccd
      v8::Local<v8::Context> context,
      int32_t world_id) {
 diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
-index ac81fdc1ac99ca02458a10c0d258b846a8a9955e..ed838db2474790437ff4b57e23a1e289afce4d47 100644
+index 420d82ed07017deba3298c5454666c09240dd23d..15407fb95dcf25875eb76a41fe1834c1f0a53528 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
 @@ -80,6 +80,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,10 +123,10 @@ index ac81fdc1ac99ca02458a10c0d258b846a8a9955e..ed838db2474790437ff4b57e23a1e289
                                  int32_t world_id) override;
  
 diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
-index aab6a77b18f83adeac065083f83b94b7ff251282..0d0e272a162be8d1bee9e0122e3e7a59b0ad32a3 100644
+index 8087d1f62e9b1a8ac33a9e92c10a7cb8b8363e08..845c3329674d99dd385316dbfd1287fa3566a60e 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -359,6 +359,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -357,6 +357,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
  
    void DidCreateScriptContext(v8::Local<v8::Context>,
                                int32_t world_id) override {}

patches/chromium/add_electron_deps_to_license_credits_file.patch

@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Charles Kerr <charles@charleskerr.com>
-Date: Tue, 9 Aug 2022 12:35:36 -0500
-Subject: add electron deps to license credits file
-
-Ensure that licenses for the dependencies introduced by Electron
-are included in `LICENSES.chromium.html`
-
-diff --git a/tools/licenses.py b/tools/licenses.py
-index b083d3509433aa97aa85c59a4269def5ef5a5359..c032e1f9dc058ff2c76b54ac5da6805163d1eadf 100755
---- a/tools/licenses.py
-+++ b/tools/licenses.py
-@@ -340,6 +340,32 @@ SPECIAL_CASES = {
-         "License File":
-         "/third_party/swiftshader/third_party/SPIRV-Tools/LICENSE",
-     },
-+
-+    os.path.join('third_party', 'electron_node'): {
-+        "Name": "Node.js",
-+        "URL": "https://github.com/nodejs/node",
-+        "License": "MIT",
-+        "License File": "/third_party/electron_node/LICENSE",
-+    },
-+    os.path.join('third_party', 'squirrel.mac'): {
-+        "Name": "Squirrel",
-+        "URL": "https://github.com/Squirrel/Squirrel.Mac",
-+        "License": "MIT",
-+        "License File": "/third_party/squirrel.mac/LICENSE",
-+    },
-+    os.path.join('third_party', 'squirrel.mac', 'vendor', 'mantle'): {
-+        "Name": "Mantle",
-+        "URL": "https://github.com/Mantle/Mantle",
-+        "License": "MIT",
-+        "License File": "/third_party/squirrel.mac/vendor/mantle/LICENSE.md",
-+    },
-+    os.path.join('third_party', 'squirrel.mac', 'vendor', 'ReactiveObjC'): {
-+        "Name": "ReactiveObjC",
-+        "URL": "https://github.com/ReactiveCocoa/ReactiveObjC",
-+        "License": "MIT",
-+        "License File":
-+        "/third_party/squirrel.mac/vendor/ReactiveObjC/LICENSE.md",
-+    },
- }
- 
- # Special value for 'License File' field used to indicate that the license file

patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch

@@ -1,176 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: msizanoen1 <msizanoen@qtmlabs.xyz>
-Date: Tue, 19 Jul 2022 05:11:06 +0200
-Subject: Add maximized parameter to LinuxUI::GetWindowFrameProvider
-
-This allows ClientFrameViewLinux to instruct the toolkit to draw the window
-decorations in maximized mode where needed, preventing empty space caused
-by decoration shadows and rounded titlebars around the window while maximized.
-
-diff --git a/ui/gtk/gtk_ui.cc b/ui/gtk/gtk_ui.cc
-index c037fa8db6d4a5ebeb7257627db206e9bab57ecc..14eddfd043e748400a9ee81ce5346a53f10ea03c 100644
---- a/ui/gtk/gtk_ui.cc
-+++ b/ui/gtk/gtk_ui.cc
-@@ -757,13 +757,15 @@ std::unique_ptr<views::NavButtonProvider> GtkUi::CreateNavButtonProvider() {
-   return nullptr;
- }
- 
--views::WindowFrameProvider* GtkUi::GetWindowFrameProvider(bool solid_frame) {
-+views::WindowFrameProvider* GtkUi::GetWindowFrameProvider(bool solid_frame, bool maximized) {
-   if (!GtkCheckVersion(3, 14))
-     return nullptr;
-   auto& provider =
--      solid_frame ? solid_frame_provider_ : transparent_frame_provider_;
-+      maximized
-+        ? (solid_frame ? solid_maximized_frame_provider_ : transparent_maximized_frame_provider_)
-+        : (solid_frame ? solid_frame_provider_ : transparent_frame_provider_);
-   if (!provider)
--    provider = std::make_unique<gtk::WindowFrameProviderGtk>(solid_frame);
-+    provider = std::make_unique<gtk::WindowFrameProviderGtk>(solid_frame, maximized);
-   return provider.get();
- }
- 
-diff --git a/ui/gtk/gtk_ui.h b/ui/gtk/gtk_ui.h
-index 8e609b8311c6b69ef7b6753117542d9e60b2c8ab..a329822c3285599954d77dd5a8e33ccc10e5f626 100644
---- a/ui/gtk/gtk_ui.h
-+++ b/ui/gtk/gtk_ui.h
-@@ -107,7 +107,7 @@ class GtkUi : public views::LinuxUI {
-   bool PreferDarkTheme() const override;
-   bool AnimationsEnabled() const override;
-   std::unique_ptr<views::NavButtonProvider> CreateNavButtonProvider() override;
--  views::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) override;
-+  views::WindowFrameProvider* GetWindowFrameProvider(bool solid_frame, bool maximized) override;
-   base::flat_map<std::string, std::string> GetKeyboardLayoutMap() override;
-   std::string GetCursorThemeName() override;
-   int GetCursorThemeSize() override;
-@@ -218,6 +218,8 @@ class GtkUi : public views::LinuxUI {
-   // while Chrome is running.
-   std::unique_ptr<views::WindowFrameProvider> solid_frame_provider_;
-   std::unique_ptr<views::WindowFrameProvider> transparent_frame_provider_;
-+  std::unique_ptr<views::WindowFrameProvider> solid_maximized_frame_provider_;
-+  std::unique_ptr<views::WindowFrameProvider> transparent_maximized_frame_provider_;
- };
- 
- }  // namespace gtk
-diff --git a/ui/gtk/window_frame_provider_gtk.cc b/ui/gtk/window_frame_provider_gtk.cc
-index e4dbdad327eb77994ffd7f068c67336a19897915..d3ae0636455489a7c7443df85cb769952c98aca2 100644
---- a/ui/gtk/window_frame_provider_gtk.cc
-+++ b/ui/gtk/window_frame_provider_gtk.cc
-@@ -38,16 +38,18 @@ std::string GetThemeName() {
-   return theme_string;
- }
- 
--GtkCssContext WindowContext(bool solid_frame, bool focused) {
-+GtkCssContext WindowContext(bool solid_frame, bool maximized, bool focused) {
-   std::string selector = "#window.background.";
-   selector += solid_frame ? "solid-csd" : "csd";
-+  if (maximized)
-+    selector += ".maximized";
-   if (!focused)
-     selector += ":inactive";
-   return AppendCssNodeToStyleContext({}, selector);
- }
- 
--GtkCssContext DecorationContext(bool solid_frame, bool focused) {
--  auto context = WindowContext(solid_frame, focused);
-+GtkCssContext DecorationContext(bool solid_frame, bool maximized, bool focused) {
-+  auto context = WindowContext(solid_frame, maximized, focused);
-   // GTK4 renders the decoration directly on the window.
-   if (!GtkCheckVersion(4))
-     context = AppendCssNodeToStyleContext(context, "#decoration");
-@@ -64,8 +66,8 @@ GtkCssContext DecorationContext(bool solid_frame, bool focused) {
-   return context;
- }
- 
--GtkCssContext HeaderContext(bool solid_frame, bool focused) {
--  auto context = WindowContext(solid_frame, focused);
-+GtkCssContext HeaderContext(bool solid_frame, bool maximized, bool focused) {
-+  auto context = WindowContext(solid_frame, maximized, focused);
-   context =
-       AppendCssNodeToStyleContext(context, "#headerbar.header-bar.titlebar");
-   if (!focused)
-@@ -110,8 +112,8 @@ int ComputeTopCornerRadius() {
-   // need to experimentally determine the corner radius by rendering a sample.
-   // Additionally, in GTK4, the headerbar corners get clipped by the window
-   // rather than the headerbar having its own rounded corners.
--  auto context = GtkCheckVersion(4) ? DecorationContext(false, false)
--                                    : HeaderContext(false, false);
-+  auto context = GtkCheckVersion(4) ? DecorationContext(false, false, false)
-+                                    : HeaderContext(false, false, false);
-   ApplyCssToContext(context, R"(window, headerbar {
-     background-image: none;
-     background-color: black;
-@@ -169,8 +171,8 @@ void WindowFrameProviderGtk::Asset::CloneFrom(
-   unfocused_bitmap = src.unfocused_bitmap;
- }
- 
--WindowFrameProviderGtk::WindowFrameProviderGtk(bool solid_frame)
--    : solid_frame_(solid_frame) {}
-+WindowFrameProviderGtk::WindowFrameProviderGtk(bool solid_frame, bool maximized)
-+    : solid_frame_(solid_frame), maximized_(maximized) {}
- 
- WindowFrameProviderGtk::~WindowFrameProviderGtk() = default;
- 
-@@ -264,7 +266,7 @@ void WindowFrameProviderGtk::PaintWindowFrame(gfx::Canvas* canvas,
-       top_area_height_dip * scale - asset.frame_thickness_px.top();
- 
-   auto header = PaintHeaderbar({client_bounds_px.width(), top_area_height_px},
--                               HeaderContext(solid_frame_, focused), scale);
-+                               HeaderContext(solid_frame_, maximized_, focused), scale);
-   image = gfx::ImageSkia::CreateFrom1xBitmap(header);
-   // In GTK4, the headerbar gets clipped by the window.
-   if (GtkCheckVersion(4)) {
-@@ -296,7 +298,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) {
- 
-   gfx::Rect frame_bounds_dip(kMaxFrameSizeDip, kMaxFrameSizeDip,
-                              2 * kMaxFrameSizeDip, 2 * kMaxFrameSizeDip);
--  auto focused_context = DecorationContext(solid_frame_, true);
-+  auto focused_context = DecorationContext(solid_frame_, maximized_, true);
-   frame_bounds_dip.Inset(-GtkStyleContextGetPadding(focused_context));
-   frame_bounds_dip.Inset(-GtkStyleContextGetBorder(focused_context));
-   gfx::Size bitmap_size(BitmapSizePx(asset), BitmapSizePx(asset));
-@@ -304,7 +306,7 @@ void WindowFrameProviderGtk::MaybeUpdateBitmaps(float scale) {
-       PaintBitmap(bitmap_size, frame_bounds_dip, focused_context, scale);
-   asset.unfocused_bitmap =
-       PaintBitmap(bitmap_size, frame_bounds_dip,
--                  DecorationContext(solid_frame_, false), scale);
-+                  DecorationContext(solid_frame_, maximized_, false), scale);
- 
-   // In GTK4, there's no way to obtain the frame thickness from CSS values
-   // directly, so we must determine it experimentally based on the drawn
-diff --git a/ui/gtk/window_frame_provider_gtk.h b/ui/gtk/window_frame_provider_gtk.h
-index d3039d73161378197557947aece88d2710c1e486..f7d4605938210b0b75517bb7bcab28b588a16520 100644
---- a/ui/gtk/window_frame_provider_gtk.h
-+++ b/ui/gtk/window_frame_provider_gtk.h
-@@ -14,7 +14,7 @@ namespace gtk {
- 
- class WindowFrameProviderGtk : public views::WindowFrameProvider {
-  public:
--  explicit WindowFrameProviderGtk(bool solid_frame);
-+  explicit WindowFrameProviderGtk(bool solid_frame, bool maximized);
- 
-   WindowFrameProviderGtk(const WindowFrameProviderGtk&) = delete;
-   WindowFrameProviderGtk& operator=(const WindowFrameProviderGtk&) = delete;
-@@ -69,6 +69,9 @@ class WindowFrameProviderGtk : public views::WindowFrameProvider {
- 
-   // Cached bitmaps and metrics.  The scale is rounded to percent.
-   base::flat_map<int, Asset> assets_;
-+
-+  // Whether to draw the window decorations as maximized.
-+  bool maximized_;
- };
- 
- }  // namespace gtk
-diff --git a/ui/views/linux_ui/linux_ui.h b/ui/views/linux_ui/linux_ui.h
-index 5f312e01508c49033bf2d05b9dc083e524f37e5f..7590acd760ba4f36e5a77c1972afc5fc08e616ff 100644
---- a/ui/views/linux_ui/linux_ui.h
-+++ b/ui/views/linux_ui/linux_ui.h
-@@ -189,7 +189,7 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
-   // if transparency is unsupported and the frame should be rendered opaque.
-   // The returned object is not owned by the caller and will remain alive until
-   // the process ends.
--  virtual WindowFrameProvider* GetWindowFrameProvider(bool solid_frame) = 0;
-+  virtual WindowFrameProvider* GetWindowFrameProvider(bool solid_frame, bool maximized) = 0;
- 
-   // Returns a map of KeyboardEvent code to KeyboardEvent key values.
-   virtual base::flat_map<std::string, std::string> GetKeyboardLayoutMap() = 0;

patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch

@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.
 
 diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
-index a9267b633e126f057e914b895f280ed658ff279d..179b5449f53c2d7b9024fb08fe1b1f6c03c6d5b0 100644
+index 32df5050f5a66c4b4f0981d3777a3b5a4fac9629..d8d9982bc6bd6e472677707b326a5dafa9b7fcf5 100644
 --- a/content/browser/renderer_host/render_view_host_impl.cc
 +++ b/content/browser/renderer_host/render_view_host_impl.cc
-@@ -665,6 +665,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+@@ -660,6 +660,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
    GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
  }
  
@@ -22,11 +22,11 @@ index a9267b633e126f057e914b895f280ed658ff279d..179b5449f53c2d7b9024fb08fe1b1f6c
    return is_active();
  }
 diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
-index 3f0df3df3dd74ced71869ce01abf7b159387b8f4..85b169530a21bcfc016d1439a71d35378077774d 100644
+index a099eed10dd061994bff696519099c3ef7437a46..a1f1e9b55272e70b4acd5d1f1515fba7d91538fa 100644
 --- a/content/browser/renderer_host/render_view_host_impl.h
 +++ b/content/browser/renderer_host/render_view_host_impl.h
 @@ -137,6 +137,7 @@ class CONTENT_EXPORT RenderViewHostImpl
-   bool IsRenderViewLiveForTesting() const override;
+   bool IsRenderViewLive() const override;
    void WriteIntoTrace(perfetto::TracedProto<TraceProto> context) const override;
  
 +  void SetSchedulerThrottling(bool allowed) override;
@@ -34,7 +34,7 @@ index 3f0df3df3dd74ced71869ce01abf7b159387b8f4..85b169530a21bcfc016d1439a71d3537
    void SendRendererPreferencesToRenderer(
        const blink::RendererPreferences& preferences);
 diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
-index 3b01b3419c4361d5d75ad1c37e5baa3a1967bd09..35c82d931242a1180091267c18e0255840acc5ce 100644
+index a6fe708878eb9afba9a68e0be71ba2c0b2a84d7d..5cc81ceb44d0a8baee3ebcc63aa4137b1e9ef08e 100644
 --- a/content/public/browser/render_view_host.h
 +++ b/content/public/browser/render_view_host.h
 @@ -80,6 +80,9 @@ class CONTENT_EXPORT RenderViewHost {
@@ -61,10 +61,10 @@ index fd145f0aa562d6b63fb1d3a8a9241ae1aa1ce7a0..54d30fb9db8b48b94abdb815c487f618
    // ADDING NEW FUNCTIONS? Please keep private functions alphabetized and put
    // it in the same order in the .cc file as it was in the header.
 diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
-index 39bfc2200e924d0c589cfd07f085f182ef6853a6..bddff6d5ad3f6d08c4dc48e66ebc5319b1a5ec28 100644
+index befd736a9cf362514b9a2ee475dc4a814c85a87b..24b2617f56673a3075697802cf5b574b0c766610 100644
 --- a/third_party/blink/public/mojom/page/page.mojom
 +++ b/third_party/blink/public/mojom/page/page.mojom
-@@ -108,4 +108,7 @@ interface PageBroadcast {
+@@ -97,4 +97,7 @@ interface PageBroadcast {
  
    // Sent to whole page, but should only be used by the main frame.
    SetPageBaseBackgroundColor(skia.mojom.SkColor? color);
@@ -73,7 +73,7 @@ index 39bfc2200e924d0c589cfd07f085f182ef6853a6..bddff6d5ad3f6d08c4dc48e66ebc5319
 +  SetSchedulerThrottling(bool allowed);
  };
 diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
-index 5e4032ccf916f969cd669af7d983becddb57c72b..a858c9f2fa609ae756a2e70d0362f2de372dd5be 100644
+index a1427a6a95583ae853284b97cab77d577172e60e..4645764213c82e73532f7c61ed03f919f8241393 100644
 --- a/third_party/blink/public/web/web_view.h
 +++ b/third_party/blink/public/web/web_view.h
 @@ -364,6 +364,7 @@ class WebView {
@@ -85,10 +85,10 @@ index 5e4032ccf916f969cd669af7d983becddb57c72b..a858c9f2fa609ae756a2e70d0362f2de
    // Visibility -----------------------------------------------------------
  
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index 6504c73f614bebad7b899c8b76c4b3034b7dab7a..f76a0ee0778d7b4e4df69a4c43b4a6bfdc89294d 100644
+index d7b5e40a26026b7f4640c2f405fadab4a800e267..b2a2e38397fdf3e9bb52c4532a1d14463ed4110d 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -3689,6 +3689,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3688,6 +3688,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -102,7 +102,7 @@ index 6504c73f614bebad7b899c8b76c4b3034b7dab7a..f76a0ee0778d7b4e4df69a4c43b4a6bf
  void WebViewImpl::SetVisibilityState(
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
-@@ -3700,7 +3707,8 @@ void WebViewImpl::SetVisibilityState(
+@@ -3699,7 +3706,8 @@ void WebViewImpl::SetVisibilityState(
    }
    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
    GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,10 +113,10 @@ index 6504c73f614bebad7b899c8b76c4b3034b7dab7a..f76a0ee0778d7b4e4df69a4c43b4a6bf
  
  mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index 5c9609a6a8d1e18981ac14ad5321fa82c3eb38e0..0a2564a8e45210ba58438e95caa70d01fac22aee 100644
+index 08a54c62b7f4eeb6a8b0e0cb192723e1aecad915..1eeb122ac5db86c53d328a308dc2b7a4a5ca9fed 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
-@@ -420,6 +420,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -419,6 +419,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    LocalDOMWindow* PagePopupWindow() const;
  
    PageScheduler* Scheduler() const override;
@@ -124,7 +124,7 @@ index 5c9609a6a8d1e18981ac14ad5321fa82c3eb38e0..0a2564a8e45210ba58438e95caa70d01
    void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
                            bool is_initial_state) override;
    mojom::blink::PageVisibilityState GetVisibilityState() override;
-@@ -855,6 +856,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
+@@ -854,6 +855,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
    // If true, we send IPC messages when |preferred_size_| changes.
    bool send_preferred_size_changes_ = false;
  

patches/chromium/blink_local_frame.patch

@@ -15,10 +15,10 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index a519c49a01987feab4dadbc4ba48b73e943fa404..c8d2a65cb428e85c33675668cc106f0af124dfee 100644
+index 0396836ad4ae67e26b6920afbcd702ccb24d391e..f207eda80b6cd1d3a739cc27499691ad1ac8e13e 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
-@@ -123,14 +123,6 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -122,14 +122,6 @@ bool Frame::Detach(FrameDetachType type) {
  
    DCHECK(!IsDetached());
  
@@ -33,7 +33,7 @@ index a519c49a01987feab4dadbc4ba48b73e943fa404..c8d2a65cb428e85c33675668cc106f0a
    if (type == FrameDetachType::kRemove) {
      if (provisional_frame_) {
        provisional_frame_->Detach(FrameDetachType::kRemove);
-@@ -154,6 +146,14 @@ bool Frame::Detach(FrameDetachType type) {
+@@ -153,6 +145,14 @@ bool Frame::Detach(FrameDetachType type) {
      GetWindowProxyManager()->ClearForSwap();
    }
  
@@ -49,7 +49,7 @@ index a519c49a01987feab4dadbc4ba48b73e943fa404..c8d2a65cb428e85c33675668cc106f0a
    // its owning reference back to our owning LocalFrame.
    client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 3efc0a04ae3fa60dce4aeb9a296c8dd1bb43320a..5dac7c18f39abefcc318ba2a7b8fad449189d0b6 100644
+index b95ed440737ccdf32607c90831d13a482315d515..73f7aeee21f0116e46dad91cb9a088ab5adda6e3 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
 @@ -543,10 +543,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {

patches/chromium/build_allow_electron_to_use_exec_script.patch

@@ -1,18 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Samuel Attard <sattard@salesforce.com>
-Date: Fri, 21 Oct 2022 16:29:06 -0700
-Subject: build: allow electron to use exec_script
-
-This is similar to the //build usecase so we're OK adding ourselves here
-
-diff --git a/.gn b/.gn
-index 5a11496a47ae7cd2b74992c58760ce1786f7b7df..210463041fa2e46bb368f515afdd4f25e1ca6616 100644
---- a/.gn
-+++ b/.gn
-@@ -171,4 +171,6 @@ exec_script_whitelist =
- 
-       "//tools/grit/grit_rule.gni",
-       "//tools/gritsettings/BUILD.gn",
-+
-+      "//electron/BUILD.gn"
-     ]

patches/chromium/build_disable_print_content_analysis.patch

@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: VerteDinde <vertedinde@electronjs.org>
-Date: Sun, 1 May 2022 18:01:42 -0700
-Subject: build: disable print_content_analysis
-
-Print Content Analysis enables enterprise users to scan to-be-printed
-pages and documents for sensitive data if the OnPrintEnterpriseConnector
-policy is enabled. A conversation with the Chromium team confirmed
-this feature was intended for enterprise Chrome users and not embedders,
-so we're disabling it to prevent build issues/additional unneeded files.
-
-This patch can be removed when enable_print_content_analysis can be more
-easily enabled or disabled by default with buildflags.
-
-diff --git a/printing/buildflags/buildflags.gni b/printing/buildflags/buildflags.gni
-index 559ac76d4e4b9d9c1824c4da186a6b0f7619fcca..72855e0c5fadb286b67144b34ff71f45e1434c73 100644
---- a/printing/buildflags/buildflags.gni
-+++ b/printing/buildflags/buildflags.gni
-@@ -36,8 +36,7 @@ declare_args() {
- 
-   # Enable snapshotting a page when printing for its content to be analyzed for
-   # sensitive content by enterprise users.
--  enable_print_content_analysis =
--      is_chromeos_ash || is_chromeos_lacros || is_win || is_linux || is_mac
-+  enable_print_content_analysis = is_chromeos_ash || is_chromeos_lacros
- }
- 
- declare_args() {

patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -33,10 +33,10 @@ index 3c40d999a9545051e91a9f0ad3bf7ca2a95d80c4..b5a20be5e22238e7e1969bdaf52c0b05
          "//base",
          "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 948d05358b89895faa97a7d383bfac66a45464a8..43859d267010103daf80525a5af0f312a577411c 100644
+index 02e4b0e27f4a0d3409327ba929f78b129dc06385..dce624825dc8e9e545c15a0cb0427aa33877aa3e 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4560,7 +4560,7 @@ static_library("browser") {
+@@ -4552,7 +4552,7 @@ static_library("browser") {
  
      # On Windows, the hashes are embedded in //chrome:chrome_initial rather
      # than here in :chrome_dll.
@@ -46,10 +46,10 @@ index 948d05358b89895faa97a7d383bfac66a45464a8..43859d267010103daf80525a5af0f312
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 641f52eb7952858738a6623b480f767261e5d009..6d0c624ea62a9125ef7e5579da197de2327a12ff 100644
+index 060e49987d27be37afb2b85e658525d4edc08df6..3333bb6be0d07eff9d4ef5aea446c44c00b3d3af 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -6002,7 +6002,6 @@ test("unit_tests") {
+@@ -5995,7 +5995,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 641f52eb7952858738a6623b480f767261e5d009..6d0c624ea62a9125ef7e5579da197de2
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/browser:chrome_process_finder",
-@@ -6025,6 +6024,10 @@ test("unit_tests") {
+@@ -6018,6 +6017,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 641f52eb7952858738a6623b480f767261e5d009..6d0c624ea62a9125ef7e5579da197de2
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -6712,7 +6715,6 @@ test("unit_tests") {
+@@ -6706,7 +6709,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,7 +76,7 @@ index 641f52eb7952858738a6623b480f767261e5d009..6d0c624ea62a9125ef7e5579da197de2
        "//chrome/browser:cart_db_content_proto",
        "//chrome/browser:coupon_db_content_proto",
        "//chrome/browser/media/router:test_support",
-@@ -6760,6 +6762,11 @@ test("unit_tests") {
+@@ -6754,6 +6756,11 @@ test("unit_tests") {
      if (is_chromeos) {
        deps += [ "//ui/chromeos" ]
      }

patches/chromium/can_create_window.patch

@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.
 
 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index ec886101b6e5347bdd832684a5c3b2cc3179c657..0287e414f4020147ddee297f7c1447c32a118905 100644
+index 9b08d7bbbda75390813ff07e0dc83bb9d16992a6..b47dc4a90a0294c5d7e73f01c496fd2b4f621400 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -6943,6 +6943,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -6939,6 +6939,7 @@ void RenderFrameHostImpl::CreateNewWindow(
            last_committed_origin_, params->window_container_type,
            params->target_url, params->referrer.To<Referrer>(),
            params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index ec886101b6e5347bdd832684a5c3b2cc3179c657..0287e414f4020147ddee297f7c1447c3
            &no_javascript_access);
  
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 335e70179a03ee379082525bb4c7d596983bd633..faa795be3a6cbc7ae13d9a42a1bdbd01ac0406a9 100644
+index d0092176fd24acb0657819d666e4f76ec65012ec..df03de0a810bbce796d5bc421b92000e02dbd449 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -3947,6 +3947,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3943,6 +3943,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
    }
    auto* new_contents_impl = new_contents.get();
  
@@ -39,7 +39,7 @@ index 335e70179a03ee379082525bb4c7d596983bd633..faa795be3a6cbc7ae13d9a42a1bdbd01
    new_contents_impl->GetController().SetSessionStorageNamespace(
        partition_config, session_storage_namespace);
  
-@@ -3991,12 +3999,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -3987,12 +3995,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
      AddWebContentsDestructionObserver(new_contents_impl);
    }
  
@@ -102,7 +102,7 @@ index ae3dda4b9b40bb0d4c1a10eaedda9270d3543a8b..9b988bb631ab759739ae01c918efb1d5
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
-index 9bbc7cf6d9542a3f013313e0c497839da2beb9d1..c01e06b08b1cca7a663e30476a551904ce9c6db8 100644
+index f132199113778f6b50972419b61a187e6272300c..7bb1680553c405a9016cfd67eca5fa3c6439b692 100644
 --- a/content/public/browser/web_contents_delegate.cc
 +++ b/content/public/browser/web_contents_delegate.cc
 @@ -26,6 +26,17 @@ namespace content {
@@ -124,7 +124,7 @@ index 9bbc7cf6d9542a3f013313e0c497839da2beb9d1..c01e06b08b1cca7a663e30476a551904
                                                   const OpenURLParams& params) {
    return nullptr;
 diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
-index 04aa4d993b331396ee20464f6e1d2da10c91c834..2556c044b6e28501a5fac9b0040e623b8f35f497 100644
+index 85335ff06c87ea3986360fad18df6cf01a4a7cca..eeafde1fa6067804665954525eafdd482d8eb3f3 100644
 --- a/content/public/browser/web_contents_delegate.h
 +++ b/content/public/browser/web_contents_delegate.h
 @@ -16,6 +16,7 @@
@@ -150,7 +150,7 @@ index 04aa4d993b331396ee20464f6e1d2da10c91c834..2556c044b6e28501a5fac9b0040e623b
    // typically happens when popups are created.
    virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 89b07508aef80680a847c106fea0e2fa58ff964b..6630af3583a6bac6135d46644280d6444fe981b8 100644
+index f7fbc40e8df8b996d6079f2e691771529ca42497..5580f245477b713d0f1f92ca9d15de847c4f8c92 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
 @@ -33,6 +33,7 @@
@@ -220,10 +220,10 @@ index 84d32491a56528a84b4395fba1d54cdbb38d522b..09998a83c449ef8cd9f360fbcdcf7edc
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index 2e2ba228a7f179b7cf9c43434bd20ca20b1f1af6..de9f95426ad2dcc99bc4961a0e57539d287408e4 100644
+index 00af75f5295251fb19c874d2b7d877c4a53f7f12..c0042534907dfca1789b8dde2ffa11956d3e029e 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2074,6 +2074,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2076,6 +2076,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
  
    WebWindowFeatures window_features =
        GetWindowFeaturesFromString(features, incumbent_window);

patches/chromium/cherry-pick-05a0d99c9715.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: David Bokan <bokan@chromium.org>
-Date: Thu, 28 Jul 2022 18:09:13 +0000
-Subject: Prevent handling input for provisional frames
-
-Bug: 1347644,1322812
-Change-Id: Ifd60f6aa593ce23ca6cbb65552fc9fb8f8690035
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3791883
-Commit-Queue: David Bokan <bokan@chromium.org>
-Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1029361}
-
-diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc
-index c7d6c63a3c3b640436835e986d2e03ee232b65f0..6106168562e5300b5d15666e1278b207358c63b8 100644
---- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc
-+++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc
-@@ -2448,10 +2448,15 @@ WebInputEventResult WebFrameWidgetImpl::HandleInputEvent(
-   DCHECK(!WebInputEvent::IsTouchEventType(input_event.GetType()));
-   CHECK(LocalRootImpl());
- 
-+  // Clients shouldn't be dispatching events to a provisional frame but this
-+  // can happen. Ensure that event handling can assume we're in a committed
-+  // frame.
-+  if (IsProvisional())
-+    return WebInputEventResult::kHandledSuppressed;
-+
-   // Only record metrics for the root frame.
--  if (ForTopMostMainFrame()) {
-+  if (ForTopMostMainFrame())
-     GetPage()->GetVisualViewport().StartTrackingPinchStats();
--  }
- 
-   // If a drag-and-drop operation is in progress, ignore input events except
-   // PointerCancel and GestureLongPress.

patches/chromium/cherry-pick-06c87f9f42ff.patch

@@ -1,153 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Rune Lillesveen <futhark@chromium.org>
-Date: Fri, 14 Oct 2022 09:52:34 +0000
-Subject: Avoid layout roots in subtrees skipped for style recalc
-
-Layout roots are laid out from inner to outer in LocalFrameView. DOM
-mutations may have added layout roots inside size container subtrees
-before style recalc. If we decide to postpone style recalc until layout
-of the size container, it means we may try to layout a root inside a
-subtree skipped for style recalc. That causes a DCHECK and possibly
-other issues.
-
-This also fixes the use-after-poison issue 1365330.
-
-(cherry picked from commit 0f0f1e99201fadb3c68518350e1cd6af1b665346)
-
-Bug: 1371820, 1365330
-Change-Id: Ia48890c08aacfe7b9a3e660817702abce0570564
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3934847
-Reviewed-by: Ian Kilpatrick <ikilpatrick@chromium.org>
-Commit-Queue: Rune Lillesveen <futhark@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#1055853}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3953455
-Auto-Submit: Rune Lillesveen <futhark@chromium.org>
-Commit-Queue: Anders Hartvoll Ruud <andruud@chromium.org>
-Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
-Cr-Commit-Position: refs/branch-heads/5249@{#836}
-Cr-Branched-From: 4f7bea5de862aaa52e6bde5920755a9ef9db120b-refs/heads/main@{#1036826}
-
-diff --git a/third_party/blink/renderer/core/css/style_engine.cc b/third_party/blink/renderer/core/css/style_engine.cc
-index 80a400738536e80683ec6e7eba78f891966d4e9c..c06274949131f17253c614984402fe13eee66809 100644
---- a/third_party/blink/renderer/core/css/style_engine.cc
-+++ b/third_party/blink/renderer/core/css/style_engine.cc
-@@ -2643,6 +2643,7 @@ void StyleEngine::RecalcStyle(StyleRecalcChange change,
-   DCHECK(GetDocument().documentElement());
-   ScriptForbiddenScope forbid_script;
-   HasMatchedCacheScope has_matched_cache_scope(&GetDocument());
-+  SkipStyleRecalcScope skip_scope(*this);
-   Element& root_element = style_recalc_root_.RootElement();
-   Element* parent = FlatTreeTraversal::ParentElement(root_element);
- 
-@@ -3231,4 +3232,17 @@ void StyleEngine::MarkForLayoutTreeChangesAfterDetach() {
-   parent_for_detached_subtree_ = nullptr;
- }
- 
-+bool StyleEngine::AllowSkipStyleRecalcForScope() const {
-+  if (InContainerQueryStyleRecalc())
-+    return true;
-+  if (LocalFrameView* view = GetDocument().View()) {
-+    // Existing layout roots before starting style recalc may end up being
-+    // inside skipped subtrees if we allowed skipping. If we start out with an
-+    // empty list, any added ones will be a result of an element style recalc,
-+    // which means the will not be inside a skipped subtree.
-+    return !view->IsSubtreeLayout();
-+  }
-+  return true;
-+}
-+
- }  // namespace blink
-diff --git a/third_party/blink/renderer/core/css/style_engine.h b/third_party/blink/renderer/core/css/style_engine.h
-index cb18cdff2e2b782a486dcebdda75761a68428a2b..512010d021ae8e726efb02206af6f739fa610346 100644
---- a/third_party/blink/renderer/core/css/style_engine.h
-+++ b/third_party/blink/renderer/core/css/style_engine.h
-@@ -177,6 +177,20 @@ class CORE_EXPORT StyleEngine final : public GarbageCollected<StyleEngine>,
-     base::AutoReset<bool> allow_marking_;
-   };
- 
-+  // Set up the condition for allowing to skip style recalc before starting
-+  // RecalcStyle().
-+  class SkipStyleRecalcScope {
-+    STACK_ALLOCATED();
-+
-+   public:
-+    explicit SkipStyleRecalcScope(StyleEngine& engine)
-+        : allow_skip_(&engine.allow_skip_style_recalc_,
-+                      engine.AllowSkipStyleRecalcForScope()) {}
-+
-+   private:
-+    base::AutoReset<bool> allow_skip_;
-+  };
-+
-   explicit StyleEngine(Document&);
-   ~StyleEngine() override;
- 
-@@ -337,6 +351,10 @@ class CORE_EXPORT StyleEngine final : public GarbageCollected<StyleEngine>,
-   void UpdateStyleRecalcRoot(ContainerNode* ancestor, Node* dirty_node);
-   void UpdateLayoutTreeRebuildRoot(ContainerNode* ancestor, Node* dirty_node);
- 
-+  // Returns true if we can skip style recalc for a size container subtree and
-+  // resume it during layout.
-+  bool SkipStyleRecalcAllowed() const { return allow_skip_style_recalc_; }
-+
-   CSSFontSelector* GetFontSelector() { return font_selector_; }
- 
-   void RemoveFontFaceRules(const HeapVector<Member<const StyleRuleFontFace>>&);
-@@ -719,6 +737,9 @@ class CORE_EXPORT StyleEngine final : public GarbageCollected<StyleEngine>,
-       Element* parent,
-       Element* previous_sibling);
- 
-+  // Initialization value for SkipStyleRecalcScope.
-+  bool AllowSkipStyleRecalcForScope() const;
-+
-   Member<Document> document_;
- 
-   // Tracks the number of currently loading top-level stylesheets. Sheets loaded
-@@ -788,6 +809,9 @@ class CORE_EXPORT StyleEngine final : public GarbageCollected<StyleEngine>,
-   // AllowMarkStyleDirtyFromRecalcScope.
-   bool allow_mark_for_reattach_from_rebuild_layout_tree_{false};
- 
-+  // Set to true if we are allowed to skip recalc for a size container subtree.
-+  bool allow_skip_style_recalc_{false};
-+
-   // See enum ViewportUnitFlag.
-   unsigned viewport_unit_dirty_flags_{0};
- 
-diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc
-index 8f60e1e6e2c929e5f58682c924478a62725f73b3..bfbf6b3c103f0b5d79570c9372bfc0f81166a2d7 100644
---- a/third_party/blink/renderer/core/dom/element.cc
-+++ b/third_party/blink/renderer/core/dom/element.cc
-@@ -3334,6 +3334,10 @@ bool Element::SkipStyleRecalcForContainer(
-     const ComputedStyle& style,
-     const StyleRecalcChange& child_change) {
-   DCHECK(RuntimeEnabledFeatures::CSSContainerSkipStyleRecalcEnabled());
-+
-+  if (!GetDocument().GetStyleEngine().SkipStyleRecalcAllowed())
-+    return false;
-+
-   if (!child_change.TraversePseudoElements(*this)) {
-     // If none of the children or pseudo elements need to be traversed for style
-     // recalc, there is no point in marking the subtree as skipped.
-diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/crashtests/chrome-layout-root-crash.html b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/crashtests/chrome-layout-root-crash.html
-new file mode 100644
-index 0000000000000000000000000000000000000000..e3e709a240bd870250b2747c94fe96880bdf52e3
---- /dev/null
-+++ b/third_party/blink/web_tests/external/wpt/css/css-contain/container-queries/crashtests/chrome-layout-root-crash.html
-@@ -0,0 +1,17 @@
-+<!doctype html>
-+<html class="reftest-wait">
-+<link rel="help" href="https://crbug.com/1371820">
-+<style>
-+  body, div, img { container-type: size; }
-+</style>
-+<p>Pass if no crash.</p>
-+<div id="div"><img id="img" alt="a"></div>
-+<script>
-+  requestAnimationFrame(() => requestAnimationFrame(() => {
-+    // Adds a layout root inside the div size container.
-+    img.alt = img.src = "b";
-+    // Marks div size container for layout which skips style recalc for the sub-tree.
-+    div.style.width = "500px";
-+    document.documentElement.classList.remove("reftest-wait");
-+  }));
-+</script>

patches/chromium/cherry-pick-079105b7ebba.patch

@@ -1,272 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Yuki Shiino <yukishiino@chromium.org>
-Date: Tue, 23 Aug 2022 09:18:50 +0000
-Subject: bindings: Add argument type checks to ObservableArray<T>
-
-Performs type checks for arguments of trap functions and throws
-a TypeError if a type is wrong.
-
-(cherry picked from commit 4d67bb1dbf55e2eddf513f29ac33e38e8e1d2fab)
-
-Bug: 1352549
-Change-Id: I66df3a9eeae5e4f44bdf714666a2c6304ebec0f5
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3835494
-Auto-Submit: Yuki Shiino <yukishiino@chromium.org>
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: Kentaro Hara <haraken@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#1036005}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3849901
-Cr-Commit-Position: refs/branch-heads/5112@{#1514}
-Cr-Branched-From: b13d3fe7b3c47a56354ef54b221008afa754412e-refs/heads/main@{#1012729}
-
-diff --git a/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_handler.h b/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_handler.h
-index 1b31781f4b445b2dab7967b1137c28de50455623..4b17428992c66fad9f7eee1e2956f4218017fb8f 100644
---- a/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_handler.h
-+++ b/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_handler.h
-@@ -54,13 +54,17 @@ class ObservableArrayExoticObjectHandler {
-       const v8::FunctionCallbackInfo<v8::Value>& info) {
-     v8::Isolate* isolate = info.GetIsolate();
-     v8::Local<v8::Context> current_context = isolate->GetCurrentContext();
--    v8::Local<v8::Array> v8_target = info[0].As<v8::Array>();
--    v8::Local<v8::Value> v8_property = info[1];
--    v8::Local<v8::Value> v8_desc_obj = info[2];
--    BackingListWrappable& backing_list = ToWrappableUnsafe(isolate, v8_target);
-     ExceptionState exception_state(
--        isolate, ExceptionContext::Context::kNamedPropertyDefine,
--        backing_list.ObservableArrayNameInIDL());
-+        isolate, ExceptionContext::Context::kOperationInvoke,
-+        BackingListWrappable::ObservableArrayNameInIDL(), "defineProperty");
-+    if (!(info[0]->IsArray() && info[1]->IsName() && info[2]->IsObject())) {
-+      exception_state.ThrowTypeError("Invalid argument.");
-+      return;
-+    }
-+    v8::Local<v8::Array> v8_target = info[0].As<v8::Array>();
-+    v8::Local<v8::Name> v8_property = info[1].As<v8::Name>();
-+    v8::Local<v8::Object> v8_desc_obj = info[2].As<v8::Object>();
-+    BackingListWrappable& backing_list = ToWrappableOrDie(isolate, v8_target);
- 
-     V8PropertyDescriptorBag desc_bag;
-     V8ObjectToPropertyDescriptor(isolate, v8_desc_obj, desc_bag,
-@@ -112,9 +116,7 @@ class ObservableArrayExoticObjectHandler {
-         desc.set_configurable(desc_bag.configurable);
-       if (desc_bag.has_enumerable)
-         desc.set_enumerable(desc_bag.enumerable);
--      if (!v8_target
--               ->DefineProperty(current_context, v8_property.As<v8::Name>(),
--                                desc)
-+      if (!v8_target->DefineProperty(current_context, v8_property, desc)
-                .To(&is_defined)) {
-         return;
-       }
-@@ -124,9 +126,7 @@ class ObservableArrayExoticObjectHandler {
-         desc.set_configurable(desc_bag.configurable);
-       if (desc_bag.has_enumerable)
-         desc.set_enumerable(desc_bag.enumerable);
--      if (!v8_target
--               ->DefineProperty(current_context, v8_property.As<v8::Name>(),
--                                desc)
-+      if (!v8_target->DefineProperty(current_context, v8_property, desc)
-                .To(&is_defined)) {
-         return;
-       }
-@@ -139,9 +139,16 @@ class ObservableArrayExoticObjectHandler {
-       const v8::FunctionCallbackInfo<v8::Value>& info) {
-     v8::Isolate* isolate = info.GetIsolate();
-     v8::Local<v8::Context> current_context = isolate->GetCurrentContext();
-+    if (!(info[0]->IsArray() && info[1]->IsName())) {
-+      ExceptionState exception_state(
-+          isolate, ExceptionContext::Context::kOperationInvoke,
-+          BackingListWrappable::ObservableArrayNameInIDL(), "deleteProperty");
-+      exception_state.ThrowTypeError("Invalid argument.");
-+      return;
-+    }
-     v8::Local<v8::Array> v8_target = info[0].As<v8::Array>();
--    v8::Local<v8::Value> v8_property = info[1];
--    BackingListWrappable& backing_list = ToWrappableUnsafe(isolate, v8_target);
-+    v8::Local<v8::Name> v8_property = info[1].As<v8::Name>();
-+    BackingListWrappable& backing_list = ToWrappableOrDie(isolate, v8_target);
- 
-     if (v8_property->IsString()) {
-       v8::Local<v8::Uint32> v8_index;
-@@ -154,7 +161,7 @@ class ObservableArrayExoticObjectHandler {
-         ScriptState* script_state = ScriptState::From(current_context);
-         ExceptionState exception_state(
-             isolate, ExceptionContext::Context::kIndexedPropertyDelete,
--            backing_list.ObservableArrayNameInIDL());
-+            BackingListWrappable::ObservableArrayNameInIDL());
-         if (!RunDeleteAlgorithm(script_state, backing_list, index,
-                                 exception_state)) {
-           return;
-@@ -181,9 +188,16 @@ class ObservableArrayExoticObjectHandler {
-   static void TrapGet(const v8::FunctionCallbackInfo<v8::Value>& info) {
-     v8::Isolate* isolate = info.GetIsolate();
-     v8::Local<v8::Context> current_context = isolate->GetCurrentContext();
-+    if (!(info[0]->IsArray() && info[1]->IsName())) {
-+      ExceptionState exception_state(
-+          isolate, ExceptionContext::Context::kOperationInvoke,
-+          BackingListWrappable::ObservableArrayNameInIDL(), "get");
-+      exception_state.ThrowTypeError("Invalid argument.");
-+      return;
-+    }
-     v8::Local<v8::Array> v8_target = info[0].As<v8::Array>();
--    v8::Local<v8::Value> v8_property = info[1];
--    BackingListWrappable& backing_list = ToWrappableUnsafe(isolate, v8_target);
-+    v8::Local<v8::Name> v8_property = info[1].As<v8::Name>();
-+    BackingListWrappable& backing_list = ToWrappableOrDie(isolate, v8_target);
- 
-     if (v8_property->IsString()) {
-       v8::Local<v8::Uint32> v8_index;
-@@ -221,9 +235,17 @@ class ObservableArrayExoticObjectHandler {
-       const v8::FunctionCallbackInfo<v8::Value>& info) {
-     v8::Isolate* isolate = info.GetIsolate();
-     v8::Local<v8::Context> current_context = isolate->GetCurrentContext();
-+    if (!(info[0]->IsArray() && info[1]->IsName())) {
-+      ExceptionState exception_state(
-+          isolate, ExceptionContext::Context::kOperationInvoke,
-+          BackingListWrappable::ObservableArrayNameInIDL(),
-+          "getOwnPropertyDescriptor");
-+      exception_state.ThrowTypeError("Invalid argument.");
-+      return;
-+    }
-     v8::Local<v8::Array> v8_target = info[0].As<v8::Array>();
--    v8::Local<v8::Value> v8_property = info[1];
--    BackingListWrappable& backing_list = ToWrappableUnsafe(isolate, v8_target);
-+    v8::Local<v8::Name> v8_property = info[1].As<v8::Name>();
-+    BackingListWrappable& backing_list = ToWrappableOrDie(isolate, v8_target);
- 
-     if (v8_property->IsString()) {
-       v8::Local<v8::Uint32> v8_index;
-@@ -258,9 +280,7 @@ class ObservableArrayExoticObjectHandler {
-     }
- 
-     v8::Local<v8::Value> v8_value;
--    if (!v8_target
--             ->GetOwnPropertyDescriptor(current_context,
--                                        v8_property.As<v8::Name>())
-+    if (!v8_target->GetOwnPropertyDescriptor(current_context, v8_property)
-              .ToLocal(&v8_value)) {
-       return;
-     }
-@@ -271,9 +291,16 @@ class ObservableArrayExoticObjectHandler {
-   static void TrapHas(const v8::FunctionCallbackInfo<v8::Value>& info) {
-     v8::Isolate* isolate = info.GetIsolate();
-     v8::Local<v8::Context> current_context = isolate->GetCurrentContext();
-+    if (!(info[0]->IsArray() && info[1]->IsName())) {
-+      ExceptionState exception_state(
-+          isolate, ExceptionContext::Context::kOperationInvoke,
-+          BackingListWrappable::ObservableArrayNameInIDL(), "has");
-+      exception_state.ThrowTypeError("Invalid argument.");
-+      return;
-+    }
-     v8::Local<v8::Array> v8_target = info[0].As<v8::Array>();
--    v8::Local<v8::Value> v8_property = info[1];
--    BackingListWrappable& backing_list = ToWrappableUnsafe(isolate, v8_target);
-+    v8::Local<v8::Name> v8_property = info[1].As<v8::Name>();
-+    BackingListWrappable& backing_list = ToWrappableOrDie(isolate, v8_target);
- 
-     if (v8_property->IsString()) {
-       v8::Local<v8::Uint32> v8_index;
-@@ -300,8 +327,15 @@ class ObservableArrayExoticObjectHandler {
-   static void TrapOwnKeys(const v8::FunctionCallbackInfo<v8::Value>& info) {
-     v8::Isolate* isolate = info.GetIsolate();
-     v8::Local<v8::Context> current_context = isolate->GetCurrentContext();
-+    if (!info[0]->IsArray()) {
-+      ExceptionState exception_state(
-+          isolate, ExceptionContext::Context::kOperationInvoke,
-+          BackingListWrappable::ObservableArrayNameInIDL(), "ownKeys");
-+      exception_state.ThrowTypeError("Invalid argument.");
-+      return;
-+    }
-     v8::Local<v8::Array> v8_target = info[0].As<v8::Array>();
--    BackingListWrappable& backing_list = ToWrappableUnsafe(isolate, v8_target);
-+    BackingListWrappable& backing_list = ToWrappableOrDie(isolate, v8_target);
- 
-     // 2. Let length be handler.[[BackingList]]'s size.
-     // 3. Let keys be an empty list.
-@@ -357,17 +391,24 @@ class ObservableArrayExoticObjectHandler {
-   static void TrapSet(const v8::FunctionCallbackInfo<v8::Value>& info) {
-     v8::Isolate* isolate = info.GetIsolate();
-     v8::Local<v8::Context> current_context = isolate->GetCurrentContext();
-+    if (!(info[0]->IsArray() && info[1]->IsName())) {
-+      ExceptionState exception_state(
-+          isolate, ExceptionContext::Context::kOperationInvoke,
-+          BackingListWrappable::ObservableArrayNameInIDL(), "set");
-+      exception_state.ThrowTypeError("Invalid argument.");
-+      return;
-+    }
-     v8::Local<v8::Array> v8_target = info[0].As<v8::Array>();
--    v8::Local<v8::Value> v8_property = info[1];
-+    v8::Local<v8::Name> v8_property = info[1].As<v8::Name>();
-     v8::Local<v8::Value> v8_value = info[2];
--    BackingListWrappable& backing_list = ToWrappableUnsafe(isolate, v8_target);
-+    BackingListWrappable& backing_list = ToWrappableOrDie(isolate, v8_target);
- 
-     if (v8_property->IsString()) {
-       v8::Local<v8::Uint32> v8_index;
-       if (v8_property->ToArrayIndex(current_context).ToLocal(&v8_index)) {
-         ExceptionState exception_state(
-             isolate, ExceptionContext::Context::kIndexedPropertySet,
--            backing_list.ObservableArrayNameInIDL());
-+            BackingListWrappable::ObservableArrayNameInIDL());
-         uint32_t index = v8_index->Value();
-         bool result =
-             DoSetTheIndexedValue(isolate, current_context, backing_list, index,
-@@ -380,7 +421,7 @@ class ObservableArrayExoticObjectHandler {
-               V8AtomicString(isolate, "length"))) {
-         ExceptionState exception_state(
-             isolate, ExceptionContext::Context::kAttributeSet,
--            backing_list.ObservableArrayNameInIDL(), "length");
-+            BackingListWrappable::ObservableArrayNameInIDL(), "length");
-         bool result = DoSetTheLength(isolate, current_context, backing_list,
-                                      v8_value, exception_state);
-         V8SetReturnValue(info, result);
-@@ -431,11 +472,11 @@ class ObservableArrayExoticObjectHandler {
-   }
- 
-  private:
--  static BackingListWrappable& ToWrappableUnsafe(v8::Isolate* isolate,
--                                                 v8::Local<v8::Array> target) {
-+  static BackingListWrappable& ToWrappableOrDie(v8::Isolate* isolate,
-+                                                v8::Local<v8::Array> target) {
-     bindings::ObservableArrayBase* base =
-         bindings::ObservableArrayExoticObjectImpl::
--            ProxyTargetToObservableArrayBase(isolate, target);
-+            ProxyTargetToObservableArrayBaseOrDie(isolate, target);
-     return *static_cast<BackingListWrappable*>(base);
-   }
- 
-diff --git a/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_impl.cc b/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_impl.cc
-index 8672414aba480c4af3b7431e6db071a03d61569e..88c2adf501a3a3088c635c8d24215fbce787b3e5 100644
---- a/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_impl.cc
-+++ b/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_impl.cc
-@@ -42,7 +42,7 @@ const WrapperTypeInfo& ObservableArrayExoticObjectImpl::wrapper_type_info_ =
- 
- // static
- bindings::ObservableArrayBase*
--ObservableArrayExoticObjectImpl::ProxyTargetToObservableArrayBase(
-+ObservableArrayExoticObjectImpl::ProxyTargetToObservableArrayBaseOrDie(
-     v8::Isolate* isolate,
-     v8::Local<v8::Array> v8_proxy_target) {
-   // See the implementation comment in ObservableArrayExoticObjectImpl::Wrap.
-@@ -50,6 +50,8 @@ ObservableArrayExoticObjectImpl::ProxyTargetToObservableArrayBase(
-       V8PrivateProperty::GetSymbol(isolate, kV8ProxyTargetToV8WrapperKey);
-   v8::Local<v8::Value> backing_list_wrapper =
-       private_property.GetOrUndefined(v8_proxy_target).ToLocalChecked();
-+  // Crash when author script managed to pass something else other than the
-+  // right proxy target object.
-   CHECK(backing_list_wrapper->IsObject());
-   return ToScriptWrappable(backing_list_wrapper.As<v8::Object>())
-       ->ToImpl<bindings::ObservableArrayBase>();
-diff --git a/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_impl.h b/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_impl.h
-index 4d262a4981c1404d9b403b0fcf4ec9d71e109bea..8c56428c40e5b0d246b45c741f8bdcbfdcfb23ee 100644
---- a/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_impl.h
-+++ b/third_party/blink/renderer/bindings/core/v8/observable_array_exotic_object_impl.h
-@@ -22,7 +22,7 @@ class CORE_EXPORT ObservableArrayExoticObjectImpl final
-  public:
-   // Returns the backing list object extracted from the proxy target object
-   // of type JS Array.
--  static bindings::ObservableArrayBase* ProxyTargetToObservableArrayBase(
-+  static bindings::ObservableArrayBase* ProxyTargetToObservableArrayBaseOrDie(
-       v8::Isolate* isolate,
-       v8::Local<v8::Array> v8_proxy_target);
- 

patches/chromium/cherry-pick-1894458e04a2.patch

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joshua Peraza <jperaza@chromium.org>
-Date: Thu, 3 Nov 2022 21:18:35 +0000
-Subject: Validate number of bytes read
-
-Original commit:
-https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3994208
-
-(cherry picked from commit 7585111a6c1dfa502f3ca1e3d27aed066e479fd9)
-
-Bug: chromium:1380083
-Change-Id: If9708ccdbf6957ef169b35f8f89e2b0744d066d7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4000305
-Reviewed-by: Mark Mentovai <mark@chromium.org>
-Commit-Queue: Joshua Peraza <jperaza@chromium.org>
-Cr-Original-Commit-Position: refs/branch-heads/5359@{#529}
-Cr-Original-Branched-From: 27d3765d341b09369006d030f83f582a29eb57ae-refs/heads/main@{#1058933}
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4004067
-Cr-Commit-Position: refs/branch-heads/5249@{#905}
-Cr-Branched-From: 4f7bea5de862aaa52e6bde5920755a9ef9db120b-refs/heads/main@{#1036826}
-
-diff --git a/third_party/crashpad/crashpad/util/linux/ptrace_client.cc b/third_party/crashpad/crashpad/util/linux/ptrace_client.cc
-index 1863841f73f64d89391646f5c3e5fc2e2766a6cc..32cc35d9567117fe0eb6f1ec4736ac4a15ddfd83 100644
---- a/third_party/crashpad/crashpad/util/linux/ptrace_client.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptrace_client.cc
-@@ -331,6 +331,11 @@ ssize_t PtraceClient::ReadUpTo(VMAddress address, size_t size, void* buffer) {
-       return total_read;
-     }
- 
-+    if (static_cast<size_t>(bytes_read) > size) {
-+      LOG(ERROR) << "invalid size " << bytes_read;
-+      return -1;
-+    }
-+
-     if (!LoggingReadFileExactly(sock_, buffer_c, bytes_read)) {
-       return -1;
-     }

patches/chromium/cherry-pick-1eb1e18ad41d.patch

@@ -1,184 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Anders Hartvoll Ruud <andruud@chromium.org>
-Date: Tue, 20 Sep 2022 17:43:47 +0000
-Subject: Add CSSTokenizer-created strings to CSSVariableData's backing strings
-
-When computing the value of a registered custom property, we create
-a CSSVariableData object equivalent to the computed CSSValue by
-serializing that CSSValue to a String, then tokenizing that value.
-
-The problem is that CSSTokenizer can create *new* string objects
-during the tokenization process (see calls to CSSTokenizer::
-RegisterString), without communicating that fact to the call-site.
-
-Therefore, this CL adds a way to access those strings so they can
-be added to the backing strings of the CSSVariableData.
-
-Also added a DCHECK to verify that we don't have any tokens with
-non-backed string pointers.
-
-Fixed: 1358907
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3892782
-Reviewed-by: Steinar H Gunderson <sesse@chromium.org>
-Commit-Queue: Anders Hartvoll Ruud <andruud@chromium.org>
-Cr-Original-Commit-Position: refs/heads/main@{#1046868}
-Change-Id: Ifb6d194508e99030a5a3ed5fbad5496b7263bdc1
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3905727
-Auto-Submit: Anders Hartvoll Ruud <andruud@chromium.org>
-Cr-Commit-Position: refs/branch-heads/5249@{#518}
-Cr-Branched-From: 4f7bea5de862aaa52e6bde5920755a9ef9db120b-refs/heads/main@{#1036826}
-
-diff --git a/third_party/blink/renderer/core/css/css_variable_data.cc b/third_party/blink/renderer/core/css/css_variable_data.cc
-index a2294cc70c59ac0357dddf0f7719cc3c09d23554..b3a61b312eb5f0360e8aa4cb706c60f0085fead9 100644
---- a/third_party/blink/renderer/core/css/css_variable_data.cc
-+++ b/third_party/blink/renderer/core/css/css_variable_data.cc
-@@ -4,6 +4,7 @@
- 
- #include "third_party/blink/renderer/core/css/css_variable_data.h"
- 
-+#include "base/containers/span.h"
- #include "third_party/blink/renderer/core/css/css_syntax_definition.h"
- #include "third_party/blink/renderer/core/css/parser/css_parser_context.h"
- #include "third_party/blink/renderer/platform/wtf/text/character_names.h"
-@@ -109,6 +110,51 @@ void CSSVariableData::ConsumeAndUpdateTokens(const CSSParserTokenRange& range) {
-     UpdateTokens<UChar>(range, backing_string, tokens_);
- }
- 
-+#if EXPENSIVE_DCHECKS_ARE_ON()
-+
-+namespace {
-+
-+template <typename CharacterType>
-+bool IsSubspan(base::span<const CharacterType> inner,
-+               base::span<const CharacterType> outer) {
-+  // Note that base::span uses CheckedContiguousIterator, which restricts
-+  // which comparisons are allowed. Therefore we must avoid begin()/end() here.
-+  return inner.data() >= outer.data() &&
-+         (inner.data() + inner.size()) <= (outer.data() + outer.size());
-+}
-+
-+bool TokenValueIsBacked(const CSSParserToken& token,
-+                        const String& backing_string) {
-+  StringView value = token.Value();
-+  if (value.Is8Bit() != backing_string.Is8Bit())
-+    return false;
-+  return value.Is8Bit() ? IsSubspan(value.Span8(), backing_string.Span8())
-+                        : IsSubspan(value.Span16(), backing_string.Span16());
-+}
-+
-+bool TokenValueIsBacked(const CSSParserToken& token,
-+                        const Vector<String>& backing_strings) {
-+  DCHECK(token.HasStringBacking());
-+  for (const String& backing_string : backing_strings) {
-+    if (TokenValueIsBacked(token, backing_string)) {
-+      return true;
-+    }
-+  }
-+  return false;
-+}
-+
-+}  // namespace
-+
-+void CSSVariableData::VerifyStringBacking() const {
-+  for (const CSSParserToken& token : tokens_) {
-+    DCHECK(!token.HasStringBacking() ||
-+           TokenValueIsBacked(token, backing_strings_))
-+        << "Token value is not backed: " << token.Value().ToString();
-+  }
-+}
-+
-+#endif  // EXPENSIVE_DCHECKS_ARE_ON()
-+
- CSSVariableData::CSSVariableData(const CSSTokenizedValue& tokenized_value,
-                                  bool is_animation_tainted,
-                                  bool needs_variable_resolution,
-@@ -120,6 +166,9 @@ CSSVariableData::CSSVariableData(const CSSTokenizedValue& tokenized_value,
-       base_url_(base_url.IsValid() ? base_url.GetString() : String()),
-       charset_(charset) {
-   ConsumeAndUpdateTokens(tokenized_value.range);
-+#if EXPENSIVE_DCHECKS_ARE_ON()
-+  VerifyStringBacking();
-+#endif  // EXPENSIVE_DCHECKS_ARE_ON()
- }
- 
- const CSSValue* CSSVariableData::ParseForSyntax(
-diff --git a/third_party/blink/renderer/core/css/css_variable_data.h b/third_party/blink/renderer/core/css/css_variable_data.h
-index f042f85736c2c49f8337c29cb742976c5e97a14b..7be7d201313ec3e591e2c45c9fd5bda327856645 100644
---- a/third_party/blink/renderer/core/css/css_variable_data.h
-+++ b/third_party/blink/renderer/core/css/css_variable_data.h
-@@ -100,11 +100,18 @@ class CORE_EXPORT CSSVariableData : public RefCounted<CSSVariableData> {
-         has_font_units_(has_font_units),
-         has_root_font_units_(has_root_font_units),
-         base_url_(base_url),
--        charset_(charset) {}
-+        charset_(charset) {
-+#if EXPENSIVE_DCHECKS_ARE_ON()
-+    VerifyStringBacking();
-+#endif  // EXPENSIVE_DCHECKS_ARE_ON()
-+  }
-   CSSVariableData(const CSSVariableData&) = delete;
-   CSSVariableData& operator=(const CSSVariableData&) = delete;
- 
-   void ConsumeAndUpdateTokens(const CSSParserTokenRange&);
-+#if EXPENSIVE_DCHECKS_ARE_ON()
-+  void VerifyStringBacking() const;
-+#endif  // EXPENSIVE_DCHECKS_ARE_ON()
- 
-   // tokens_ may have raw pointers to string data, we store the String objects
-   // owning that data in backing_strings_ to keep it alive alongside the
-diff --git a/third_party/blink/renderer/core/css/parser/css_tokenizer.h b/third_party/blink/renderer/core/css/parser/css_tokenizer.h
-index 817bcbd4b6b9a9a5519bb92d6870c5b16a19278f..682a44a478bcd0ee3aa1638601650fd420033625 100644
---- a/third_party/blink/renderer/core/css/parser/css_tokenizer.h
-+++ b/third_party/blink/renderer/core/css/parser/css_tokenizer.h
-@@ -33,6 +33,7 @@ class CORE_EXPORT CSSTokenizer {
-   wtf_size_t Offset() const { return input_.Offset(); }
-   wtf_size_t PreviousOffset() const { return prev_offset_; }
-   StringView StringRangeAt(wtf_size_t start, wtf_size_t length) const;
-+  const Vector<String>& StringPool() const { return string_pool_; }
- 
-  private:
-   CSSParserToken TokenizeSingle();
-diff --git a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
-index ae863c8df923f55b116ed1c70557e5d5916794d3..dbc654e9079f4f79fe6883a6ea34e8fa00e1a26f 100644
---- a/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
-+++ b/third_party/blink/renderer/core/css/resolver/style_builder_converter.cc
-@@ -2170,6 +2170,10 @@ StyleBuilderConverter::ConvertRegisteredPropertyVariableData(
- 
-   Vector<String> backing_strings;
-   backing_strings.push_back(text);
-+  // CSSTokenizer may allocate new strings for some tokens (e.g. for escapes)
-+  // and produce tokens that point to those strings. We need to retain those
-+  // strings (if any) as well.
-+  backing_strings.AppendVector(tokenizer.StringPool());
- 
-   const bool has_font_units = false;
-   const bool has_root_font_units = false;
-diff --git a/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/registered-property-computation-expected.txt b/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/registered-property-computation-expected.txt
-index 3823a752b99f506d11c50aee36474c6c51c849cd..eeed0dfc0def17b1ba636f7f6a076caf770e1327 100644
---- a/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/registered-property-computation-expected.txt
-+++ b/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/registered-property-computation-expected.txt
-@@ -1,5 +1,5 @@
- This is a testharness.js-based test.
--Found 60 tests; 59 PASS, 1 FAIL, 0 TIMEOUT, 0 NOTRUN.
-+Found 61 tests; 60 PASS, 1 FAIL, 0 TIMEOUT, 0 NOTRUN.
- PASS <length> values computed are correctly via var()-reference
- PASS <length> values computed are correctly via var()-reference when font-size is inherited
- PASS <length> values are computed correctly when font-size is inherited [14em]
-@@ -60,5 +60,6 @@ PASS * values are computed correctly [50dpi]
- PASS <resolution> values are computed correctly [1dppx]
- PASS <resolution> values are computed correctly [96dpi]
- FAIL <resolution> values are computed correctly [calc(1dppx + 96dpi)] assert_equals: expected "2dppx" but got "0dppx"
-+PASS * values are computed correctly [url(why)]
- Harness: the test ran to completion.
- 
-diff --git a/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/registered-property-computation.html b/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/registered-property-computation.html
-index f03b257246e520bd93055203a5cb27188babc8ca..168495247a3b16a2203fb361f662b6db83044d09 100644
---- a/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/registered-property-computation.html
-+++ b/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/registered-property-computation.html
-@@ -167,4 +167,6 @@ test_computed_value('<resolution>', '1dppx', '1dppx');
- test_computed_value('<resolution>', '96dpi', '1dppx');
- test_computed_value('<resolution>', 'calc(1dppx + 96dpi)', '2dppx');
- 
-+test_computed_value('*', 'url(why)', 'url(why)');
-+
- </script>

patches/chromium/cherry-pick-2083e894852c.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Anton Bikineev <bikineev@chromium.org>
-Date: Sun, 10 Jul 2022 22:17:03 +0000
-Subject: Fix heap-overflow in blink::TableLayoutAlgorithmAuto::InsertSpanCell
-
-The CL fixes size confusion between Member<> and raw pointers.
-
-The bug was found (and the fix was proposed) by m.cooolie@gmail.com.
-
-Bug: 1341539
-Change-Id: I99d524fd65c2d6305693d09ad274c23178271269
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3751138
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: Anton Bikineev <bikineev@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1022529}
-
-diff --git a/third_party/blink/renderer/core/layout/table_layout_algorithm_auto.cc b/third_party/blink/renderer/core/layout/table_layout_algorithm_auto.cc
-index 1e1575cf47027584a9d06d7c5f6046fa15990b10..1a4a06a4761c52b8dd9ae9052b7c51b9236694a5 100644
---- a/third_party/blink/renderer/core/layout/table_layout_algorithm_auto.cc
-+++ b/third_party/blink/renderer/core/layout/table_layout_algorithm_auto.cc
-@@ -673,7 +673,7 @@ void TableLayoutAlgorithmAuto::InsertSpanCell(LayoutTableCell* cell) {
-          span > span_cells_[pos]->ColSpan())
-     pos++;
-   memmove(span_cells_.data() + pos + 1, span_cells_.data() + pos,
--          (size - pos - 1) * sizeof(LayoutTableCell*));
-+          (size - pos - 1) * sizeof(decltype(span_cells_)::value_type));
-   span_cells_[pos] = cell;
- }
-