refactor: constexpr lookup tables (#38771)

* refactor: use a constexpr lookup table in GetPathConstant()

* refactor: use a constexpr lookup table in SystemPreferences::GetColor()

* refactor: use a constexpr lookup table in SimpleURLLoaderWrapper::Create()

.circleci/config.yml

@@ -65,9 +65,6 @@ jobs:
             curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/main/install.sh | DESTDIR=$CIRCLECI_BINARY bash
             node build.js
           name: Pack config.yml
-      - run:
-          name: Set params
-          command: node .circleci/config/params.js
       - continuation/continue:
           configuration_path: .circleci/config-staging/built.yml
           parameters: /tmp/pipeline-parameters.json

.circleci/config/base.yml

@@ -35,16 +35,6 @@ parameters:
     default: all
     enum: ["all", "osx-x64", "osx-arm64", "mas-x64", "mas-arm64"]
 
-  medium-linux-executor:
-    type: enum
-    default: electronjs/aks-linux-medium
-    enum: ["electronjs/aks-linux-medium", "medium"]
-  
-  large-linux-executor:
-    type: enum
-    default: electronjs/aks-linux-large
-    enum: ["electronjs/aks-linux-large", "2xlarge"]
-
 # Executors
 executors:
   linux-docker:
@@ -52,9 +42,7 @@ executors:
       size:
         description: "Docker executor size"
         type: enum
-        # aks-linux-large === 32 core
-        # 2xlarge should not be used directly, use the pipeline param instead
-        enum: ["medium", "electronjs/aks-linux-medium", "xlarge", "electronjs/aks-linux-large", "2xlarge"]
+        enum: ["medium", "xlarge", "2xlarge"]
     docker:
       - image: ghcr.io/electron/build:e6bebd08a51a0d78ec23e5b3fd7e7c0846412328
     resource_class: << parameters.size >>
@@ -64,7 +52,7 @@ executors:
       size:
         description: "macOS executor size"
         type: enum
-        enum: ["macos.x86.medium.gen2"]
+        enum: ["macos.x86.medium.gen2", "macos.m1.large.gen1", "macos.m1.medium.gen1"]
       version:
         description: "xcode version"
         type: enum
@@ -131,9 +119,8 @@ env-arm: &env-arm
   TARGET_ARCH: arm
 
 env-apple-silicon: &env-apple-silicon
-  GN_EXTRA_ARGS: 'target_cpu = "arm64" use_prebuilt_v8_context_snapshot = true'
+  GN_EXTRA_ARGS: 'target_cpu = "arm64"'
   TARGET_ARCH: arm64
-  USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1
   npm_config_arch: arm64
 
 env-runner: &env-runner
@@ -150,10 +137,9 @@ env-mas: &env-mas
   MAS_BUILD: 'true'
 
 env-mas-apple-silicon: &env-mas-apple-silicon
-  GN_EXTRA_ARGS: 'target_cpu = "arm64" is_mas_build = true use_prebuilt_v8_context_snapshot = true'
+  GN_EXTRA_ARGS: 'target_cpu = "arm64" is_mas_build = true'
   MAS_BUILD: 'true'
   TARGET_ARCH: arm64
-  USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1
   npm_config_arch: arm64
 
 env-send-slack-notifications: &env-send-slack-notifications
@@ -189,9 +175,6 @@ env-mac-large-release: &env-mac-large-release
 env-ninja-status: &env-ninja-status
   NINJA_STATUS: "[%r processes, %f/%t @ %o/s : %es] "
 
-env-disable-run-as-node: &env-disable-run-as-node
-  GN_BUILDFLAG_ARGS: 'enable_run_as_node = false'
-
 env-32bit-release: &env-32bit-release
   # Set symbol level to 1 for 32 bit releases because of https://crbug.com/648948
   GN_BUILDFLAG_ARGS: 'symbol_level = 1'
@@ -264,19 +247,19 @@ step-depot-tools-get: &step-depot-tools-get
         cd depot_tools
         cat > gclient.diff \<< 'EOF'
       diff --git a/gclient.py b/gclient.py
-      index c305c248..e6e0fbdc 100755
+      index 3a9c5c6..f222043 100755
       --- a/gclient.py
       +++ b/gclient.py
-      @@ -735,7 +735,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
- 
-                   if dep_type == 'cipd':
-                       cipd_root = self.GetCipdRoot()
-      -                for package in dep_value.get('packages', []):
-      +                packages = dep_value.get('packages', [])
-      +                for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')):
-                           deps_to_add.append(
-                               CipdDependency(parent=self,
-                                              name=name,
+      @@ -712,7 +712,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
+
+             if dep_type == 'cipd':
+               cipd_root = self.GetCipdRoot()
+      -        for package in dep_value.get('packages', []):
+      +        packages = dep_value.get('packages', [])
+      +        for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')):
+                 deps_to_add.append(
+                     CipdDependency(
+                         parent=self,
       EOF
         git apply --3way gclient.diff
       fi
@@ -364,7 +347,7 @@ step-setup-goma-for-build: &step-setup-goma-for-build
         exit 1
       fi
       echo 'export GN_GOMA_FILE='`node -e "console.log(require('./src/utils/goma.js').gnFilePath)"` >> $BASH_ENV
-      echo 'export GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
+      echo 'export LOCAL_GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
       echo 'export GOMA_FALLBACK_ON_AUTH_FAILURE=true' >> $BASH_ENV
       cd ..
       touch "${TMPDIR:=/tmp}"/.goma-ready
@@ -410,18 +393,24 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
           fi
         }
 
-        strip_arm_deep() {
+        strip_universal_deep() {
           opwd=$(pwd)
           cd $1
           f=$(find . -perm +111 -type f)
           for fp in $f
           do
             if [[ $(file "$fp") == *"universal binary"* ]]; then
-              if [[ $(file "$fp") == *"arm64e)"* ]]; then
-                sudo lipo -remove arm64e "$fp" -o "$fp" || true
-              fi
-              if [[ $(file "$fp") == *"arm64)"* ]]; then
-                sudo lipo -remove arm64 "$fp" -o "$fp" || true
+              if [ "`arch`" == "arm64" ]; then
+                if [[ $(file "$fp") == *"x86_64"* ]]; then
+                  sudo lipo -remove x86_64 "$fp" -o "$fp" || true
+                fi
+              else
+                if [[ $(file "$fp") == *"arm64e)"* ]]; then
+                  sudo lipo -remove arm64e "$fp" -o "$fp" || true
+                fi
+                if [[ $(file "$fp") == *"arm64)"* ]]; then
+                  sudo lipo -remove arm64 "$fp" -o "$fp" || true
+                fi
               fi
             fi
           done
@@ -477,7 +466,7 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
         sudo rm -rf ~/project/src/third_party/angle/third_party/VK-GL-CTS
 
         # lipo off some huge binaries arm64 versions to save space
-        strip_arm_deep $(xcode-select -p)/../SharedFrameworks
+        strip_universal_deep $(xcode-select -p)/../SharedFrameworks
         # strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
       fi
     background: true
@@ -536,6 +525,20 @@ step-fix-sync: &step-fix-sync
         # Remove extra output from calling gclient getdep which always calls update_depot_tools
         sed -i '' "s/Updating depot_tools... //g" esbuild_ensure_file
         cipd ensure --root src/third_party/devtools-frontend/src/third_party/esbuild -ensure-file esbuild_ensure_file
+
+        # Fix gn (wrong binary)
+        echo 'gn/gn/mac-${arch}' `gclient getdep --deps-file=src/DEPS -r 'src/buildtools/mac:gn/gn/mac-${arch}'` > gn_ensure_file
+        # Remove extra output from calling gclient getdep which always calls update_depot_tools
+        sed -i '' "s/Updating depot_tools... //g" gn_ensure_file
+        cipd ensure --root src/buildtools/mac -ensure-file gn_ensure_file
+
+        # Fix dsymutil (wrong binary)
+        if  [ "$TARGET_ARCH" == "arm64" ]; then
+          export DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1
+        else
+          export DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.x64.sha1
+        fi
+        python3 src/third_party/depot_tools/download_from_google_storage.py --no_resume --no_auth --bucket chromium-browser-clang -s $DSYM_SHA_FILE -o src/tools/clang/dsymutil/bin/dsymutil
       fi
 
       # Make sure we are using the right ninja
@@ -616,7 +619,7 @@ step-electron-chromedriver-build: &step-electron-chromedriver-build
     name: Build chromedriver.zip
     command: |
       cd src
-      if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
+      if [ "`uname`" != "Darwin" ] && ([ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]); then
         gn gen out/chromedriver --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
         export CHROMEDRIVER_DIR="out/chromedriver"
       else
@@ -627,7 +630,7 @@ step-electron-chromedriver-build: &step-electron-chromedriver-build
         electron/script/strip-binaries.py --target-cpu="$TARGET_ARCH" --file $PWD/$CHROMEDRIVER_DIR/chromedriver
       fi
       ninja -C $CHROMEDRIVER_DIR electron:electron_chromedriver_zip
-      if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
+      if [ "`uname`" != "Darwin" ] && ([ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]); then
         cp out/chromedriver/chromedriver.zip out/Default
       fi
 
@@ -641,7 +644,6 @@ step-nodejs-headers-build: &step-nodejs-headers-build
 step-electron-publish: &step-electron-publish
   run:
     name: Publish Electron Dist
-    no_output_timeout: 30m
     command: |
       if [ "`uname`" == "Darwin" ]; then
         rm -rf src/out/Default/obj
@@ -705,7 +707,7 @@ step-verify-mksnapshot: &step-verify-mksnapshot
     command: |
       if [ "$IS_ASAN" != "1" ]; then
         cd src
-        if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
+        if [ "`uname`" != "Darwin" ] && ([ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]); then
           python3 electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --snapshot-files-dir $PWD/cross-arch-snapshots
         else
           python3 electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default
@@ -736,8 +738,8 @@ step-show-goma-stats: &step-show-goma-stats
     command: |
       set +e
       set +o pipefail
-      python3 $GOMA_DIR/goma_ctl.py stat
-      python3 $GOMA_DIR/diagnose_goma_log.py
+      $LOCAL_GOMA_DIR/goma_ctl.py stat
+      $LOCAL_GOMA_DIR/diagnose_goma_log.py
       true
     when: always
     background: true
@@ -748,17 +750,15 @@ step-mksnapshot-build: &step-mksnapshot-build
     no_output_timeout: 30m
     command: |
       cd src
-      if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" != "1" ]; then
-        ninja -C out/Default electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
-        gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
-        # Remove unused args from mksnapshot_args
-        SEDOPTION="-i"
-        if [ "`uname`" == "Darwin" ]; then
-          SEDOPTION="-i ''"
-        fi
-        sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args
-        sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args
+      ninja -C out/Default electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
+      gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
+      # Remove unused args from mksnapshot_args
+      SEDOPTION="-i"
+      if [ "`uname`" == "Darwin" ]; then
+        SEDOPTION="-i ''"
       fi
+      sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args
+      sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args
       if [ "`uname`" != "Darwin" ]; then
         if [ "$TARGET_ARCH" == "arm" ]; then
           electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/mksnapshot
@@ -771,7 +771,7 @@ step-mksnapshot-build: &step-mksnapshot-build
           electron/script/strip-binaries.py --file $PWD/out/Default/v8_context_snapshot_generator
         fi
       fi
-      if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" != "1" ] && [ "$SKIP_DIST_ZIP" != "1" ]; then
+      if [ "$SKIP_DIST_ZIP" != "1" ]; then
         ninja -C out/Default electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
         (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
       fi
@@ -889,26 +889,14 @@ step-touch-sync-done: &step-touch-sync-done
 step-maybe-restore-src-cache: &step-maybe-restore-src-cache
   restore_cache:
     keys:
-      - v17-src-cache-{{ checksum "src/electron/.depshash" }}
+      - v16-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:
-      - v17-src-cache-marker-{{ checksum "src/electron/.depshash" }}
+      - v16-src-cache-marker-{{ checksum "src/electron/.depshash" }}
     name: Restoring src cache marker
 
-step-maybe-restore-src-cache-aks: &step-maybe-restore-src-cache-aks
-  restore_cache_aks:
-    step-name: Restoring src cache
-    cache_key: v17-src-cache-$(shasum src/electron/.depshash | cut -f1 -d' ')
-    cache_path: /var/portal
-
-step-maybe-restore-src-cache-marker-aks: &step-maybe-restore-src-cache-marker-aks
-  restore_cache_aks:
-    step-name: Restoring src cache marker
-    cache_key: v17-src-cache-marker-$(shasum src/electron/.depshash | cut -f1 -d' ')
-    cache_path: "."
-
 # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
 # If the src cache was restored above then this will match an empty cache
 # If the src cache was not restored above then this will match a close git cache
@@ -921,12 +909,6 @@ 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-maybe-restore-git-cache-aks: &step-maybe-restore-git-cache-aks
-  restore_cache_aks:
-    step-name: Conditionally restoring git cache (aks)
-    cache_key: v1-git-cache-$(shasum src/electron/.circle-sync-done | cut -f1 -d' ')-$(shasum src/electron/DEPS | cut -f1 -d' ') v1-git-cache-$(shasum src/electron/.circle-sync-done | cut -f1 -d' ')
-    cache_path: git-cache
-
 step-set-git-cache-path: &step-set-git-cache-path
   run:
     name: Set GIT_CACHE_PATH to make gclient to use the cache
@@ -944,12 +926,6 @@ 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-git-cache-aks: &step-save-git-cache-aks
-  save_cache_aks:
-    step-name: Persisting git cache (AKS)
-    cache_key: v1-git-cache-$(shasum src/electron/.circle-sync-done | cut -f1 -d' ')-$(shasum src/electron/DEPS | cut -f1 -d' ')
-    cache_path: git-cache
-
 step-run-electron-only-hooks: &step-run-electron-only-hooks
   run:
     name: Run Electron Only Hooks
@@ -987,7 +963,7 @@ step-save-src-cache: &step-save-src-cache
   save_cache:
     paths:
       - /var/portal
-    key: v17-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
+    key: v16-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
     name: Persisting src cache
 step-make-src-cache-marker: &step-make-src-cache-marker
   run:
@@ -997,17 +973,7 @@ step-save-src-cache-marker: &step-save-src-cache-marker
   save_cache:
     paths:
       - .src-cache-marker
-    key: v17-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
-step-save-src-cache-aks: &step-save-src-cache-aks
-  save_cache_aks:
-    step-name: Persisting src cache (aks)
-    cache_key: v17-src-cache-$(shasum /var/portal/src/electron/.depshash | cut -f1 -d' ')
-    cache_path: /var/portal
-step-save-src-cache-marker-aks: &step-save-src-cache-marker-aks
-  save_cache_aks:
-    step-name: Persisting src cache marker (aks)
-    cache_key: v17-src-cache-marker-$(shasum /var/portal/src/electron/.depshash | cut -f1 -d' ')
-    cache_path: .src-cache-marker
+    key: v16-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
 
 step-maybe-early-exit-no-doc-change: &step-maybe-early-exit-no-doc-change
   run:
@@ -1033,6 +999,15 @@ step-ts-compile: &step-ts-compile
       done
 
 # List of all steps.
+steps-electron-gn-check: &steps-electron-gn-check
+  steps:
+    - *step-setup-goma-for-build
+    - checkout-from-cache
+    - *step-setup-env-for-build
+    - *step-wait-for-goma
+    - *step-gn-gen-default
+    - *step-gn-check
+
 steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-change
   steps:
     # Checkout - Copied from steps-checkout
@@ -1044,92 +1019,11 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
 
 # Command Aliases
 commands:
-  aks-specific-step:
-    parameters:
-      circle:
-        type: steps
-      aks:
-        type: steps
-      could-be-aks:
-        type: boolean
-        description: Only set this to true on linux hosts
-    steps:
-      - when:
-          condition:
-            or:
-              - equal: [<< parameters.could-be-aks >>, false]
-              - equal: [<< pipeline.parameters.large-linux-executor >>, 2xlarge]
-          steps: << parameters.circle >>
-      - when:
-          condition:
-            and:
-              - equal: [<< parameters.could-be-aks >>, true]
-              - equal: [<< pipeline.parameters.large-linux-executor >>, electronjs/aks-linux-large]
-          steps: << parameters.aks >>
-  save_cache_aks:
-    parameters:
-      step-name:
-        type: string
-      cache_key:
-        type: string
-      cache_path:
-        type: string
-    steps:
-      - run:
-          name: << parameters.step-name >>
-          command: |
-            cache_key="<< parameters.cache_key >>"
-            final_cache_path=/mnt/cross-instance-cache/${cache_key}.tar
-            echo "Using cache key: $cache_key"
-            echo "Checking path: $final_cache_path"
-            if [ ! -f "$final_cache_path" ]; then
-              echo "Cache key not founding, storing tarball"
-              tmp_container=/mnt/cross-instance-cache/tmp/$CIRCLE_WORKFLOW_JOB_ID
-              tmp_cache_path=$tmp_container/${cache_key}.tar
-              mkdir -p $tmp_container
-              if [ -f "<< parameters.cache_path >>" ]; then
-                tar -cf $tmp_cache_path -C $(dirname << parameters.cache_path >>) ./$(basename << parameters.cache_path >>)
-              else
-                tar -cf $tmp_cache_path -C << parameters.cache_path >>/ ./
-              fi
-              mv -vn $tmp_cache_path $final_cache_path
-              rm -rf $tmp_container
-            else
-              echo "Cache key already exists, skipping.."
-            fi
-  restore_cache_aks:
-    parameters:
-      step-name:
-        type: string
-      cache_key:
-        type: string
-      cache_path:
-        type: string
-    steps:
-      - run:
-          name: << parameters.step-name >>
-          command: |
-            df -h
-            for cache_key in << parameters.cache_key >>; do
-              cache_path=/mnt/cross-instance-cache/${cache_key}.tar
-              echo "Using cache key: $cache_key"
-              echo "Checking path: $cache_path"
-              if [ ! -f "$cache_path" ]; then
-                echo "Cache key not found, nothing to restore..."
-              else
-                echo "Cache key found, restoring to path..."
-                mkdir -p << parameters.cache_path >>/
-                tar -xf /mnt/cross-instance-cache/${cache_key}.tar -C << parameters.cache_path >>/
-                exit 0
-              fi
-            done
   maybe-restore-portaled-src-cache:
     parameters:
       halt-if-successful:
         type: boolean
         default: false
-      could-be-aks:
-        type: boolean
     steps:
       - run:
           name: Prepare for cross-OS sync restore
@@ -1139,50 +1033,29 @@ commands:
       - when:
           condition: << parameters.halt-if-successful >>
           steps:
-            - aks-specific-step:
-                circle:
-                  - *step-maybe-restore-src-cache-marker
-                aks:
-                  - *step-maybe-restore-src-cache-marker-aks
-                could-be-aks: << parameters.could-be-aks >>
+            - *step-maybe-restore-src-cache-marker
             - run:
                 name: Halt the job early if the src cache exists
                 command: |
                   if [ -f ".src-cache-marker" ]; then
                     circleci-agent step halt
                   fi
-      - aks-specific-step:
-          circle:
-            - *step-maybe-restore-src-cache
-          aks:
-            - *step-maybe-restore-src-cache-aks
-          could-be-aks: << parameters.could-be-aks >>
+      - *step-maybe-restore-src-cache
       - run:
-          name: Fix the src cache restore point
+          name: Fix the src cache restore point on macOS
           command: |
             if [ -d "/var/portal/src" ]; then
               echo Relocating Cache
               rm -rf src
               mv /var/portal/src ./
             fi
-  run-gn-check:
-    parameters:
-      could-be-aks:
-        type: boolean
-    steps:
-      - *step-setup-goma-for-build
-      - checkout-from-cache:
-          could-be-aks: << parameters.could-be-aks >>
-      - *step-setup-env-for-build
-      - *step-wait-for-goma
-      - *step-gn-gen-default
-      - *step-gn-check
+
   build_and_save_artifacts:
     parameters:
       artifact-key:
         type: string
       build-type:
-        type: string      
+        type: string
       build-nonproprietary-ffmpeg:
         type: boolean
         default: true
@@ -1290,16 +1163,12 @@ commands:
             mv_if_exist cross-arch-snapshots src
 
   checkout-from-cache:
-    parameters:
-      could-be-aks:
-        type: boolean
     steps:
       - *step-checkout-electron
       - *step-depot-tools-get
       - *step-depot-tools-add-to-path
       - *step-generate-deps-hash
-      - maybe-restore-portaled-src-cache:
-          could-be-aks: << parameters.could-be-aks >>
+      - maybe-restore-portaled-src-cache
       - run:
           name: Ensure src checkout worked
           command: |
@@ -1365,32 +1234,6 @@ commands:
           no_output_timeout: 60m
           command: |
             cd src
-
-            # Lets generate a snapshot and mksnapshot and then delete all the x-compiled generated files to save space
-            if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" == "1" ]; then
-              ninja -C out/Default electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
-              ninja -C out/Default tools/v8_context_snapshot -j $NUMBER_OF_NINJA_PROCESSES
-              gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
-              # Remove unused args from mksnapshot_args
-              SEDOPTION="-i"
-              if [ "`uname`" == "Darwin" ]; then
-                SEDOPTION="-i ''"
-              fi
-              sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args
-              sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args
-              (cd out/Default; zip mksnapshot.zip mksnapshot_args clang_x64_v8_arm64/gen/v8/embedded.S)
-              if [ "<< parameters.clean-prebuilt-snapshot >>" == "true" ]; then
-                rm -rf out/Default/clang_x64_v8_arm64/gen
-                rm -rf out/Default/clang_x64_v8_arm64/obj
-                rm -rf out/Default/clang_x64_v8_arm64/thinlto-cache
-                rm -rf out/Default/clang_x64/obj
-                # Regenerate because we just deleted some ninja files
-                gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
-              fi
-              # For x-compiles this will be built to the wrong arch after the context snapshot build
-              # so we wipe it before re-linking it below
-              rm -rf out/Default/libffmpeg.dylib
-            fi
             NINJA_SUMMARIZE_BUILD=1 autoninja -C out/Default electron -j $NUMBER_OF_NINJA_PROCESSES
             cp out/Default/.ninja_log out/electron_ninja_log
             node electron/script/check-symlinks.js
@@ -1430,15 +1273,13 @@ commands:
       artifact-key:
         type: string
       build-type:
-        type: string        
+        type: string
       after-build-and-save:
         type: steps
         default: []
       after-persist:
         type: steps
         default: []
-      could-be-aks:
-        type: boolean
     steps:
       - when:
           condition: << parameters.attach >>
@@ -1456,8 +1297,7 @@ commands:
       - when:
           condition: << parameters.checkout-and-assume-cache >>
           steps:
-            - checkout-from-cache:
-                could-be-aks: << parameters.could-be-aks >>
+            - checkout-from-cache
       - when:
           condition: << parameters.checkout >>
           steps:
@@ -1473,15 +1313,8 @@ commands:
                 steps:
                   - maybe-restore-portaled-src-cache:
                       halt-if-successful: << parameters.checkout-to-create-src-cache >>
-                      could-be-aks: << parameters.could-be-aks >>
-            - aks-specific-step:
-                circle:
-                  - *step-maybe-restore-git-cache
-                aks:
-                  - *step-maybe-restore-git-cache-aks
-                could-be-aks: << parameters.could-be-aks >>
+            - *step-maybe-restore-git-cache
             - *step-set-git-cache-path
-            - *step-fix-known-hosts-linux
             # This sync call only runs if .circle-sync-done is an EMPTY file
             - *step-gclient-sync
             - store_artifacts:
@@ -1497,12 +1330,7 @@ commands:
             - when:
                 condition: << parameters.save-git-cache >>
                 steps:
-                  - aks-specific-step:
-                      circle:
-                        - *step-save-git-cache
-                      aks:
-                        - *step-save-git-cache-aks
-                      could-be-aks: << parameters.could-be-aks >>
+                  - *step-save-git-cache
             # Mark sync as done _after_ saving the git cache so that it is uploaded
             # only when the src cache was not present
             # Their are theoretically two cases for this cache key
@@ -1552,19 +1380,9 @@ commands:
                         sudo mkdir -p /var/portal
                         sudo chown -R $(id -u):$(id -g) /var/portal
                         mv ./src /var/portal
-                  - aks-specific-step:
-                      circle:
-                        - *step-save-src-cache
-                      aks:
-                        - *step-save-src-cache-aks
-                      could-be-aks: << parameters.could-be-aks >>
+                  - *step-save-src-cache
                   - *step-make-src-cache-marker
-                  - aks-specific-step:
-                      circle:
-                        - *step-save-src-cache-marker
-                      aks:
-                        - *step-save-src-cache-marker-aks
-                      could-be-aks: << parameters.could-be-aks >>
+                  - *step-save-src-cache-marker
 
       - when:
           condition: << parameters.build >>
@@ -1616,18 +1434,6 @@ commands:
           condition: << parameters.build >>
           steps:
             - *step-maybe-notify-slack-failure
-      - when:
-          condition: << parameters.could-be-aks >>
-          steps:
-            - run:
-                name: Wait for active debug sessions
-                command: |
-                  while [ -f /var/.ssh-lock ]
-                  do
-                    sleep 60
-                  done
-                no_output_timeout: 2h
-                when: always
 
   electron-tests:
     parameters:
@@ -1756,7 +1562,6 @@ commands:
             - *step-minimize-workspace-size-from-checkout
       - *step-fix-sync
       - *step-setup-env-for-build
-      - *step-fix-known-hosts-linux
       - *step-setup-goma-for-build
       - *step-wait-for-goma
       - *step-gn-gen-default
@@ -1814,7 +1619,7 @@ jobs:
   linux-make-src-cache:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: xlarge
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@@ -1827,7 +1632,6 @@ jobs:
           checkout-to-create-src-cache: true
           artifact-key: 'nil'
           build-type: 'nil'
-          could-be-aks: true
 
   mac-checkout:
     executor:
@@ -1847,9 +1651,8 @@ jobs:
           restore-src-cache: false
           artifact-key: 'nil'
           build-type: 'nil'
-          could-be-aks: false
 
-  mac-make-src-cache:
+  mac-make-src-cache-x64:
     executor:
       name: linux-docker
       size: xlarge
@@ -1867,13 +1670,31 @@ jobs:
           checkout-to-create-src-cache: true
           artifact-key: 'nil'
           build-type: 'nil'
-          could-be-aks: false
+
+  mac-make-src-cache-arm64:
+    executor:
+      name: linux-docker
+      size: xlarge
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-testing-build
+      <<: *env-macos-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac --custom-var=host_cpu=arm64'
+    steps:
+      - electron-build:
+          persist: false
+          build: false
+          checkout: true
+          save-git-cache: true
+          checkout-to-create-src-cache: true
+          artifact-key: 'nil'
+          build-type: 'nil'
 
   # Layer 2: Builds.
   linux-x64-testing:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: xlarge
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1886,12 +1707,11 @@ jobs:
           checkout-and-assume-cache: true
           artifact-key: 'linux-x64'
           build-type: 'Linux'
-          could-be-aks: true
 
   linux-x64-testing-asan:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1902,47 +1722,25 @@ jobs:
     steps:
       - electron-build:
           persist: true
-          checkout: false
-          checkout-and-assume-cache: true
+          checkout: true
           build-nonproprietary-ffmpeg: false
           artifact-key: 'linux-x64-asan'
           build-type: 'Linux'
-          could-be-aks: true
-
-  linux-x64-testing-no-run-as-node:
-    executor:
-      name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
-    environment:
-      <<: *env-linux-2xlarge
-      <<: *env-testing-build
-      <<: *env-ninja-status
-      <<: *env-disable-run-as-node
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: false
-          checkout: true
-          artifact-key: 'linux-x64-no-run-as-node'
-          build-type: 'Linux'
-          could-be-aks: true
 
   linux-x64-testing-gn-check:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.medium-linux-executor >>
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-testing-build
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - run-gn-check:
-          could-be-aks: true
+    <<: *steps-electron-gn-check
 
   linux-x64-publish:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
@@ -1965,7 +1763,7 @@ jobs:
   linux-arm-testing:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-global
       <<: *env-arm
@@ -1981,12 +1779,11 @@ jobs:
           checkout-and-assume-cache: true
           artifact-key: 'linux-arm'
           build-type: 'Linux ARM'
-          could-be-aks: true
 
   linux-arm-publish:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm
@@ -2011,7 +1808,7 @@ jobs:
   linux-arm64-testing:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-global
       <<: *env-arm64
@@ -2027,25 +1824,22 @@ jobs:
           checkout-and-assume-cache: true
           artifact-key: 'linux-arm64'
           build-type: 'Linux ARM64'
-          could-be-aks: true
 
   linux-arm64-testing-gn-check:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.medium-linux-executor >>
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-arm64
       <<: *env-testing-build
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - run-gn-check:
-          could-be-aks: true
+    <<: *steps-electron-gn-check
 
   linux-arm64-publish:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm64
@@ -2100,7 +1894,6 @@ jobs:
                 root: .
                 paths:
                   - generated_artifacts_mas-x64
-          could-be-aks: false
 
   osx-testing-x64-gn-check:
     executor:
@@ -2110,9 +1903,7 @@ jobs:
       <<: *env-machine-mac
       <<: *env-testing-build
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-    steps:
-      - run-gn-check:
-          could-be-aks: false
+    <<: *steps-electron-gn-check
 
   osx-publish-x64:
     executor:
@@ -2139,7 +1930,7 @@ jobs:
   osx-publish-arm64:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      size: macos.m1.large.gen1
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -2162,7 +1953,7 @@ jobs:
   osx-testing-arm64:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      size: macos.m1.medium.gen1
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -2170,7 +1961,6 @@ jobs:
       <<: *env-macos-build
       <<: *env-apple-silicon
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-      GENERATE_CROSS_ARCH_SNAPSHOT: true
     steps:
       - electron-build:
           persist: true
@@ -2195,7 +1985,6 @@ jobs:
                 root: .
                 paths:
                   - generated_artifacts_mas-arm64
-          could-be-aks: false
 
   mas-publish-x64:
     executor:
@@ -2222,7 +2011,7 @@ jobs:
   mas-publish-arm64:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      size: macos.m1.large.gen1
     environment:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
@@ -2421,9 +2210,6 @@ workflows:
       - linux-x64-testing-asan:
           requires:
             - linux-make-src-cache
-      - linux-x64-testing-no-run-as-node:
-          requires:
-            - linux-make-src-cache
       - linux-x64-testing-gn-check:
           requires:
             - linux-make-src-cache
@@ -2470,19 +2256,20 @@ workflows:
         - equal: [false, << pipeline.parameters.run-linux-publish >>]
         - equal: [true, << pipeline.parameters.run-build-mac >>]
     jobs:
-      - mac-make-src-cache
+      - mac-make-src-cache-x64
+      - mac-make-src-cache-arm64
       - osx-testing-x64:
           requires:
-            - mac-make-src-cache
+            - mac-make-src-cache-x64
       - osx-testing-x64-gn-check:
           requires:
-            - mac-make-src-cache
+            - mac-make-src-cache-x64
       - darwin-testing-x64-tests:
           requires:
             - osx-testing-x64
       - osx-testing-arm64:
           requires:
-            - mac-make-src-cache
+            - mac-make-src-cache-arm64
       - darwin-testing-arm64-tests:
           filters:
             branches:

.circleci/config/params.js

@@ -1,12 +0,0 @@
-const fs = require('fs');
-
-const PARAMS_PATH = '/tmp/pipeline-parameters.json';
-
-const content = JSON.parse(fs.readFileSync(PARAMS_PATH, 'utf-8'));
-
-// Choose resource class for linux hosts
-const currentBranch = process.env.CIRCLE_BRANCH || '';
-content['large-linux-executor'] = /^pull\/[0-9-]+$/.test(currentBranch) ? '2xlarge' : 'electronjs/aks-linux-large';
-content['medium-linux-executor'] = /^pull\/[0-9-]+$/.test(currentBranch) ? 'medium' : 'electronjs/aks-linux-medium';
-
-fs.writeFileSync(PARAMS_PATH, JSON.stringify(content));

.circleci/fix-known-hosts.sh

@@ -3,6 +3,5 @@
 set -e
 
 mkdir -p ~/.ssh
-echo "github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
-github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
-github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=" >> ~/.ssh/known_hosts
+echo "|1|B3r+7aO0/x90IdefihIjxIoJrrk=|OJddGDfhbuLFc1bUyy84hhIw57M= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+|1|rGlEvW55DtzNZp+pzw9gvyOyKi4=|LLWr+7qlkAlw3YGGVfLHHxB/kR0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> ~/.ssh/known_hosts

.devcontainer/devcontainer.json

@@ -4,6 +4,37 @@
 	"onCreateCommand": ".devcontainer/on-create-command.sh",
 	"updateContentCommand": ".devcontainer/update-content-command.sh",
 	"workspaceFolder": "/workspaces/gclient/src/electron",
+	"extensions": [
+		"joeleinbinder.mojom-language",
+		"rafaelmaiolla.diff",
+		"surajbarkale.ninja",
+		"ms-vscode.cpptools",
+		"mutantdino.resourcemonitor",
+		"dbaeumer.vscode-eslint",
+		"shakram02.bash-beautify",
+		"marshallofsound.gnls-electron",
+		"CircleCI.circleci"
+	],
+	"settings": {
+		"editor.tabSize": 2,
+		"bashBeautify.tabSize": 2,
+		"typescript.tsdk": "node_modules/typescript/lib",
+		"[gn]": {
+			"editor.formatOnSave": true
+		},
+		"[javascript]": {
+			"editor.codeActionsOnSave": {
+				"source.fixAll.eslint": true
+			}
+		},
+		"[typescript]": {
+			"editor.codeActionsOnSave": {
+				"source.fixAll.eslint": true
+			}
+		},
+		"javascript.preferences.quoteStyle": "single",
+		"typescript.preferences.quoteStyle": "single"
+	},
 	"forwardPorts": [8088, 6080, 5901],
 	"portsAttributes": {
 		"8088": {
@@ -29,38 +60,6 @@
 			"openFiles": [
 				".devcontainer/README.md"
 			]
-		},
-		"vscode": {
-			"extensions": ["joeleinbinder.mojom-language",
-				"rafaelmaiolla.diff",
-				"surajbarkale.ninja",
-				"ms-vscode.cpptools",
-				"mutantdino.resourcemonitor",
-				"dbaeumer.vscode-eslint",
-				"shakram02.bash-beautify",
-				"marshallofsound.gnls-electron",
-				"CircleCI.circleci"
-			],
-			"settings": {
-				"editor.tabSize": 2,
-				"bashBeautify.tabSize": 2,
-				"typescript.tsdk": "node_modules/typescript/lib",
-				"[gn]": {
-					"editor.formatOnSave": true
-				},
-				"[javascript]": {
-					"editor.codeActionsOnSave": {
-						"source.fixAll.eslint": true
-					}
-				},
-				"[typescript]": {
-					"editor.codeActionsOnSave": {
-						"source.fixAll.eslint": true
-					}
-				},
-				"javascript.preferences.quoteStyle": "single",
-				"typescript.preferences.quoteStyle": "single"
-			}
 		}
 	}
 }

.devcontainer/on-create-command.sh

@@ -16,8 +16,6 @@ ln -s $buildtools_configs $buildtools/configs
 
 # Write the gclient config if it does not already exist
 if [ ! -f $gclient_root/.gclient ]; then
-  echo "Creating gclient config"
-
   echo "solutions = [
       { \"name\"        : \"src/electron\",
           \"url\"         : \"https://github.com/electron/electron\",
@@ -34,8 +32,6 @@ fi
 # Write the default buildtools config file if it does
 # not already exist
 if [ ! -f $buildtools/configs/evm.testing.json ]; then
-  echo "Creating build-tools testing config"
-
   write_config() {
     echo "
         {
@@ -57,7 +53,7 @@ if [ ! -f $buildtools/configs/evm.testing.json ]; then
                 \"CHROMIUM_BUILDTOOLS_PATH\": \"/workspaces/gclient/src/buildtools\",
                 \"GIT_CACHE_PATH\": \"/workspaces/gclient/.git-cache\"
             },
-            \"\$schema\": \"file:///home/builduser/.electron_build_tools/evm-config.schema.json\"
+            \"$schema\": \"file:///home/builduser/.electron_build_tools/evm-config.schema.json\"
         }
     " >$buildtools/configs/evm.testing.json
   }
@@ -71,12 +67,10 @@ if [ ! -f $buildtools/configs/evm.testing.json ]; then
   # if it works we can use the goma cluster
   export NOTGOMA_CODESPACES_TOKEN=$GITHUB_TOKEN
   if e d goma_auth login; then
-    echo "$GITHUB_USER has GOMA access - switching to cluster mode"
     write_config cluster
   fi
 else
-  echo "build-tools testing config already exists"
-
-  # Re-auth with the goma cluster regardless.
+  # Even if the config file existed we still need to re-auth with the goma
+  # cluster
   NOTGOMA_CODESPACES_TOKEN=$GITHUB_TOKEN e d goma_auth login || true
 fi

.github/workflows/branch-created.yml

@@ -28,8 +28,8 @@ jobs:
 
             # Create new labels
             gh label create $MAJOR-x-y --color 8d9ee8 || true
-            gh label create target/$MAJOR-x-y --color ad244f || true
-            gh label create merged/$MAJOR-x-y --color 61a3c6 || true
+            gh label create target/$MAJOR-x-y --color ad244f --description "PR should also be added to the \"${MAJOR}-x-y\" branch." || true
+            gh label create merged/$MAJOR-x-y --color 61a3c6 --description "PR was merged to the \"${MAJOR}-x-y\" branch." || true
             gh label create in-flight/$MAJOR-x-y --color db69a6 || true
             gh label create needs-manual-bp/$MAJOR-x-y --color 8b5dba || true
 

.github/workflows/release_dependency_versions.yml

@@ -1,33 +0,0 @@
-name: Trigger Major Release Dependency Updates
-
-on:
-  release:
-    types: [published]
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  trigger_chromedriver:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag: v3
-    - name: Trigger New chromedriver Release
-      run: |
-        if [[ ${{ github.event.release.tag_name }} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-          gh api /repos/:owner/chromedriver/actions/workflows/release.yml/dispatches --input - <<< '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}"}}'
-        else
-          echo "Not releasing for version ${{ github.event.release.tag_name }}"
-        fi
-
-  trigger_mksnapshot:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag: v3
-      - name: Trigger New mksnapshot Release
-        run: |
-          if [[ ${{ github.event.release.tag_name }} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            gh api /repos/:owner/mksnapshot/actions/workflows/release.yml/dispatches --input - <<< '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}"}}'
-          else
-            echo "Not releasing for version ${{ github.event.release.tag_name }}"
-          fi

.github/workflows/update_appveyor_image.yml

@@ -68,7 +68,7 @@ jobs:
         delete-branch: true
         reviewers: electron/wg-releases
         title: 'build: update appveyor image to latest version'
-        labels: semver-none,no-backport
+        labels: semver/none,no-backport
         body: |
           This PR updates appveyor.yml to the latest baked image, ${{ env.APPVEYOR_IMAGE_VERSION }}.
-          Notes: none
+          Notes: none

BUILD.gn

@@ -99,10 +99,6 @@ if (is_linux) {
   }
 }
 
-declare_args() {
-  use_prebuilt_v8_context_snapshot = false
-}
-
 branding = read_file("shell/app/BRANDING.json", "json")
 electron_project_name = branding.project_name
 electron_product_name = branding.product_name
@@ -461,6 +457,7 @@ source_set("electron_lib") {
     "//services/proxy_resolver:lib",
     "//services/video_capture/public/mojom:constants",
     "//services/viz/privileged/mojom/compositing",
+    "//services/viz/public/mojom",
     "//skia",
     "//third_party/blink/public:blink",
     "//third_party/blink/public:blink_devtools_inspector_resources",
@@ -474,6 +471,7 @@ source_set("electron_lib") {
     "//third_party/widevine/cdm:headers",
     "//third_party/zlib/google:zip",
     "//ui/base/idle",
+    "//ui/compositor",
     "//ui/events:dom_keycode_converter",
     "//ui/gl",
     "//ui/native_theme",
@@ -673,39 +671,6 @@ source_set("electron_lib") {
     ]
   }
 
-  if (enable_run_as_node) {
-    sources += [
-      "shell/app/node_main.cc",
-      "shell/app/node_main.h",
-    ]
-  }
-
-  if (enable_osr) {
-    sources += [
-      "shell/browser/osr/osr_host_display_client.cc",
-      "shell/browser/osr/osr_host_display_client.h",
-      "shell/browser/osr/osr_render_widget_host_view.cc",
-      "shell/browser/osr/osr_render_widget_host_view.h",
-      "shell/browser/osr/osr_video_consumer.cc",
-      "shell/browser/osr/osr_video_consumer.h",
-      "shell/browser/osr/osr_view_proxy.cc",
-      "shell/browser/osr/osr_view_proxy.h",
-      "shell/browser/osr/osr_web_contents_view.cc",
-      "shell/browser/osr/osr_web_contents_view.h",
-    ]
-    if (is_mac) {
-      sources += [
-        "shell/browser/osr/osr_host_display_client_mac.mm",
-        "shell/browser/osr/osr_web_contents_view_mac.mm",
-      ]
-    }
-    deps += [
-      "//components/viz/service",
-      "//services/viz/public/mojom",
-      "//ui/compositor",
-    ]
-  }
-
   if (enable_views_api) {
     sources += [
       "shell/browser/api/views/electron_api_image_view.cc",
@@ -791,7 +756,6 @@ if (is_mac) {
 
     deps = [
       "//base",
-      "//content/public/browser",
       "//skia",
       "//third_party/electron_node:node_lib",
       "//v8",
@@ -820,15 +784,6 @@ if (is_mac) {
     sources = [ "shell/common/resources/mac/MainMenu.xib" ]
   }
 
-  action("fake_v8_context_snapshot_generator") {
-    script = "build/fake_v8_context_snapshot_generator.py"
-    args = [
-      rebase_path("$root_out_dir/$v8_context_snapshot_filename"),
-      rebase_path("$root_out_dir/fake/$v8_context_snapshot_filename"),
-    ]
-    outputs = [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
-  }
-
   bundle_data("electron_framework_resources") {
     public_deps = [ ":packed_resources" ]
     sources = []
@@ -839,13 +794,8 @@ if (is_mac) {
     if (v8_use_external_startup_data) {
       public_deps += [ "//v8" ]
       if (use_v8_context_snapshot) {
-        if (use_prebuilt_v8_context_snapshot) {
-          sources += [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
-          public_deps += [ ":fake_v8_context_snapshot_generator" ]
-        } else {
-          sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
-          public_deps += [ "//tools/v8_context_snapshot" ]
-        }
+        sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
+        public_deps += [ "//tools/v8_context_snapshot" ]
       } else {
         sources += [ "$root_out_dir/snapshot_blob.bin" ]
       }
@@ -945,11 +895,7 @@ if (is_mac) {
 
     include_dirs = [ "." ]
     sources = filenames.framework_sources
-    frameworks = []
-
-    if (enable_osr) {
-      frameworks += [ "IOSurface.framework" ]
-    }
+    frameworks = [ "IOSurface.framework" ]
 
     ldflags = [
       "-Wl,-install_name,@rpath/$output_name.framework/$output_name",

CONTRIBUTING.md

@@ -60,10 +60,6 @@ dependencies, and tools contained in the `electron/electron` repository.
   * [Step 11: Landing](https://electronjs.org/docs/development/pull-requests#step-11-landing)
   * [Continuous Integration Testing](https://electronjs.org/docs/development/pull-requests#continuous-integration-testing)
 
-### Dependencies Upgrades Policy
-
-Dependencies in Electron's `package.json` or `yarn.lock` files should only be altered by maintainers. For security reasons, we will not accept PRs that alter our `package.json` or `yarn.lock` files. We invite contributors to make requests updating these files in our issue tracker. If the change is significantly complicated, draft PRs are welcome, with the understanding that these PRs will be closed in favor of a duplicate PR submitted by an Electron maintainer.
-
 ## Style Guides
 
 See [Coding Style](https://electronjs.org/docs/development/coding-style) for information about which standards Electron adheres to in different parts of its codebase.

DEPS

@@ -2,9 +2,9 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '116.0.5845.228',
+    '116.0.5831.0',
   'node_version':
-    'v18.16.1',
+    'v18.16.0',
   'nan_version':
     '16fa32231e2ccd89d2804b3f765319128b20c4ac',
   'squirrel.mac_version':

README.md

@@ -78,7 +78,7 @@ binary. Use this to spawn Electron from Node scripts:
 
 ```javascript
 const electron = require('electron')
-const proc = require('node:child_process')
+const proc = require('child_process')
 
 // will print something similar to /Users/maf/.../Electron
 console.log(electron)

appveyor-woa.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-116.0.5791.0
+image: e-116.0.5829.0
 environment:
   GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -49,11 +49,6 @@ environment:
       APPVEYOR_BUILD_WORKER_IMAGE: base-woa
       APPVEYOR_BUILD_WORKER_CLOUD: electronhq-woa
 
-clone_script:
-- ps: git clone -q $("--branch=" + $Env:APPVEYOR_REPO_BRANCH) $("https://github.com/" + $Env:APPVEYOR_REPO_NAME + ".git") $Env:APPVEYOR_BUILD_FOLDER
-- ps: if (!$Env:APPVEYOR_PULL_REQUEST_NUMBER) {$("git checkout -qf " + $Env:APPVEYOR_REPO_COMMIT)}
-- ps: if ($Env:APPVEYOR_PULL_REQUEST_NUMBER) {git fetch -q origin +refs/pull/$($Env:APPVEYOR_PULL_REQUEST_NUMBER)/head; git checkout -qf FETCH_HEAD}
-
 clone_folder: C:\projects\src\electron
 
 skip_branch_with_pr: true
@@ -72,10 +67,8 @@ for:
       - ps: |
           node script/yarn.js install --frozen-lockfile
           node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER
-          $env:SHOULD_SKIP_ARTIFACT_VALIDATION = "false"
           if ($LASTEXITCODE -eq 0) {
-            Write-warning "Skipping build for doc-only change"
-            $env:SHOULD_SKIP_ARTIFACT_VALIDATION = "true"
+            Write-warning "Skipping build for doc only change"
             Exit-AppveyorBuild
           } else {
             $global:LASTEXITCODE = 0
@@ -92,8 +85,6 @@ for:
             Remove-Item -Recurse -Force $pwd\build-tools
           }
       - git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-      - ps: New-Item -Name depot_tools\.disable_auto_update -ItemType File
-      - depot_tools\bootstrap\win_tools.bat
       - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
       - ps: >-
           if (Test-Path -Path "$pwd\src\electron") {
@@ -116,7 +107,7 @@ for:
       - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
       - ps: >-
           if (Test-Path 'env:RAW_GOMA_AUTH') {
-            $goma_login = python3 $env:LOCAL_GOMA_DIR\goma_auth.py info
+            $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
             if ($goma_login -eq 'Login as Fermi Planck') {
               Write-warning "Goma authentication is correct";
             } else {
@@ -166,7 +157,7 @@ for:
       - ninja -C out/Default electron:hunspell_dictionaries_zip
       - ninja -C out/Default electron:electron_chromedriver_zip
       - ninja -C out/Default third_party/electron_node:headers
-      - python3 %LOCAL_GOMA_DIR%\goma_ctl.py stat
+      - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
       - ps: >-
           Get-CimInstance -Namespace root\cimv2 -Class Win32_product | Select vendor, description, @{l='install_location';e='InstallLocation'}, @{l='install_date';e='InstallDate'}, @{l='install_date_2';e='InstallDate2'}, caption, version, name, @{l='sku_number';e='SKUNumber'} | ConvertTo-Json | Out-File -Encoding utf8 -FilePath .\installed_software.json
       - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
@@ -187,30 +178,6 @@ for:
             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
-      - ps: |
-          cd C:\projects\src
-          $missing_artifacts = $false
-          if ($env:SHOULD_SKIP_ARTIFACT_VALIDATION -eq 'true') {
-            Write-warning "Skipping artifact validation for doc-only PR"
-          } else {
-            $artifacts_to_validate = 'dist.zip','windows_toolchain_profile.json','shell_browser_ui_unittests.exe','chromedriver.zip','ffmpeg.zip','node_headers.zip','mksnapshot.zip','electron.lib','hunspell_dictionaries.zip'
-            foreach($artifact_name in $artifacts_to_validate) {
-              if ($artifact_name -eq 'ffmpeg.zip') {
-                $artifact_file = "out\ffmpeg\ffmpeg.zip"
-              } elseif ($artifact_name -eq 'node_headers.zip') {
-                $artifact_file = $artifact_name
-              } else {
-                $artifact_file = "out\Default\$artifact_name"
-              }
-              if (-not(Test-Path $artifact_file)) {
-                Write-warning "$artifact_name is missing and cannot be added to artifacts"
-                $missing_artifacts = $true
-              }
-            }
-          }
-          if ($missing_artifacts) {
-            throw "Build failed due to missing artifacts"
-          }
 
     deploy_script:
       - cd electron
@@ -236,7 +203,7 @@ for:
       - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
       - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
       - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
-      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)        
+      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
       - ps: >-
           if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
             appveyor-retry appveyor PushArtifact pdb.zip
@@ -269,7 +236,7 @@ for:
           # Download build artifacts
           $apiUrl = 'https://ci.appveyor.com/api'
           $build_info = Invoke-RestMethod -Method Get -Uri "$apiUrl/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/builds/$env:APPVEYOR_BUILD_ID"
-          $artifacts_to_download = @('dist.zip','ffmpeg.zip','node_headers.zip','electron.lib')
+          $artifacts_to_download = @('dist.zip','ffmpeg.zip','node_headers.zip','pdb.zip','electron.lib')
           foreach ($job in $build_info.build.jobs) {
             if ($job.name -eq "Build Arm on X64 Windows") {
               $jobId = $job.jobId
@@ -281,13 +248,10 @@ for:
                 }
                 Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/$artifact_name" -OutFile $outfile
               }
-              # Uncomment the following lines to download the pdb.zip to show real stacktraces when crashes happen during testing
-              # Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/pdb.zip" -OutFile pdb.zip
-              # 7z x -y -osrc pdb.zip
             }
           }
       - ps: |
-          $out_default_zips = @('dist.zip')
+          $out_default_zips = @('dist.zip','pdb.zip')
           foreach($zip_name in $out_default_zips) {
             7z x -y -osrc\out\Default $zip_name
           }

appveyor.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-116.0.5791.0
+image: e-116.0.5829.0
 environment:
   GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -47,11 +47,6 @@ environment:
     - job_name: Test
       job_depends_on: Build
 
-clone_script:
-- ps: git clone -q $("--branch=" + $Env:APPVEYOR_REPO_BRANCH) $("https://github.com/" + $Env:APPVEYOR_REPO_NAME + ".git") $Env:APPVEYOR_BUILD_FOLDER
-- ps: if (!$Env:APPVEYOR_PULL_REQUEST_NUMBER) {$("git checkout -qf " + $Env:APPVEYOR_REPO_COMMIT)}
-- ps: if ($Env:APPVEYOR_PULL_REQUEST_NUMBER) {git fetch -q origin +refs/pull/$($Env:APPVEYOR_PULL_REQUEST_NUMBER)/head; git checkout -qf FETCH_HEAD}
-
 clone_folder: C:\projects\src\electron
 
 skip_branch_with_pr: true
@@ -70,10 +65,8 @@ for:
       - ps: |
           node script/yarn.js install --frozen-lockfile
           node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER
-          $env:SHOULD_SKIP_ARTIFACT_VALIDATION = "false"
           if ($LASTEXITCODE -eq 0) {
-            Write-warning "Skipping build for doc-only change"
-            $env:SHOULD_SKIP_ARTIFACT_VALIDATION = "true"
+            Write-warning "Skipping build for doc only change"
             Exit-AppveyorBuild
           } else {
             $global:LASTEXITCODE = 0
@@ -90,8 +83,6 @@ for:
             Remove-Item -Recurse -Force $pwd\build-tools
           }
       - git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-      - ps: New-Item -Name depot_tools\.disable_auto_update -ItemType File
-      - depot_tools\bootstrap\win_tools.bat
       - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
       - ps: >-
           if (Test-Path -Path "$pwd\src\electron") {
@@ -114,7 +105,7 @@ for:
       - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
       - ps: >-
           if (Test-Path 'env:RAW_GOMA_AUTH') {
-            $goma_login = python3 $env:LOCAL_GOMA_DIR\goma_auth.py info
+            $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
             if ($goma_login -eq 'Login as Fermi Planck') {
               Write-warning "Goma authentication is correct";
             } else {
@@ -164,7 +155,7 @@ for:
       - ninja -C out/Default electron:hunspell_dictionaries_zip
       - ninja -C out/Default electron:electron_chromedriver_zip
       - ninja -C out/Default third_party/electron_node:headers
-      - python3 %LOCAL_GOMA_DIR%\goma_ctl.py stat
+      - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
       - ps: >-
           Get-CimInstance -Namespace root\cimv2 -Class Win32_product | Select vendor, description, @{l='install_location';e='InstallLocation'}, @{l='install_date';e='InstallDate'}, @{l='install_date_2';e='InstallDate2'}, caption, version, name, @{l='sku_number';e='SKUNumber'} | ConvertTo-Json | Out-File -Encoding utf8 -FilePath .\installed_software.json
       - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
@@ -185,30 +176,6 @@ for:
             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
-      - ps: |
-          cd C:\projects\src
-          $missing_artifacts = $false
-          if ($env:SHOULD_SKIP_ARTIFACT_VALIDATION -eq 'true') {
-            Write-warning "Skipping artifact validation for doc-only PR"
-          } else {
-            $artifacts_to_validate = 'dist.zip','windows_toolchain_profile.json','shell_browser_ui_unittests.exe','chromedriver.zip','ffmpeg.zip','node_headers.zip','mksnapshot.zip','electron.lib','hunspell_dictionaries.zip'
-            foreach($artifact_name in $artifacts_to_validate) {
-              if ($artifact_name -eq 'ffmpeg.zip') {
-                $artifact_file = "out\ffmpeg\ffmpeg.zip"
-              } elseif ($artifact_name -eq 'node_headers.zip') {
-                $artifact_file = $artifact_name
-              } else {
-                $artifact_file = "out\Default\$artifact_name"
-              }
-              if (-not(Test-Path $artifact_file)) {
-                Write-warning "$artifact_name is missing and cannot be added to artifacts"
-                $missing_artifacts = $true
-              }
-            }
-          }
-          if ($missing_artifacts) {
-            throw "Build failed due to missing artifacts"
-          }
 
     deploy_script:
       - cd electron
@@ -234,7 +201,7 @@ for:
       - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
       - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
       - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
-      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)        
+      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
       - ps: >-
           if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
             appveyor-retry appveyor PushArtifact pdb.zip
@@ -277,9 +244,6 @@ for:
                 }
                 Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/$artifact_name" -OutFile $outfile
               }
-              # Uncomment the following lines to download the pdb.zip to show real stacktraces when crashes happen during testing
-              # Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/pdb.zip" -OutFile pdb.zip
-              # 7z x -y -osrc pdb.zip
             }
           }
       - ps: |

build/args/all.gn

@@ -52,11 +52,3 @@ use_perfetto_client_library = false
 
 # Disables the builtins PGO for V8
 v8_builtins_profiling_log_file = ""
-
-# Disable threadisolated allocator implementation from gin for partition allocator,
-# we are seeing crashes for Linux x64 users when node integration is enabled in the
-# renderer process causing SIGSEGV when the periodic memory reclaimer runs,
-# Refs https://github.com/electron/electron/issues/39775.
-# The current only user of this pool is the v8 CFI which is
-# not enabled on this branch, so it is safe to disable the feature.
-enable_pkeys = false

build/fake_v8_context_snapshot_generator.py

@@ -1,8 +0,0 @@
-import os
-import shutil
-import sys
-
-if os.path.exists(sys.argv[2]):
-  os.remove(sys.argv[2])
-
-shutil.copy(sys.argv[1], sys.argv[2])

buildflags/BUILD.gn

@@ -9,13 +9,10 @@ buildflag_header("buildflags") {
   header = "buildflags.h"
 
   flags = [
-    "ENABLE_RUN_AS_NODE=$enable_run_as_node",
-    "ENABLE_OSR=$enable_osr",
     "ENABLE_VIEWS_API=$enable_views_api",
     "ENABLE_PDF_VIEWER=$enable_pdf_viewer",
     "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
     "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
-    "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
     "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
   ]
 }

buildflags/buildflags.gni

@@ -3,17 +3,10 @@
 # found in the LICENSE file.
 
 declare_args() {
-  # Allow running Electron as a node binary.
-  enable_run_as_node = true
-
-  enable_osr = true
-
   enable_views_api = true
 
   enable_pdf_viewer = true
 
-  enable_picture_in_picture = true
-
   # Provide a fake location provider for mocking
   # the geolocation responses. Disable it if you
   # need to test with chromium's location provider.

chromium_src/BUILD.gn

@@ -51,6 +51,8 @@ static_library("chrome") {
     "//chrome/browser/net/proxy_config_monitor.h",
     "//chrome/browser/net/proxy_service_factory.cc",
     "//chrome/browser/net/proxy_service_factory.h",
+    "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc",
+    "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.h",
     "//chrome/browser/platform_util.cc",
     "//chrome/browser/platform_util.h",
     "//chrome/browser/predictors/preconnect_manager.cc",
@@ -94,6 +96,28 @@ static_library("chrome") {
     "//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.h",
+    "//chrome/browser/ui/views/overlay/back_to_tab_label_button.cc",
+    "//chrome/browser/ui/views/overlay/close_image_button.cc",
+    "//chrome/browser/ui/views/overlay/close_image_button.h",
+    "//chrome/browser/ui/views/overlay/constants.h",
+    "//chrome/browser/ui/views/overlay/hang_up_button.cc",
+    "//chrome/browser/ui/views/overlay/hang_up_button.h",
+    "//chrome/browser/ui/views/overlay/overlay_window_image_button.cc",
+    "//chrome/browser/ui/views/overlay/overlay_window_image_button.h",
+    "//chrome/browser/ui/views/overlay/playback_image_button.cc",
+    "//chrome/browser/ui/views/overlay/playback_image_button.h",
+    "//chrome/browser/ui/views/overlay/resize_handle_button.cc",
+    "//chrome/browser/ui/views/overlay/resize_handle_button.h",
+    "//chrome/browser/ui/views/overlay/simple_overlay_window_image_button.cc",
+    "//chrome/browser/ui/views/overlay/simple_overlay_window_image_button.h",
+    "//chrome/browser/ui/views/overlay/skip_ad_label_button.cc",
+    "//chrome/browser/ui/views/overlay/skip_ad_label_button.h",
+    "//chrome/browser/ui/views/overlay/toggle_camera_button.cc",
+    "//chrome/browser/ui/views/overlay/toggle_camera_button.h",
+    "//chrome/browser/ui/views/overlay/toggle_microphone_button.cc",
+    "//chrome/browser/ui/views/overlay/toggle_microphone_button.h",
+    "//chrome/browser/ui/views/overlay/video_overlay_window_views.cc",
+    "//chrome/browser/ui/views/overlay/video_overlay_window_views.h",
     "//extensions/browser/app_window/size_constraints.cc",
     "//extensions/browser/app_window/size_constraints.h",
     "//ui/views/native_window_tracker.h",
@@ -157,9 +181,12 @@ static_library("chrome") {
   ]
 
   deps = [
+    "//chrome/app/vector_icons",
     "//chrome/browser:resource_prefetch_predictor_proto",
     "//chrome/browser/resource_coordinator:mojo_bindings",
+    "//components/vector_icons:vector_icons",
     "//ui/snapshot",
+    "//ui/views/controls/webview",
   ]
 
   if (is_linux) {
@@ -177,10 +204,6 @@ static_library("chrome") {
       "//chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc",
       "//chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h",
     ]
-    sources += [
-      "//chrome/browser/ui/views/dark_mode_manager_linux.cc",
-      "//chrome/browser/ui/views/dark_mode_manager_linux.h",
-    ]
     public_deps += [
       "//components/dbus/menu",
       "//components/dbus/thread_linux",
@@ -270,41 +293,6 @@ static_library("chrome") {
     }
   }
 
-  if (enable_picture_in_picture) {
-    sources += [
-      "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc",
-      "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.h",
-      "//chrome/browser/ui/views/overlay/back_to_tab_label_button.cc",
-      "//chrome/browser/ui/views/overlay/close_image_button.cc",
-      "//chrome/browser/ui/views/overlay/close_image_button.h",
-      "//chrome/browser/ui/views/overlay/constants.h",
-      "//chrome/browser/ui/views/overlay/hang_up_button.cc",
-      "//chrome/browser/ui/views/overlay/hang_up_button.h",
-      "//chrome/browser/ui/views/overlay/overlay_window_image_button.cc",
-      "//chrome/browser/ui/views/overlay/overlay_window_image_button.h",
-      "//chrome/browser/ui/views/overlay/playback_image_button.cc",
-      "//chrome/browser/ui/views/overlay/playback_image_button.h",
-      "//chrome/browser/ui/views/overlay/resize_handle_button.cc",
-      "//chrome/browser/ui/views/overlay/resize_handle_button.h",
-      "//chrome/browser/ui/views/overlay/simple_overlay_window_image_button.cc",
-      "//chrome/browser/ui/views/overlay/simple_overlay_window_image_button.h",
-      "//chrome/browser/ui/views/overlay/skip_ad_label_button.cc",
-      "//chrome/browser/ui/views/overlay/skip_ad_label_button.h",
-      "//chrome/browser/ui/views/overlay/toggle_camera_button.cc",
-      "//chrome/browser/ui/views/overlay/toggle_camera_button.h",
-      "//chrome/browser/ui/views/overlay/toggle_microphone_button.cc",
-      "//chrome/browser/ui/views/overlay/toggle_microphone_button.h",
-      "//chrome/browser/ui/views/overlay/video_overlay_window_views.cc",
-      "//chrome/browser/ui/views/overlay/video_overlay_window_views.h",
-    ]
-
-    deps += [
-      "//chrome/app/vector_icons",
-      "//components/vector_icons:vector_icons",
-      "//ui/views/controls/webview",
-    ]
-  }
-
   if (enable_electron_extensions) {
     sources += [
       "//chrome/browser/extensions/chrome_url_request_util.cc",
@@ -333,34 +321,6 @@ static_library("chrome") {
         "//components/pdf/renderer",
       ]
     }
-  } else {
-    # These are required by the webRequest module.
-    sources += [
-      "//extensions/browser/api/declarative_net_request/request_action.cc",
-      "//extensions/browser/api/declarative_net_request/request_action.h",
-      "//extensions/browser/api/web_request/form_data_parser.cc",
-      "//extensions/browser/api/web_request/form_data_parser.h",
-      "//extensions/browser/api/web_request/upload_data_presenter.cc",
-      "//extensions/browser/api/web_request/upload_data_presenter.h",
-      "//extensions/browser/api/web_request/web_request_api_constants.cc",
-      "//extensions/browser/api/web_request/web_request_api_constants.h",
-      "//extensions/browser/api/web_request/web_request_info.cc",
-      "//extensions/browser/api/web_request/web_request_info.h",
-      "//extensions/browser/api/web_request/web_request_resource_type.cc",
-      "//extensions/browser/api/web_request/web_request_resource_type.h",
-      "//extensions/browser/extension_api_frame_id_map.cc",
-      "//extensions/browser/extension_api_frame_id_map.h",
-      "//extensions/browser/extension_navigation_ui_data.cc",
-      "//extensions/browser/extension_navigation_ui_data.h",
-      "//extensions/browser/extensions_browser_client.cc",
-      "//extensions/browser/extensions_browser_client.h",
-      "//extensions/browser/guest_view/web_view/web_view_renderer_state.cc",
-      "//extensions/browser/guest_view/web_view/web_view_renderer_state.h",
-    ]
-
-    public_deps += [
-      "//extensions/browser/api/declarative_net_request/flat:extension_ruleset",
-    ]
   }
 
   if (!is_mas_build) {
@@ -393,7 +353,6 @@ if (is_mac) {
 
     deps = [
       "//base",
-      "//content/public/browser",
       "//skia",
       "//third_party/electron_node:node_lib",
       "//third_party/webrtc_overrides:webrtc_component",

docs/api/app.md

@@ -413,7 +413,18 @@ Returns:
 
 * `event` Event
 * `webContents` [WebContents](web-contents.md)
-* `details` [RenderProcessGoneDetails](structures/render-process-gone-details.md)
+* `details` Object
+  * `reason` string - The reason the render process is gone.  Possible values:
+    * `clean-exit` - Process exited with an exit code of zero
+    * `abnormal-exit` - Process exited with a non-zero exit code
+    * `killed` - Process was sent a SIGTERM or otherwise killed externally
+    * `crashed` - Process crashed
+    * `oom` - Process ran out of memory
+    * `launch-failed` - Process never successfully launched
+    * `integrity-failure` - Windows code integrity checks failed
+  * `exitCode` Integer - The exit code of the process, unless `reason` is
+    `launch-failed`, in which case `exitCode` will be a platform-specific
+    launch failure error code.
 
 Emitted when the renderer process unexpectedly disappears.  This is normally
 because it was crashed or killed.
@@ -1135,11 +1146,11 @@ indicates success while any other value indicates failure according to Chromium
     resolver will attempt to use the system's DNS settings to do DNS lookups
     itself. Enabled by default on macOS, disabled by default on Windows and
     Linux.
-  * `secureDnsMode` string (optional) - Can be 'off', 'automatic' or 'secure'.
-    Configures the DNS-over-HTTP mode. When 'off', no DoH lookups will be
-    performed. When 'automatic', DoH lookups will be performed first if DoH is
+  * `secureDnsMode` string (optional) - Can be "off", "automatic" or "secure".
+    Configures the DNS-over-HTTP mode. When "off", no DoH lookups will be
+    performed. When "automatic", DoH lookups will be performed first if DoH is
     available, and insecure DNS lookups will be performed as a fallback. When
-    'secure', only DoH lookups will be performed. Defaults to 'automatic'.
+    "secure", only DoH lookups will be performed. Defaults to "automatic".
   * `secureDnsServers` string[] (optional) - A list of DNS-over-HTTP
     server templates. See [RFC8484 § 3][] for details on the template format.
     Most servers support the POST method; the template for such servers is
@@ -1265,6 +1276,9 @@ On macOS, it shows on the dock icon. On Linux, it only works for Unity launcher.
 **Note:** Unity launcher requires a `.desktop` file to work. For more information,
 please read the [Unity integration documentation][unity-requirement].
 
+**Note:** On macOS, you need to ensure that your application has the permission
+to display notifications for this method to work.
+
 ### `app.getBadgeCount()` _Linux_ _macOS_
 
 Returns `Integer` - The current value displayed in the counter badge.
@@ -1331,7 +1345,7 @@ application name. For example:
 
 ``` js
 const { app } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 const appFolder = path.dirname(process.execPath)
 const updateExe = path.resolve(appFolder, '..', 'Update.exe')
@@ -1402,7 +1416,7 @@ Returns `Function` - This function **must** be called once you have finished acc
 
 ```js
 const { app, dialog } = require('electron')
-const fs = require('node:fs')
+const fs = require('fs')
 
 let filepath
 let bookmark

docs/api/browser-window.md

@@ -505,10 +505,6 @@ events.
 
 A `Integer` property representing the unique ID of the window. Each ID is unique among all `BrowserWindow` instances of the entire Electron application.
 
-#### `win.tabbingIdentifier` _macOS_ _Readonly_
-
-A `string` (optional) property that is equal to the `tabbingIdentifier` passed to the `BrowserWindow` constructor or `undefined` if none was set.
-
 #### `win.autoHideMenuBar`
 
 A `boolean` property that determines whether the window menu bar should hide itself automatically. Once set, the menu bar will only show when users press the single `Alt` key.
@@ -824,14 +820,10 @@ win.setBounds({ width: 100 })
 console.log(win.getBounds())
 ```
 
-**Note:** On macOS, the y-coordinate value cannot be smaller than the [Tray](tray.md) height. The tray height has changed over time and depends on the operating system, but is between 20-40px. Passing a value lower than the tray height will result in a window that is flush to the tray.
-
 #### `win.getBounds()`
 
 Returns [`Rectangle`](structures/rectangle.md) - The `bounds` of the window as `Object`.
 
-**Note:** On macOS, the y-coordinate value returned will be at minimum the [Tray](tray.md) height. For example, calling `win.setBounds({ x: 25, y: 20, width: 800, height: 600 })` with a tray height of 38 means that `win.getBounds()` will return `{ x: 25, y: 38, width: 800, height: 600 }`.
-
 #### `win.getBackgroundColor()`
 
 Returns `string` - Gets the background color of the window in Hex (`#RRGGBB`) format.
@@ -1215,7 +1207,7 @@ const win = new BrowserWindow()
 const url = require('url').format({
   protocol: 'file',
   slashes: true,
-  pathname: require('node:path').join(__dirname, 'index.html')
+  pathname: require('path').join(__dirname, 'index.html')
 })
 
 win.loadURL(url)

docs/api/command-line-switches.md

@@ -116,20 +116,14 @@ Ignore the connections limit for `domains` list separated by `,`.
 
 ### --js-flags=`flags`
 
-Specifies the flags passed to the [V8 engine](https://v8.dev). In order to enable the `flags` in the main process,
-this switch must be passed on startup.
+Specifies the flags passed to the Node.js engine. It has to be passed when starting
+Electron if you want to enable the `flags` in the main process.
 
 ```sh
 $ electron --js-flags="--harmony_proxies --harmony_collections" your-app
 ```
 
-Run `node --v8-options` or `electron --js-flags="--help"` in your terminal for the list of available flags.  These can be used to enable early-stage JavaScript features, or log and manipulate garbage collection, among other things.
-
-For example, to trace V8 optimization and deoptimization:
-
-```sh
-$ electron --js-flags="--trace-opt --trace-deopt" your-app
-```
+See the [Node.js documentation][node-cli] or run `node --help` in your terminal for a list of available flags. Additionally, run `node --v8-options` to see a list of flags that specifically refer to Node.js's V8 JavaScript engine.
 
 ### --lang
 
@@ -247,25 +241,19 @@ Electron supports some of the [CLI flags][node-cli] supported by Node.js.
 
 **Note:** Passing unsupported command line switches to Electron when it is not running in `ELECTRON_RUN_AS_NODE` will have no effect.
 
-### `--inspect-brk\[=\[host:]port]`
+### --inspect-brk\[=\[host:]port]
 
 Activate inspector on host:port and break at start of user script. Default host:port is 127.0.0.1:9229.
 
 Aliased to `--debug-brk=[host:]port`.
 
-#### `--inspect-brk-node[=[host:]port]`
-
-Activate inspector on `host:port` and break at start of the first internal
-JavaScript script executed when the inspector is available.
-Default `host:port` is `127.0.0.1:9229`.
-
-### `--inspect-port=\[host:]port`
+### --inspect-port=\[host:]port
 
 Set the `host:port` to be used when the inspector is activated. Useful when activating the inspector by sending the SIGUSR1 signal. Default host is `127.0.0.1`.
 
 Aliased to `--debug-port=[host:]port`.
 
-### `--inspect\[=\[host:]port]`
+### --inspect\[=\[host:]port]
 
 Activate inspector on `host:port`. Default is `127.0.0.1:9229`.
 
@@ -275,37 +263,12 @@ See the [Debugging the Main Process][debugging-main-process] guide for more deta
 
 Aliased to `--debug[=[host:]port`.
 
-### `--inspect-publish-uid=stderr,http`
+### --inspect-publish-uid=stderr,http
 
 Specify ways of the inspector web socket url exposure.
 
 By default inspector websocket url is available in stderr and under /json/list endpoint on http://host:port/json/list.
 
-### `--no-deprecation`
-
-Silence deprecation warnings.
-
-### `--throw-deprecation`
-
-Throw errors for deprecations.
-
-### `--trace-deprecation`
-
-Print stack traces for deprecations.
-
-### `--trace-warnings`
-
-Print stack traces for process warnings (including deprecations).
-
-### `--dns-result-order=order`
-
-Set the default value of the `verbatim` parameter in the Node.js [`dns.lookup()`](https://nodejs.org/api/dns.html#dnslookuphostname-options-callback) and [`dnsPromises.lookup()`](https://nodejs.org/api/dns.html#dnspromiseslookuphostname-options) functions. The value could be:
-
-* `ipv4first`: sets default `verbatim` `false`.
-* `verbatim`: sets default `verbatim` `true`.
-
-The default is `verbatim` and `dns.setDefaultResultOrder()` have higher priority than `--dns-result-order`.
-
 [app]: app.md
 [append-switch]: command-line.md#commandlineappendswitchswitch-value
 [debugging-main-process]: ../tutorial/debugging-main-process.md

docs/api/context-bridge.md

@@ -147,7 +147,7 @@ Be very cautious about which globals and APIs you expose to untrusted remote con
 
 ```javascript
 const { contextBridge } = require('electron')
-const crypto = require('node:crypto')
+const crypto = require('crypto')
 contextBridge.exposeInMainWorld('nodeCrypto', {
   sha256sum (data) {
     const hash = crypto.createHash('sha256')

docs/api/cookies.md

@@ -119,8 +119,4 @@ Removes the cookies matching `url` and `name`
 
 Returns `Promise<void>` - A promise which resolves when the cookie store has been flushed
 
-Writes any unwritten cookies data to disk
-
-Cookies written by any method will not be written to disk immediately, but will be written every 30 seconds or 512 operations
-
-Calling this method can cause the cookie to be written to disk immediately.
+Writes any unwritten cookies data to disk.

docs/api/desktop-capturer.md

@@ -91,7 +91,7 @@ The `desktopCapturer` module has the following methods:
 
 * `options` Object
   * `types` string[] - An array of strings that lists the types of desktop sources
-    to be captured, available types can be `screen` and `window`.
+    to be captured, available types are `screen` and `window`.
   * `thumbnailSize` [Size](structures/size.md) (optional) - The size that the media source thumbnail
     should be scaled to. Default is `150` x `150`. Set width or height to 0 when you do not need
     the thumbnails. This will save the processing time required for capturing the content of each

docs/api/extensions.md

@@ -40,41 +40,18 @@ We support the following extensions APIs, with some caveats. Other APIs may
 additionally be supported, but support for any APIs not listed here is
 provisional and may be removed.
 
-### Supported Manifest Keys
-
-- `name`
-- `version`
-- `author`
-- `permissions`
-- `content_scripts`
-- `default_locale`
-- `devtools_page`
-- `short_name`
-- `host_permissions` (Manifest V3)
-- `manifest_version`
-- `background` (Manifest V2)
-- `minimum_chrome_version`
-
-See [Manifest file format](https://developer.chrome.com/docs/extensions/mv3/manifest/) for more information about the purpose of each possible key.
-
 ### `chrome.devtools.inspectedWindow`
 
 All features of this API are supported.
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/devtools_inspectedWindow) for more information.
-
 ### `chrome.devtools.network`
 
 All features of this API are supported.
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/devtools_network) for more information.
-
 ### `chrome.devtools.panels`
 
 All features of this API are supported.
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/devtools_panels) for more information.
-
 ### `chrome.extension`
 
 The following properties of `chrome.extension` are supported:
@@ -86,25 +63,6 @@ The following methods of `chrome.extension` are supported:
 - `chrome.extension.getURL`
 - `chrome.extension.getBackgroundPage`
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/extension) for more information.
-
-### `chrome.management`
-
-The following methods of `chrome.management` are supported:
-
-- `chrome.management.getAll`
-- `chrome.management.get`
-- `chrome.management.getSelf`
-- `chrome.management.getPermissionWarningsById`
-- `chrome.management.getPermissionWarningsByManifest`
-
-The following events of `chrome.management` are supported:
-
-- `chrome.management.onEnabled`
-- `chrome.management.onDisabled`
-
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/management) for more information.
-
 ### `chrome.runtime`
 
 The following properties of `chrome.runtime` are supported:
@@ -131,23 +89,10 @@ The following events of `chrome.runtime` are supported:
 - `chrome.runtime.onConnect`
 - `chrome.runtime.onMessage`
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/runtime) for more information.
-
-### `chrome.scripting`
-
-All features of this API are supported.
-
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/scripting) for more information.
-
 ### `chrome.storage`
 
-The following methods of `chrome.storage` are supported:
-
-- `chrome.storage.local`
-
-`chrome.storage.sync` and `chrome.storage.managed` are **not** supported.
-
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/storage) for more information.
+Only `chrome.storage.local` is supported; `chrome.storage.sync` and
+`chrome.storage.managed` are not.
 
 ### `chrome.tabs`
 
@@ -156,8 +101,6 @@ The following methods of `chrome.tabs` are supported:
 - `chrome.tabs.sendMessage`
 - `chrome.tabs.reload`
 - `chrome.tabs.executeScript`
-- `chrome.tabs.query` (partial support)
-  - supported properties: `url`, `title`, `audible`, `active`, `muted`.
 - `chrome.tabs.update` (partial support)
   - supported properties: `url`, `muted`.
 
@@ -165,12 +108,20 @@ The following methods of `chrome.tabs` are supported:
 > tab". Since Electron has no such concept, passing `-1` as a tab ID is not
 > supported and will raise an error.
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/tabs) for more information.
+### `chrome.management`
+
+The following methods of `chrome.management` are supported:
+
+- `chrome.management.getAll`
+- `chrome.management.get`
+- `chrome.management.getSelf`
+- `chrome.management.getPermissionWarningsById`
+- `chrome.management.getPermissionWarningsByManifest`
+- `chrome.management.onEnabled`
+- `chrome.management.onDisabled`
 
 ### `chrome.webRequest`
 
 All features of this API are supported.
 
 > **NOTE:** Electron's [`webRequest`](web-request.md) module takes precedence over `chrome.webRequest` if there are conflicting handlers.
-
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/webRequest) for more information.

docs/api/ipc-main.md

@@ -72,7 +72,7 @@ Removes listeners of the specified `channel`.
 ### `ipcMain.handle(channel, listener)`
 
 * `channel` string
-* `listener` Function<Promise\<any&#62; | any&#62;
+* `listener` Function<Promise\<void&#62; | any&#62;
   * `event` [IpcMainInvokeEvent][ipc-main-invoke-event]
   * `...args` any[]
 
@@ -109,8 +109,8 @@ provided to the renderer process. Please refer to
 ### `ipcMain.handleOnce(channel, listener)`
 
 * `channel` string
-* `listener` Function<Promise\<any&#62; | any&#62;
-  * `event` [IpcMainInvokeEvent][ipc-main-invoke-event]
+* `listener` Function<Promise\<void&#62; | any&#62;
+  * `event` IpcMainInvokeEvent
   * `...args` any[]
 
 Handles a single `invoke`able IPC message, then removes the listener. See
@@ -122,6 +122,17 @@ Handles a single `invoke`able IPC message, then removes the listener. See
 
 Removes any handler for `channel`, if present.
 
+## IpcMainEvent object
+
+The documentation for the `event` object passed to the `callback` can be found
+in the [`ipc-main-event`][ipc-main-event] structure docs.
+
+## IpcMainInvokeEvent object
+
+The documentation for the `event` object passed to `handle` callbacks can be
+found in the [`ipc-main-invoke-event`][ipc-main-invoke-event]
+structure docs.
+
 [IPC tutorial]: ../tutorial/ipc.md
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 [web-contents-send]: ../api/web-contents.md#contentssendchannel-args

docs/api/ipc-renderer.md

@@ -26,7 +26,7 @@ The `ipcRenderer` module has the following method to listen for events and send
 
 * `channel` string
 * `listener` Function
-  * `event` [IpcRendererEvent][ipc-renderer-event]
+  * `event` IpcRendererEvent
   * `...args` any[]
 
 Listens to `channel`, when a new message arrives `listener` would be called with
@@ -36,7 +36,7 @@ Listens to `channel`, when a new message arrives `listener` would be called with
 
 * `channel` string
 * `listener` Function
-  * `event` [IpcRendererEvent][ipc-renderer-event]
+  * `event` IpcRendererEvent
   * `...args` any[]
 
 Adds a one time `listener` function for the event. This `listener` is invoked
@@ -208,8 +208,12 @@ Sends a message to a window with `webContentsId` via `channel`.
 Like `ipcRenderer.send` but the event will be sent to the `<webview>` element in
 the host page instead of the main process.
 
+## Event object
+
+The documentation for the `event` object passed to the `callback` can be found
+in the [`ipc-renderer-event`](./structures/ipc-renderer-event.md) structure docs.
+
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 [SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
 [`window.postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage
 [`MessagePort`]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
-[ipc-renderer-event]: ./structures/ipc-renderer-event.md

docs/api/menu.md

@@ -80,10 +80,6 @@ The `menu` object has the following instance methods:
   * `positioningItem` number (optional) _macOS_ - The index of the menu item to
     be positioned under the mouse cursor at the specified coordinates. Default
     is -1.
-  * `sourceType` string (optional) _Windows_ _Linux_ - This should map to the `menuSourceType`
-    provided by the `context-menu` event. It is not recommended to set this value manually,
-    only provide values you receive from other APIs or leave it `undefined`.
-    Can be `none`, `mouse`, `keyboard`, `touch`, `touchMenu`, `longPress`, `longTap`, `touchHandle`, `stylus`, `adjustSelection`, or `adjustSelectionReset`.
   * `callback` Function (optional) - Called when menu is closed.
 
 Pops up this menu as a context menu in the [`BrowserWindow`](browser-window.md).

docs/api/native-image.md

@@ -306,7 +306,7 @@ Returns `NativeImage` - The cropped image.
   * `width` Integer (optional) - Defaults to the image's width.
   * `height` Integer (optional) - Defaults to the image's height.
   * `quality` string (optional) - The desired quality of the resize image.
-    Possible values include `good`, `better`, or `best`. The default is `best`.
+    Possible values are `good`, `better`, or `best`. The default is `best`.
     These values express a desired quality/speed tradeoff. They are translated
     into an algorithm-specific method that depends on the capabilities
     (CPU, GPU) of the underlying platform. It is possible for all three methods

docs/api/notification.md

@@ -85,8 +85,6 @@ Emitted when the notification is closed by manual intervention from the user.
 This event is not guaranteed to be emitted in all cases where the notification
 is closed.
 
-On Windows, the `close` event can be emitted in one of three ways: programmatic dismissal with `notification.close()`, by the user closing the notification, or via system timeout. If a notification is in the Action Center after the initial `close` event is emitted, a call to `notification.close()` will remove the notification from the action center but the `close` event will not be emitted again.
-
 #### Event: 'reply' _macOS_
 
 Returns:
@@ -129,8 +127,6 @@ shown notification and create a new one with identical properties.
 
 Dismisses the notification.
 
-On Windows, calling `notification.close()` while the notification is visible on screen will dismiss the notification and remove it from the Action Center. If `notification.close()` is called after the notification is no longer visible on screen, calling `notification.close()` will try remove it from the Action Center.
-
 ### Instance Properties
 
 #### `notification.title`

docs/api/power-save-blocker.md

@@ -49,8 +49,6 @@ is used.
 
 Stops the specified power save blocker.
 
-Returns `boolean` - Whether the specified `powerSaveBlocker` has been stopped.
-
 ### `powerSaveBlocker.isStarted(id)`
 
 * `id` Integer - The power save blocker id returned by `powerSaveBlocker.start`.

docs/api/protocol.md

@@ -33,7 +33,7 @@ to register it to that session explicitly.
 
 ```javascript
 const { app, BrowserWindow, net, protocol, session } = require('electron')
-const path = require('node:path')
+const path = require('path')
 const url = require('url')
 
 app.whenReady().then(() => {
@@ -122,7 +122,7 @@ Example:
 
 ```js
 const { app, net, protocol } = require('electron')
-const { join } = require('node:path')
+const { join } = require('path')
 const { pathToFileURL } = require('url')
 
 protocol.registerSchemesAsPrivileged([

docs/api/safe-storage.md

@@ -38,28 +38,3 @@ Returns `string` - the decrypted string. Decrypts the encrypted buffer
 obtained  with `safeStorage.encryptString` back into a string.
 
 This function will throw an error if decryption fails.
-
-### `safeStorage.setUsePlainTextEncryption(usePlainText)`
-
-* `usePlainText` boolean
-
-This function on Linux will force the module to use an in memory password for creating
-symmetric key that is used for encrypt/decrypt functions when a valid OS password
-manager cannot be determined for the current active desktop environment. This function
-is a no-op on Windows and MacOS.
-
-### `safeStorage.getSelectedStorageBackend()` _Linux_
-
-Returns `string` - User friendly name of the password manager selected on Linux.
-
-This function will return one of the following values:
-
-* `basic_text` - When the desktop environment is not recognised or if the following
-command line flag is provided `--password-store="basic"`.
-* `gnome_libsecret` - When the desktop environment is `X-Cinnamon`, `Deepin`, `GNOME`, `Pantheon`, `XFCE`, `UKUI`, `unity` or if the following command line flag is provided `--password-store="gnome-libsecret"`.
-* `kwallet` - When the desktop session is `kde4` or if the following command line flag
-is provided `--password-store="kwallet"`.
-* `kwallet5` - When the desktop session is `kde5` or if the following command line flag
-is provided `--password-store="kwallet5"`.
-* `kwallet6` - When the desktop session is `kde6`.
-* `unknown` - When the function is called before app has emitted the `ready` event.

docs/api/session.md

@@ -103,7 +103,7 @@ const { session } = require('electron')
 session.defaultSession.on('will-download', (event, item, webContents) => {
   event.preventDefault()
   require('got')(item.getURL()).then((response) => {
-    require('node:fs').writeFileSync('/somewhere', response.body)
+    require('fs').writeFileSync('/somewhere', response.body)
   })
 })
 ```
@@ -574,11 +574,11 @@ Clears the session’s HTTP cache.
 * `options` Object (optional)
   * `origin` string (optional) - Should follow `window.location.origin`’s representation
     `scheme://host:port`.
-  * `storages` string[] (optional) - The types of storages to clear, can be
+  * `storages` string[] (optional) - The types of storages to clear, can contain:
     `cookies`, `filesystem`, `indexdb`, `localstorage`,
     `shadercache`, `websql`, `serviceworkers`, `cachestorage`. If not
     specified, clear all storage types.
-  * `quotas` string[] (optional) - The types of quotas to clear, can be
+  * `quotas` string[] (optional) - The types of quotas to clear, can contain:
     `temporary`, `syncable`. If not specified, clear all quotas.
 
 Returns `Promise<void>` - resolves when the storage data has been cleared.
@@ -785,7 +785,7 @@ Returns `Promise<void>` - Resolves when all connections are closed.
 #### `ses.fetch(input[, init])`
 
 * `input` string | [GlobalRequest](https://nodejs.org/api/globals.html#request)
-* `init` [RequestInit](https://developer.mozilla.org/en-US/docs/Web/API/fetch#options) & { bypassCustomProtocolHandlers?: boolean } (optional)
+* `init` [RequestInit](https://developer.mozilla.org/en-US/docs/Web/API/fetch#options) (optional)
 
 Returns `Promise<GlobalResponse>` - see [Response](https://developer.mozilla.org/en-US/docs/Web/API/Response).
 
@@ -891,19 +891,18 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
   * `permission` string - The type of requested permission.
     * `clipboard-read` - Request access to read from the clipboard.
     * `clipboard-sanitized-write` - Request access to write to the clipboard.
-    * `display-capture` - Request access to capture the screen via the [Screen Capture API](https://developer.mozilla.org/en-US/docs/Web/API/Screen_Capture_API).
-    * `fullscreen` - Request control of the app's fullscreen state via the [Fullscreen API](https://developer.mozilla.org/en-US/docs/Web/API/Fullscreen_API).
-    * `geolocation` - Request access to the user's location via the [Geolocation API](https://developer.mozilla.org/en-US/docs/Web/API/Geolocation_API)
-    * `idle-detection` - Request access to the user's idle state via the [IdleDetector API](https://developer.mozilla.org/en-US/docs/Web/API/IdleDetector).
     * `media` -  Request access to media devices such as camera, microphone and speakers.
+    * `display-capture` - Request access to capture the screen.
     * `mediaKeySystem` - Request access to DRM protected content.
-    * `midi` - Request MIDI access in the [Web MIDI API](https://developer.mozilla.org/en-US/docs/Web/API/Web_MIDI_API).
-    * `midiSysex` - Request the use of system exclusive messages in the [Web MIDI API](https://developer.mozilla.org/en-US/docs/Web/API/Web_MIDI_API).
-    * `notifications` - Request notification creation and the ability to display them in the user's system tray using the [Notifications API](https://developer.mozilla.org/en-US/docs/Web/API/notification)
-    * `pointerLock` - Request to directly interpret mouse movements as an input method via the [Pointer Lock API](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API). These requests always appear to originate from the main frame.
+    * `geolocation` - Request access to user's current location.
+    * `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.
+    * `fullscreen` - Request for the app to enter fullscreen mode.
     * `openExternal` - Request to open links in external applications.
     * `window-management` - Request access to enumerate screens using the [`getScreenDetails`](https://developer.chrome.com/en/articles/multi-screen-window-placement/) API.
-    * `unknown` - An unrecognized permission request.
+    * `unknown` - An unrecognized permission request
   * `callback` Function
     * `permissionGranted` boolean - Allow or deny the permission.
   * `details` Object - Some properties are only available on certain permission types.
@@ -935,22 +934,7 @@ session.fromPartition('some-partition').setPermissionRequestHandler((webContents
 
 * `handler` Function\<boolean> | null
   * `webContents` ([WebContents](web-contents.md) | null) - WebContents checking the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.  All cross origin sub frames making permission checks will pass a `null` webContents to this handler, while certain other permission checks such as `notifications` checks will always pass `null`.  You should use `embeddingOrigin` and `requestingOrigin` to determine what origin the owning frame and the requesting frame are on respectively.
-  * `permission` string - Type of permission check.
-    * `clipboard-read` - Request access to read from the clipboard.
-    * `clipboard-sanitized-write` - Request access to write to the clipboard.
-    * `geolocation` - Access the user's geolocation data via the [Geolocation API](https://developer.mozilla.org/en-US/docs/Web/API/Geolocation_API)
-    * `fullscreen` - Control of the app's fullscreen state via the [Fullscreen API](https://developer.mozilla.org/en-US/docs/Web/API/Fullscreen_API).
-    * `hid` - Access the HID protocol to manipulate HID devices via the [WebHID API](https://developer.mozilla.org/en-US/docs/Web/API/WebHID_API).
-    * `idle-detection` - Access the user's idle state via the [IdleDetector API](https://developer.mozilla.org/en-US/docs/Web/API/IdleDetector).
-    * `media` - Access to media devices such as camera, microphone and speakers.
-    * `mediaKeySystem` - Access to DRM protected content.
-    * `midi` - Enable MIDI access in the [Web MIDI API](https://developer.mozilla.org/en-US/docs/Web/API/Web_MIDI_API).
-    * `midiSysex` - Use system exclusive messages in the [Web MIDI API](https://developer.mozilla.org/en-US/docs/Web/API/Web_MIDI_API).
-    * `notifications` - Configure and display desktop notifications to the user with the [Notifications API](https://developer.mozilla.org/en-US/docs/Web/API/notification).
-    * `openExternal` - Open links in external applications.
-    * `pointerLock` - Directly interpret mouse movements as an input method via the [Pointer Lock API](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API). These requests always appear to originate from the main frame.
-    * `serial` - Read from and write to serial devices with the [Web Serial API](https://developer.mozilla.org/en-US/docs/Web/API/Web_Serial_API).
-    * `usb` - Expose non-standard Universal Serial Bus (USB) compatible devices services to the web with the [WebUSB API](https://developer.mozilla.org/en-US/docs/Web/API/WebUSB_API).
+  * `permission` string - Type of permission check.  Valid values are `midiSysex`, `notifications`, `geolocation`, `media`,`mediaKeySystem`,`midi`, `pointerLock`, `fullscreen`, `openExternal`, `hid`, `serial`, or `usb`.
   * `requestingOrigin` string - The origin URL of the permission check
   * `details` Object - Some properties are only available on certain permission types.
     * `embeddingOrigin` string (optional) - The origin of the frame embedding the frame that made the permission check.  Only set for cross-origin sub frames making permission checks.
@@ -1113,7 +1097,7 @@ app.whenReady().then(() => {
 
 * `handler` Function\<string[]> | null
   * `details` Object
-    * `protectedClasses` string[] - The current list of protected USB classes. Possible class values include:
+    * `protectedClasses` string[] - The current list of protected USB classes. Possible class values are:
       * `audio`
       * `audio-video`
       * `hid`
@@ -1193,7 +1177,7 @@ automatically.  To clear the handler, call `setBluetoothPairingHandler(null)`.
 
 ```javascript
 const { app, BrowserWindow, session } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 function createWindow () {
   let bluetoothPinCallback = null
@@ -1300,18 +1284,16 @@ reused for new connections.
 
 Returns `Promise<Buffer>` - resolves with blob data.
 
-#### `ses.downloadURL(url[, options])`
+#### `ses.downloadURL(url)`
 
 * `url` string
-* `options` Object (optional)
-  * `headers` Record<string, string> (optional) - HTTP request headers.
 
 Initiates a download of the resource at `url`.
 The API will generate a [DownloadItem](download-item.md) that can be accessed
 with the [will-download](#event-will-download) event.
 
 **Note:** This does not perform any security checks that relate to a page's origin,
-unlike [`webContents.downloadURL`](web-contents.md#contentsdownloadurlurl-options).
+unlike [`webContents.downloadURL`](web-contents.md#contentsdownloadurlurl).
 
 #### `ses.createInterruptedDownload(options)`
 
@@ -1457,7 +1439,7 @@ extension to be loaded.
 
 ```js
 const { app, session } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 app.whenReady().then(async () => {
   await session.defaultSession.loadExtension(
@@ -1491,7 +1473,7 @@ is emitted.
 
 * `extensionId` string - ID of extension to query
 
-Returns `Extension | null` - The loaded extension with the given ID.
+Returns `Extension` | `null` - The loaded extension with the given ID.
 
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.
@@ -1544,7 +1526,7 @@ A [`Protocol`](protocol.md) object for this session.
 
 ```javascript
 const { app, session } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 app.whenReady().then(() => {
   const protocol = session.fromPartition('some-partition').protocol

docs/api/structures/browser-window-options.md

@@ -140,16 +140,6 @@ Possible values are:
 
 * On Linux, possible types are `desktop`, `dock`, `toolbar`, `splash`,
   `notification`.
-  * The `desktop` type places the window at the desktop background window level
-    (kCGDesktopWindowLevel - 1). However, note that a desktop window will not
-    receive focus, keyboard, or mouse events. You can still use globalShortcut to
-    receive input sparingly.
-  * The `dock` type creates a dock-like window behavior.
-  * The `toolbar` type creates a window with a toolbar appearance.
-  * The `splash` type behaves in a specific way. It is not
-    draggable, even if the CSS styling of the window's body contains
-    -webkit-app-region: drag. This type is commonly used for splash screens.
-  * The `notification` type creates a window that behaves like a system notification.
 * On macOS, possible types are `desktop`, `textured`, `panel`.
   * The `textured` type adds metal gradient appearance
     (`NSWindowStyleMaskTexturedBackground`).

docs/api/structures/ipc-renderer-event.md

@@ -2,7 +2,6 @@
 
 * `sender` [IpcRenderer](../ipc-renderer.md) - The `IpcRenderer` instance that emitted the event originally
 * `senderId` Integer - The `webContents.id` that sent the message, you can call `event.sender.sendTo(event.senderId, ...)` to reply to the message, see [ipcRenderer.sendTo][ipc-renderer-sendto] for more information. This only applies to messages sent from a different renderer. Messages sent directly from the main process set `event.senderId` to `0`.
-* `senderIsMainFrame` boolean (optional) - Whether the message sent via [ipcRenderer.sendTo][ipc-renderer-sendto] was sent by the main frame. This is relevant when `nodeIntegrationInSubFrames` is enabled in the originating `webContents`.
 * `ports` [MessagePort][][] - A list of MessagePorts that were transferred with this message
 
 [ipc-renderer-sendto]: ../ipc-renderer.md#ipcrenderersendtowebcontentsid-channel-args

docs/api/structures/render-process-gone-details.md

@@ -1,13 +0,0 @@
-# RenderProcessGoneDetails Object
-
-* `reason` string - The reason the render process is gone.  Possible values:
-  * `clean-exit` - Process exited with an exit code of zero
-  * `abnormal-exit` - Process exited with a non-zero exit code
-  * `killed` - Process was sent a SIGTERM or otherwise killed externally
-  * `crashed` - Process crashed
-  * `oom` - Process ran out of memory
-  * `launch-failed` - Process never successfully launched
-  * `integrity-failure` - Windows code integrity checks failed
-* `exitCode` Integer - The exit code of the process, unless `reason` is
-  `launch-failed`, in which case `exitCode` will be a platform-specific
-  launch failure error code.

docs/api/structures/web-preferences.md

@@ -67,6 +67,7 @@
   * `monospace` string (optional) - Defaults to `Courier New`.
   * `cursive` string (optional) - Defaults to `Script`.
   * `fantasy` string (optional) - Defaults to `Impact`.
+  * `math` string (optional) - Defaults to `Latin Modern Math`.
 * `defaultFontSize` Integer (optional) - Defaults to `16`.
 * `defaultMonospaceFontSize` Integer (optional) - Defaults to `13`.
 * `minimumFontSize` Integer (optional) - Defaults to `0`.

docs/api/system-preferences.md

@@ -6,7 +6,7 @@ Process: [Main](../glossary.md#main-process)
 
 ```javascript
 const { systemPreferences } = require('electron')
-console.log(systemPreferences.isAeroGlassEnabled())
+console.log(systemPreferences.isDarkMode())
 ```
 
 ## Events
@@ -47,6 +47,12 @@ Returns:
 
 ## Methods
 
+### `systemPreferences.isDarkMode()` _macOS_ _Windows_ _Deprecated_
+
+Returns `boolean` - Whether the system is in Dark Mode.
+
+**Deprecated:** Should use the new [`nativeTheme.shouldUseDarkColors`](native-theme.md#nativethemeshouldusedarkcolors-readonly) API.
+
 ### `systemPreferences.isSwipeTrackingFromScrollEventsEnabled()` _macOS_
 
 Returns `boolean` - Whether the Swipe between pages setting is on.
@@ -291,7 +297,7 @@ This API is only available on macOS 10.14 Mojave or newer.
     * `window-frame` - Window frame.
     * `window-text` - Text in windows.
   * On **macOS**
-    * `alternate-selected-control-text` - The text on a selected surface in a list or table. _Deprecated_
+    * `alternate-selected-control-text` - The text on a selected surface in a list or table. _deprecated_
     * `control-background` - The background of a large interface element, such as a browser or table.
     * `control` - The surface of a control.
     * `control-text` -The text of a control that isn’t disabled.
@@ -350,6 +356,18 @@ Returns `string` - The standard system color formatted as `#RRGGBBAA`.
 
 Returns one of several standard system colors that automatically adapt to vibrancy and changes in accessibility settings like 'Increase contrast' and 'Reduce transparency'. See [Apple Documentation](https://developer.apple.com/design/human-interface-guidelines/macos/visual-design/color#system-colors) for  more details.
 
+### `systemPreferences.isInvertedColorScheme()` _Windows_ _Deprecated_
+
+Returns `boolean` - `true` if an inverted color scheme (a high contrast color scheme with light text and dark backgrounds) is active, `false` otherwise.
+
+**Deprecated:** Should use the new [`nativeTheme.shouldUseInvertedColorScheme`](native-theme.md#nativethemeshoulduseinvertedcolorscheme-macos-windows-readonly) API.
+
+### `systemPreferences.isHighContrastColorScheme()` _macOS_ _Windows_ _Deprecated_
+
+Returns `boolean` - `true` if a high contrast theme is active, `false` otherwise.
+
+**Deprecated:** Should use the new [`nativeTheme.shouldUseHighContrastColors`](native-theme.md#nativethemeshouldusehighcontrastcolors-macos-windows-readonly) API.
+
 ### `systemPreferences.getEffectiveAppearance()` _macOS_
 
 Returns `string` - Can be `dark`, `light` or `unknown`.
@@ -435,11 +453,7 @@ Returns an object with system animation settings.
 
 ## Properties
 
-### `systemPreferences.accessibilityDisplayShouldReduceTransparency()` _macOS_
-
-A `boolean` property which determines whether the app avoids using semitransparent backgrounds. This maps to [NSWorkspace.accessibilityDisplayShouldReduceTransparency](https://developer.apple.com/documentation/appkit/nsworkspace/1533006-accessibilitydisplayshouldreduce)
-
-### `systemPreferences.appLevelAppearance` _macOS_ _Deprecated_
+### `systemPreferences.appLevelAppearance` _macOS_
 
 A `string` property that can be `dark`, `light` or `unknown`. It determines the macOS appearance setting for
 your application. This maps to values in: [NSApplication.appearance](https://developer.apple.com/documentation/appkit/nsapplication/2967170-appearance?language=objc). Setting this will override the

docs/api/utility-process.md

@@ -29,7 +29,7 @@ Process: [Main](../glossary.md#main-process)<br />
     * `inherit`: equivalent to \['ignore', 'inherit', 'inherit']
   * `serviceName` string (optional) - Name of the process that will appear in `name` property of
     [`child-process-gone` event of `app`](app.md#event-child-process-gone).
-    Default is `Node Utility Process`.
+    Default is `node.mojom.NodeService`.
   * `allowLoadingUnsignedLibraries` boolean (optional) _macOS_ - With this flag, the utility process will be
     launched via the `Electron Helper (Plugin).app` helper executable on macOS, which can be
     codesigned with `com.apple.security.cs.disable-library-validation` and

docs/api/web-contents.md

@@ -479,7 +479,18 @@ checking `reason === 'killed'` when you switch to that event.
 Returns:
 
 * `event` Event
-* `details` [RenderProcessGoneDetails](structures/render-process-gone-details.md)
+* `details` Object
+  * `reason` string - The reason the render process is gone.  Possible values:
+    * `clean-exit` - Process exited with an exit code of zero
+    * `abnormal-exit` - Process exited with a non-zero exit code
+    * `killed` - Process was sent a SIGTERM or otherwise killed externally
+    * `crashed` - Process crashed
+    * `oom` - Process ran out of memory
+    * `launch-failed` - Process never successfully launched
+    * `integrity-failure` - Windows code integrity checks failed
+  * `exitCode` Integer - The exit code of the process, unless `reason` is
+    `launch-failed`, in which case `exitCode` will be a platform-specific
+    launch failure error code.
 
 Emitted when the renderer process unexpectedly disappears.  This is normally
 because it was crashed or killed.
@@ -784,7 +795,7 @@ Returns:
   * `frameCharset` string - The character encoding of the frame on which the
     menu was invoked.
   * `inputFieldType` string - If the context menu was invoked on an input
-    field, the type of that field. Possible values include `none`, `plainText`,
+    field, the type of that field. Possible values are `none`, `plainText`,
     `password`, `other`.
   * `spellcheckEnabled` boolean - If the context is editable, whether or not spellchecking is enabled.
   * `menuSourceType` string - Input source that invoked the context menu.
@@ -1046,11 +1057,9 @@ const win = new BrowserWindow()
 win.loadFile('src/index.html')
 ```
 
-#### `contents.downloadURL(url[, options])`
+#### `contents.downloadURL(url)`
 
 * `url` string
-* `options` Object (optional)
-  * `headers` Record<string, string> (optional) - HTTP request headers.
 
 Initiates a download of the resource at `url` without navigating. The
 `will-download` event of `session` will be triggered.
@@ -1211,7 +1220,7 @@ Returns `string` - The user agent for this web page.
 
 * `css` string
 * `options` Object (optional)
-  * `cssOrigin` string (optional) - Can be 'user' or 'author'. Sets the [cascade origin](https://www.w3.org/TR/css3-cascade/#cascade-origin) of the inserted stylesheet. Default is 'author'.
+  * `cssOrigin` string (optional) - Can be either 'user' or 'author'. Sets the [cascade origin](https://www.w3.org/TR/css3-cascade/#cascade-origin) of the inserted stylesheet. Default is 'author'.
 
 Returns `Promise<string>` - A promise that resolves with a key for the inserted CSS that can later be used to remove the CSS via `contents.removeInsertedCSS(key)`.
 
@@ -1637,9 +1646,9 @@ An example of `webContents.printToPDF`:
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const fs = require('node:fs')
-const path = require('node:path')
-const os = require('node:os')
+const fs = require('fs')
+const path = require('path')
+const os = require('os')
 
 const win = new BrowserWindow()
 win.loadURL('http://github.com')

docs/api/web-frame.md

@@ -113,7 +113,7 @@ webFrame.setSpellCheckProvider('en-US', {
 
 * `css` string
 * `options` Object (optional)
-  * `cssOrigin` string (optional) - Can be 'user' or 'author'. Sets the [cascade origin](https://www.w3.org/TR/css3-cascade/#cascade-origin) of the inserted stylesheet. Default is 'author'.
+  * `cssOrigin` string (optional) - Can be either 'user' or 'author'. Sets the [cascade origin](https://www.w3.org/TR/css3-cascade/#cascade-origin) of the inserted stylesheet. Default is 'author'.
 
 Returns `string` - A key for the inserted CSS that can later be used to remove
 the CSS via `webFrame.removeInsertedCSS(key)`.

docs/api/webview-tag.md

@@ -280,11 +280,9 @@ if the page fails to load (see
 Loads the `url` in the webview, the `url` must contain the protocol prefix,
 e.g. the `http://` or `file://`.
 
-### `<webview>.downloadURL(url[, options])`
+### `<webview>.downloadURL(url)`
 
 * `url` string
-* `options` Object (optional)
-  * `headers` Record<string, string> (optional) - HTTP request headers.
 
 Initiates a download of the resource at `url` without navigating.
 
@@ -985,22 +983,9 @@ ipcRenderer.on('ping', () => {
 })
 ```
 
-### Event: 'crashed' _Deprecated_
+### Event: 'crashed'
 
-Fired when the renderer process crashes or is killed.
-
-**Deprecated:** This event is superceded by the `render-process-gone` event
-which contains more information about why the render process disappeared. It
-isn't always because it crashed.
-
-### Event: 'render-process-gone'
-
-Returns:
-
-* `details` [RenderProcessGoneDetails](structures/render-process-gone-details.md)
-
-Fired when the renderer process unexpectedly disappears. This is normally
-because it was crashed or killed.
+Fired when the renderer process is crashed.
 
 ### Event: 'plugin-crashed'
 
@@ -1106,7 +1091,7 @@ Returns:
   * `frameCharset` string - The character encoding of the frame on which the
     menu was invoked.
   * `inputFieldType` string - If the context menu was invoked on an input
-    field, the type of that field. Possible values include `none`, `plainText`,
+    field, the type of that field. Possible values are `none`, `plainText`,
     `password`, `other`.
   * `spellcheckEnabled` boolean - If the context is editable, whether or not spellchecking is enabled.
   * `menuSourceType` string - Input source that invoked the context menu.

docs/api/window-open.md

@@ -59,7 +59,7 @@ window.open('https://github.com', '_blank', 'top=500,left=200,frame=false,nodeIn
 * Non-standard features (that are not handled by Chromium or Electron) given in
   `features` will be passed to any registered `webContents`'s
   `did-create-window` event handler in the `options` argument.
-* `frameName` follows the specification of `target` located in the [native documentation](https://developer.mozilla.org/en-US/docs/Web/API/Window/open#parameters).
+* `frameName` follows the specification of `windowName` located in the [native documentation](https://developer.mozilla.org/en-US/docs/Web/API/Window/open#parameters).
 * When opening `about:blank`, the child window's [`WebPreferences`](structures/web-preferences.md) will be copied
   from the parent window, and there is no way to override it because Chromium
   skips browser side navigation in this case.

docs/breaking-changes.md

@@ -12,68 +12,6 @@ This document uses the following convention to categorize breaking changes:
 * **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
 * **Removed:** An API or feature was removed, and is no longer supported by Electron.
 
-## Planned Breaking API Changes (27.0)
-
-### Removed: macOS 10.13 / 10.14 support
-
-macOS 10.13 (High Sierra) and macOS 10.14 (Mojave) are no longer supported by [Chromium](https://chromium-review.googlesource.com/c/chromium/src/+/4629466).
-
-Older versions of Electron will continue to run on these operating systems, but macOS 10.15 (Catalina)
-or later will be required to run Electron v27.0.0 and higher.
-
-## Planned Breaking API Changes (26.0)
-
-### Deprecated: `webContents.getPrinters`
-
-The `webContents.getPrinters` method has been deprecated. Use
-`webContents.getPrintersAsync` instead.
-
-```js
-const w = new BrowserWindow({ show: false })
-
-// Deprecated
-console.log(w.webContents.getPrinters())
-// Replace with
-w.webContents.getPrintersAsync().then((printers) => {
-  console.log(printers)
-})
-```
-
-### Deprecated: `systemPreferences.{get,set}AppLevelAppearance` and `systemPreferences.appLevelAppearance`
-
-The `systemPreferences.getAppLevelAppearance` and `systemPreferences.setAppLevelAppearance`
-methods have been deprecated, as well as the `systemPreferences.appLevelAppearance` property.
-Use the `nativeTheme` module instead.
-
-```js
-// Deprecated
-systemPreferences.getAppLevelAppearance()
-// Replace with
-nativeTheme.shouldUseDarkColors
-
-// Deprecated
-systemPreferences.appLevelAppearance
-// Replace with
-nativeTheme.shouldUseDarkColors
-
-// Deprecated
-systemPreferences.setAppLevelAppearance('dark')
-// Replace with
-nativeTheme.themeSource = 'dark'
-```
-
-### Deprecated: `alternate-selected-control-text` value for `systemPreferences.getColor`
-
-The `alternate-selected-control-text` value for `systemPreferences.getColor`
-has been deprecated. Use `selected-content-background` instead.
-
-```js
-// Deprecated
-systemPreferences.getColor('alternate-selected-control-text')
-// Replace with
-systemPreferences.getColor('selected-content-background')
-```
-
 ## Planned Breaking API Changes (25.0)
 
 ### Deprecated: `protocol.{register,intercept}{Buffer,String,Stream,File,Http}Protocol`
@@ -595,18 +533,6 @@ to open synchronously scriptable child windows, among other incompatibilities.
 See the documentation for [window.open in Electron](api/window-open.md)
 for more details.
 
-### Deprecated: `app.runningUnderRosettaTranslation`
-
-The `app.runningUnderRosettaTranslation` property has been deprecated.
-Use `app.runningUnderARM64Translation` instead.
-
-```js
-// Deprecated
-console.log(app.runningUnderRosettaTranslation)
-// Replace with
-console.log(app.runningUnderARM64Translation)
-```
-
 ## Planned Breaking API Changes (14.0)
 
 ### Removed: `remote` module

docs/tutorial/asar-archives.md

@@ -42,14 +42,14 @@ $ asar list /path/to/example.asar
 Read a file in the ASAR archive:
 
 ```javascript
-const fs = require('node:fs')
+const fs = require('fs')
 fs.readFileSync('/path/to/example.asar/file.txt')
 ```
 
 List all files under the root of the archive:
 
 ```javascript
-const fs = require('node:fs')
+const fs = require('fs')
 fs.readdirSync('/path/to/example.asar')
 ```
 
@@ -99,7 +99,7 @@ You can also set `process.noAsar` to `true` to disable the support for `asar` in
 the `fs` module:
 
 ```javascript
-const fs = require('node:fs')
+const fs = require('fs')
 process.noAsar = true
 fs.readFileSync('/path/to/example.asar')
 ```

docs/tutorial/asar-integrity.md

@@ -41,9 +41,7 @@ Valid `algorithm` values are currently `SHA256` only.  The `hash` is a hash of t
 ASAR integrity checking is currently disabled by default and can be enabled by toggling a fuse. See [Electron Fuses](fuses.md) for more information on what Electron Fuses are and how they work.  When enabling this fuse you typically also want to enable the `onlyLoadAppFromAsar` fuse otherwise the validity checking can be bypassed via the Electron app code search path.
 
 ```js @ts-nocheck
-const { flipFuses, FuseVersion, FuseV1Options } = require('@electron/fuses')
-
-flipFuses(
+require('@electron/fuses').flipFuses(
   // E.g. /a/b/Foo.app
   pathToPackagedApp,
   {

docs/tutorial/automated-testing.md

@@ -260,7 +260,7 @@ To create a custom driver, we'll use Node.js' [`child_process`](https://nodejs.o
 The test suite will spawn the Electron process, then establish a simple messaging protocol:
 
 ```js title='testDriver.js' @ts-nocheck
-const childProcess = require('node:child_process')
+const childProcess = require('child_process')
 const electronPath = require('electron')
 
 // spawn the process

docs/tutorial/dark-mode.md

@@ -136,7 +136,7 @@ Finally, the `main.js` file represents the main process and contains the actual
 
 ```js
 const { app, BrowserWindow, ipcMain, nativeTheme } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 const createWindow = () => {
   const win = new BrowserWindow({

docs/tutorial/devtools-extension.md

@@ -35,8 +35,8 @@ Using the [React Developer Tools][react-devtools] as an example:
 
    ```javascript
    const { app, session } = require('electron')
-   const path = require('node:path')
-   const os = require('node:os')
+   const path = require('path')
+   const os = require('os')
 
    // on macOS
    const reactDevToolsPath = path.join(

docs/tutorial/electron-timelines.md

@@ -9,11 +9,10 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 
 | Electron | Alpha | Beta | Stable | EOL | Chrome | Node | Supported |
 | ------- | ----- | ------- | ------ | ------ | ---- | ---- | ---- |
-| 27.0.0 |  2023-Aug-17 | 2023-Sep-13 | 2023-Oct-10 | TBD | M118 | TBD | ✅ |
-| 26.0.0 | 2023-Jun-01 | 2023-Jun-27 | 2023-Aug-15 | 2024-Feb-27 | M116 | v18.16 | ✅ |
-| 25.0.0 | 2023-Apr-10 | 2023-May-02 | 2023-May-30 | 2024-Jan-02 | M114 | v18.15 | ✅ |
-| 24.0.0 | 2023-Feb-09 | 2023-Mar-07 | 2023-Apr-04 | 2023-Oct-10 | M112 | v18.14 | ✅ |
-| 23.0.0 | 2022-Dec-01 | 2023-Jan-10 | 2023-Feb-07 | 2023-Aug-15 | M110 | v18.12 | 🚫 |
+| 26.0.0 | 2023-Jun-01 | 2023-Jun-27 | 2023-Aug-08 | TBD | M116 | TBD | ✅ |
+| 25.0.0 | 2023-Apr-10 | 2023-May-02 | 2023-May-30 | 2023-Dec-05 | M114 | TBD | ✅ |
+| 24.0.0 | 2022-Feb-09 | 2023-Mar-07 | 2023-Apr-04 | 2023-Oct-03 | M112 | v18.14 | ✅ |
+| 23.0.0 | 2022-Dec-01 | 2023-Jan-10 | 2023-Feb-07 | 2023-Aug-08 | M110 | v18.12 | ✅ |
 | 22.0.0 | 2022-Sep-29 | 2022-Oct-25 | 2022-Nov-29 | 2023-Oct-10 | M108 | v16.17 | ✅ |
 | 21.0.0 | 2022-Aug-04 | 2022-Aug-30 | 2022-Sep-27 | 2023-Apr-04 | M106 | v16.16 | 🚫 |
 | 20.0.0 | 2022-May-26 | 2022-Jun-21 | 2022-Aug-02 | 2023-Feb-07 | M104 | v16.15 | 🚫 |
@@ -48,6 +47,12 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 * Since Electron 6, Electron major versions have been targeting every other Chromium major version. Each Electron stable should happen on the same day as Chrome stable ([see blog post](https://www.electronjs.org/blog/12-week-cadence)).
 * Since Electron 16, Electron has been releasing major versions on an 8-week cadence in accordance to Chrome's change to a 4-week release cadence ([see blog post](https://www.electronjs.org/blog/8-week-cadence)).
 
+:::info Chrome release dates
+
+Chromium has the own public release schedule [here](https://chromiumdash.appspot.com/schedule).
+
+:::
+
 ## Version support policy
 
 :::info
@@ -72,38 +77,6 @@ and the version prior to that receives the vast majority of those fixes
 as time and bandwidth warrants. The oldest supported release line will receive
 only security fixes directly.
 
-### Chromium version support
-
-:::info Chromium release schedule
-
-Chromium's public release schedule is [here](https://chromiumdash.appspot.com/schedule).
-
-:::
-
-Electron targets Chromium even-number versions, releasing every 8 weeks in concert
-with Chromium's 4-week release schedule. For example, Electron 26 uses Chromium 116, while Electron 27 uses Chromium 118.
-
-### Node.js version support
-
-Electron upgrades its `main` branch to even-number versions of Node.js when they enter Active LTS. The schedule
-is as follows:
-
-<img src="https://raw.githubusercontent.com/nodejs/Release/main/schedule.svg?sanitize=true" alt="Releases">
-
-As a rule, stable branches of Electron do not receive Node.js upgrades after they have been cut.
-If Electron has recently updated its `main` branch to a new major version of Node.js, the next stable
-branch to be cut will be released with the new version.
-
-Patch upgrades of Node that contain significant security or bug fixes, and are submitted
-more than 2 weeks prior to a stable release date, will be accepted into an Electron alpha
-or beta release branch.
-
-Minor upgrades of Node that contain significant security or bug fixes, and are submitted
-more than 2 weeks prior to a stable release date may be accepted into an Electron alpha or
-beta release branch on a case-by-case basis. These requests will be reviewed and voted on
-by the [Releases Working Group](https://github.com/electron/governance/tree/main/wg-releases),
-to ensure minimal disruption for developers who may be consuming alpha or beta releases.
-
 ### Breaking API changes
 
 When an API is changed or removed in a way that breaks existing functionality, the

docs/tutorial/forge-overview.md

@@ -4,48 +4,15 @@ Electron Forge is a tool for packaging and publishing Electron applications.
 It unifies Electron's build tooling ecosystem into
 a single extensible interface so that anyone can jump right into making Electron apps.
 
-<details>
-
-<summary>Alternative tooling</summary>
-
-If you do not want to use Electron Forge for your project, there are other
-third-party tools you can use to distribute your app.
-
-These tools are maintained by members of the Electron community,
-and do not come with official support from the Electron project.
-
-**Electron Builder**
-
-A "complete solution to package and build a ready-for-distribution Electron app"
-that focuses on an integrated experience. [`electron-builder`](https://github.com/electron-userland/electron-builder) adds a single dependency and manages all further requirements internally.
-
-`electron-builder` replaces features and modules used by the Electron
-maintainers (such as the auto-updater) with custom ones.
-
-**Hydraulic Conveyor**
-
-A [desktop app deployment tool](https://hydraulic.dev) that supports
-cross-building/signing of all packages from any OS without the need for
-multi-platform CI, can do synchronous web-style updates on each start
-of the app, requires no code changes, can use plain HTTP servers for updates and
-which focuses on ease of use. Conveyor replaces the Electron auto-updaters
-with Sparkle on macOS, MSIX on Windows, and Linux package repositories.
-
-Conveyor is a commercial tool that is free for open source projects. There's
-an example of [how to package GitHub Desktop](https://hydraulic.dev/blog/8-packaging-electron-apps.html)
-which can be used for learning.
-
-</details>
-
 ## Getting started
 
 The [Electron Forge docs][] contain detailed information on taking your application
 from source code to your end users' machines.
 This includes:
 
-- Packaging your application [(package)][]
-- Generating executables and installers for each OS [(make)][], and,
-- Publishing these files to online platforms to download [(publish)][].
+* Packaging your application [(package)][]
+* Generating executables and installers for each OS [(make)][], and,
+* Publishing these files to online platforms to download [(publish)][].
 
 For beginners, we recommend following through Electron's [tutorial][] to develop, build,
 package and publish your first Electron app. If you have already developed an app on your machine
@@ -53,11 +20,11 @@ and want to start on packaging and distribution, start from [step 5][] of the tu
 
 ## Getting help
 
-- 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 Forge, please check the [GitHub 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 Forge, please check the [GitHub 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.
 
 [Electron Forge Docs]: https://www.electronforge.io/
 [step 5]: ./tutorial-5-packaging.md

docs/tutorial/fuses.md

@@ -68,9 +68,7 @@ The loadBrowserProcessSpecificV8Snapshot fuse changes which V8 snapshot file is
 We've made a handy module, [`@electron/fuses`](https://npmjs.com/package/@electron/fuses), to make flipping these fuses easy.  Check out the README of that module for more details on usage and potential error cases.
 
 ```js @ts-nocheck
-const { flipFuses, FuseVersion, FuseV1Options } = require('@electron/fuses')
-
-flipFuses(
+require('@electron/fuses').flipFuses(
   // Path to electron
   require('electron'),
   // Fuses to flip
@@ -84,7 +82,7 @@ flipFuses(
 You can validate the fuses have been flipped or check the fuse status of an arbitrary Electron app using the fuses CLI.
 
 ```bash
-npx @electron/fuses read --app /Applications/Foo.app
+ npx @electron/fuses read --app /Applications/Foo.app
 ```
 
 ### The hard way

docs/tutorial/ipc.md

@@ -52,7 +52,7 @@ In the main process, set an IPC listener on the `set-title` channel with the `ip
 
 ```javascript {6-10,22} title='main.js (Main Process)'
 const { app, BrowserWindow, ipcMain } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 // ...
 
@@ -183,7 +183,7 @@ provided to the renderer process. Please refer to
 
 ```javascript {6-13,25} title='main.js (Main Process)'
 const { app, BrowserWindow, dialog, ipcMain } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 // ...
 
@@ -378,7 +378,7 @@ target renderer.
 
 ```javascript {11-26} title='main.js (Main Process)'
 const { app, BrowserWindow, Menu, ipcMain } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 function createWindow () {
   const mainWindow = new BrowserWindow({

docs/tutorial/launch-app-from-url-in-another-app.md

@@ -27,7 +27,7 @@ control our application lifecycle and create a native browser window.
 
 ```javascript
 const { app, BrowserWindow, shell } = require('electron')
-const path = require('node:path')
+const path = require('path')
 ```
 
 Next, we will proceed to register our application to handle all "`electron-fiddle://`" protocols.
@@ -63,9 +63,9 @@ const createWindow = () => {
 
 In this next step, we will create our  `BrowserWindow` and tell our application how to handle an event in which an external protocol is clicked.
 
-This code will be different in Windows and Linux compared to MacOS. This is due to both platforms emitting the `second-instance` event rather than the `open-url` event and Windows requiring additional code in order to open the contents of the protocol link within the same Electron instance. Read more about this [here](../api/app.md#apprequestsingleinstancelockadditionaldata).
+This code will be different in Windows compared to MacOS and Linux. This is due to Windows requiring additional code in order to open the contents of the protocol link within the same Electron instance. Read more about this [here](../api/app.md#apprequestsingleinstancelockadditionaldata).
 
-#### Windows and Linux code:
+#### Windows code:
 
 ```javascript @ts-type={mainWindow:Electron.BrowserWindow} @ts-type={createWindow:()=>void}
 const gotTheLock = app.requestSingleInstanceLock()
@@ -80,7 +80,8 @@ if (!gotTheLock) {
       mainWindow.focus()
     }
     // the commandLine is array of strings in which last element is deep link url
-    dialog.showErrorBox('Welcome Back', `You arrived from: ${commandLine.pop()}`)
+    // the url str ends with /
+    dialog.showErrorBox('Welcome Back', `You arrived from: ${commandLine.pop().slice(0, -1)}`)
   })
 
   // Create mainWindow, load the rest of the app, etc...
@@ -90,7 +91,7 @@ if (!gotTheLock) {
 }
 ```
 
-#### MacOS code:
+#### MacOS and Linux code:
 
 ```javascript @ts-type={createWindow:()=>void}
 // This method will be called when Electron has finished

docs/tutorial/message-ports.md

@@ -150,7 +150,7 @@ renderer.
 
 ```js title='renderer.js (Renderer Process)' @ts-nocheck
 // elsewhere in your code to send a message to the other renderers message handler
-window.electronMessagePort.postMessage('ping')
+window.electronMessagePort.postmessage('ping')
 ```
 
 ### Worker process
@@ -303,7 +303,7 @@ without having to step through the isolated world.
 
 ```js title='main.js (Main Process)'
 const { BrowserWindow, app, MessageChannelMain } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 app.whenReady().then(async () => {
   // Create a BrowserWindow with contextIsolation enabled.

docs/tutorial/native-file-drag-drop.md

@@ -22,7 +22,7 @@ In `preload.js` use the [`contextBridge`][] to inject a method `window.electron.
 
 ```js
 const { contextBridge, ipcRenderer } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 contextBridge.exposeInMainWorld('electron', {
   startDrag: (fileName) => {

docs/tutorial/offscreen-rendering.md

@@ -41,7 +41,7 @@ To enable this mode, GPU acceleration has to be disabled by calling the
 
 ```javascript fiddle='docs/fiddles/features/offscreen-rendering'
 const { app, BrowserWindow } = require('electron')
-const fs = require('node:fs')
+const fs = require('fs')
 
 app.disableHardwareAcceleration()
 

docs/tutorial/performance.md

@@ -54,7 +54,7 @@ at once, consider the [Chrome Tracing](https://www.chromium.org/developers/how-t
 
 ### Recommended Reading
 
-* [Get Started With Analyzing Runtime Performance][chrome-devtools-tutorial]
+* [Analyze runtime performance][chrome-devtools-tutorial]
 * [Talk: "Visual Studio Code - The First Second"][vscode-first-second]
 
 ## Checklist: Performance recommendations
@@ -69,6 +69,7 @@ resource-hungry if you attempt these steps.
 5. [Unnecessary polyfills](#5-unnecessary-polyfills)
 6. [Unnecessary or blocking network requests](#6-unnecessary-or-blocking-network-requests)
 7. [Bundle your code](#7-bundle-your-code)
+8. [Call `Menu.setApplicationMenu(null)` when you do not need a default menu](#8-call-menusetapplicationmenunull-when-you-do-not-need-a-default-menu)
 
 ### 1. Carelessly including modules
 
@@ -173,7 +174,7 @@ equally fictitious `foo-parser` module. In traditional Node.js development,
 you might write code that eagerly loads dependencies:
 
 ```js title='parser.js' @ts-expect-error=[2]
-const fs = require('node:fs')
+const fs = require('fs')
 const fooParser = require('foo-parser')
 
 class Parser {
@@ -197,7 +198,7 @@ do this work a little later, when `getParsedFiles()` is actually called?
 
 ```js title='parser.js' @ts-expect-error=[20]
 // "fs" is likely already being loaded, so the `require()` call is cheap
-const fs = require('node:fs')
+const fs = require('fs')
 
 class Parser {
   async getFiles () {
@@ -432,7 +433,7 @@ If you build your own menu or use a frameless window without native menu, you sh
 Call `Menu.setApplicationMenu(null)` before `app.on("ready")`. This will prevent Electron from setting a default menu. See also https://github.com/electron/electron/issues/35512 for a related discussion.
 
 [security]: ./security.md
-[chrome-devtools-tutorial]: https://developers.google.com/web/tools/chrome-devtools/evaluate-performance/
+[chrome-devtools-tutorial]: https://developer.chrome.com/docs/devtools/performance/
 [worker-threads]: https://nodejs.org/api/worker_threads.html
 [web-workers]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Using_web_workers
 [request-idle-callback]: https://developer.mozilla.org/en-US/docs/Web/API/Window/requestIdleCallback

docs/tutorial/process-model.md

@@ -228,23 +228,6 @@ channel with a renderer process using [`MessagePort`][]s. An Electron app can
 always prefer the [UtilityProcess][] API over Node.js [`child_process.fork`][] API when
 there is need to fork a child process from the main process.
 
-## Process-specific module aliases (TypeScript)
-
-Electron's npm package also exports subpaths that contain a subset of
-Electron's TypeScript type definitions.
-
-- `electron/main` includes types for all main process modules.
-- `electron/renderer` includes types for all renderer process modules.
-- `electron/common` includes types for modules that can run in main and renderer processes.
-
-These aliases have no impact on runtime, but can be used for typechecking
-and autocomplete.
-
-```js title="Usage example"
-const { app } = require('electron/main')
-const { shell } = require('electron/common')
-```
-
 [window-mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Window
 [`MessagePort`]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
 [`child_process.fork`]: https://nodejs.org/dist/latest-v16.x/docs/api/child_process.html#child_processforkmodulepath-args-options

docs/tutorial/quick-start.md

@@ -292,7 +292,7 @@ to the `webPreferences.preload` option in your existing `BrowserWindow` construc
 ```js
 const { app, BrowserWindow } = require('electron')
 // include the Node.js 'path' module at the top of your file
-const path = require('node:path')
+const path = require('path')
 
 // modify your existing createWindow() function
 const createWindow = () => {
@@ -358,7 +358,7 @@ The full code is available below:
 
 // Modules to control application life and create native browser window
 const { app, BrowserWindow } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 const createWindow = () => {
   // Create the browser window.

docs/tutorial/recent-documents.md

@@ -26,8 +26,8 @@ the application via JumpList or dock menu, respectively.
 
 ```javascript fiddle='docs/fiddles/features/recent-documents'
 const { app, BrowserWindow } = require('electron')
-const fs = require('node:fs')
-const path = require('node:path')
+const fs = require('fs')
+const path = require('path')
 
 const createWindow = () => {
   const win = new BrowserWindow({

docs/tutorial/represented-file.md

@@ -29,7 +29,7 @@ To set the represented file of window, you can use the
 
 ```javascript fiddle='docs/fiddles/features/represented-file'
 const { app, BrowserWindow } = require('electron')
-const os = require('node:os')
+const os = require('os')
 
 const createWindow = () => {
   const win = new BrowserWindow({

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

@@ -222,26 +222,14 @@ with CommonJS module syntax:
 - [app][app], which controls your application's event lifecycle.
 - [BrowserWindow][browser-window], which creates and manages app windows.
 
-<details><summary>Module capitalization conventions</summary>
+:::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).
 
-</details>
-
-<details><summary>Typed import aliases</summary>
-
-For better type checking when writing TypeScript code, you can choose to import
-main process modules from <code>electron/main</code>.
-
-```js
-const { app, BrowserWindow } = require('electron/main')
-```
-
-For more information, see the [Process Model docs](../tutorial/process-model.md#process-specific-module-aliases-typescript).
-</details>
+:::
 
 :::warning ES Modules in Electron
 

docs/tutorial/tutorial-3-preload.md

@@ -83,7 +83,7 @@ To attach this script to your renderer process, pass its path to the
 
 ```js {2,8-10} title="main.js"
 const { app, BrowserWindow } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 const createWindow = () => {
   const win = new BrowserWindow({
@@ -204,7 +204,7 @@ you send out the `invoke` call from the renderer.
 
 ```js {1,15} title="main.js"
 const { app, BrowserWindow, ipcMain } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 const createWindow = () => {
   const win = new BrowserWindow({

docs/tutorial/window-customization.md

@@ -184,7 +184,7 @@ allowing events such as `mouseleave` to be emitted:
 
 ```javascript title='main.js'
 const { BrowserWindow, ipcMain } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 const win = new BrowserWindow({
   webPreferences: {

docs/tutorial/windows-taskbar.md

@@ -126,7 +126,7 @@ following lines:
 
 ```javascript
 const { BrowserWindow, nativeImage } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 const win = new BrowserWindow()
 

electron_paks.gni

@@ -61,7 +61,6 @@ template("electron_extra_paks") {
       "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
       "$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
       "$root_gen_dir/content/content_resources.pak",
-      "$root_gen_dir/content/gpu_resources.pak",
       "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
       "$root_gen_dir/net/net_resources.pak",
       "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
@@ -75,7 +74,6 @@ template("electron_extra_paks") {
       "//chrome/common:resources",
       "//components/resources",
       "//content:content_resources",
-      "//content/browser/resources/gpu:resources",
       "//content/browser/resources/media:resources",
       "//content/browser/tracing:resources",
       "//content/browser/webrtc/resources",
@@ -176,7 +174,6 @@ template("electron_paks") {
     }
 
     source_patterns = [
-      "${root_gen_dir}/chrome/chromium_strings_",
       "${root_gen_dir}/chrome/locale_settings_",
       "${root_gen_dir}/chrome/platform_locale_settings_",
       "${root_gen_dir}/chrome/generated_resources_",
@@ -192,7 +189,6 @@ template("electron_paks") {
       "${root_gen_dir}/ui/strings/ui_strings_",
     ]
     deps = [
-      "//chrome/app:chromium_strings",
       "//chrome/app:generated_resources",
       "//chrome/app/resources:locale_settings",
       "//chrome/app/resources:platform_locale_settings",

filenames.auto.gni

@@ -115,7 +115,6 @@ auto_filenames = {
     "docs/api/structures/protocol-response.md",
     "docs/api/structures/rectangle.md",
     "docs/api/structures/referrer.md",
-    "docs/api/structures/render-process-gone-details.md",
     "docs/api/structures/resolved-endpoint.md",
     "docs/api/structures/resolved-host.md",
     "docs/api/structures/scrubber-item.md",

filenames.gni

@@ -147,6 +147,8 @@ filenames = {
     "shell/browser/notifications/mac/notification_center_delegate.mm",
     "shell/browser/notifications/mac/notification_presenter_mac.h",
     "shell/browser/notifications/mac/notification_presenter_mac.mm",
+    "shell/browser/osr/osr_host_display_client_mac.mm",
+    "shell/browser/osr/osr_web_contents_view_mac.mm",
     "shell/browser/relauncher_mac.cc",
     "shell/browser/ui/certificate_trust_mac.mm",
     "shell/browser/ui/cocoa/delayed_native_view_host.mm",
@@ -237,6 +239,8 @@ filenames = {
     "shell/app/electron_crash_reporter_client.h",
     "shell/app/electron_main_delegate.cc",
     "shell/app/electron_main_delegate.h",
+    "shell/app/node_main.cc",
+    "shell/app/node_main.h",
     "shell/app/uv_task_runner.cc",
     "shell/app/uv_task_runner.h",
     "shell/browser/api/electron_api_app.cc",
@@ -449,6 +453,16 @@ filenames = {
     "shell/browser/notifications/notification_presenter.h",
     "shell/browser/notifications/platform_notification_service.cc",
     "shell/browser/notifications/platform_notification_service.h",
+    "shell/browser/osr/osr_host_display_client.cc",
+    "shell/browser/osr/osr_host_display_client.h",
+    "shell/browser/osr/osr_render_widget_host_view.cc",
+    "shell/browser/osr/osr_render_widget_host_view.h",
+    "shell/browser/osr/osr_video_consumer.cc",
+    "shell/browser/osr/osr_video_consumer.h",
+    "shell/browser/osr/osr_view_proxy.cc",
+    "shell/browser/osr/osr_view_proxy.h",
+    "shell/browser/osr/osr_web_contents_view.cc",
+    "shell/browser/osr/osr_web_contents_view.h",
     "shell/browser/plugins/plugin_utils.cc",
     "shell/browser/plugins/plugin_utils.h",
     "shell/browser/protocol_registry.cc",
@@ -508,7 +522,6 @@ filenames = {
     "shell/browser/web_contents_preferences.h",
     "shell/browser/web_contents_zoom_controller.cc",
     "shell/browser/web_contents_zoom_controller.h",
-    "shell/browser/web_contents_zoom_observer.h",
     "shell/browser/web_view_guest_delegate.cc",
     "shell/browser/web_view_guest_delegate.h",
     "shell/browser/web_view_manager.cc",
@@ -690,16 +703,12 @@ filenames = {
   ]
 
   lib_sources_extensions = [
-    "shell/browser/extensions/api/extension_action/extension_action_api.cc",
-    "shell/browser/extensions/api/extension_action/extension_action_api.h",
     "shell/browser/extensions/api/management/electron_management_api_delegate.cc",
     "shell/browser/extensions/api/management/electron_management_api_delegate.h",
     "shell/browser/extensions/api/resources_private/resources_private_api.cc",
     "shell/browser/extensions/api/resources_private/resources_private_api.h",
     "shell/browser/extensions/api/runtime/electron_runtime_api_delegate.cc",
     "shell/browser/extensions/api/runtime/electron_runtime_api_delegate.h",
-    "shell/browser/extensions/api/scripting/scripting_api.cc",
-    "shell/browser/extensions/api/scripting/scripting_api.h",
     "shell/browser/extensions/api/streams_private/streams_private_api.cc",
     "shell/browser/extensions/api/streams_private/streams_private_api.h",
     "shell/browser/extensions/api/tabs/tabs_api.cc",

lib/asar/fs-wrapper.ts

@@ -1,5 +1,4 @@
 import { Buffer } from 'buffer';
-import { constants } from 'fs';
 import * as path from 'path';
 import * as util from 'util';
 import type * as Crypto from 'crypto';
@@ -28,7 +27,7 @@ const cachedArchives = new Map<string, NodeJS.AsarArchive>();
 const getOrCreateArchive = (archivePath: string) => {
   const isCached = cachedArchives.has(archivePath);
   if (isCached) {
-    return cachedArchives.get(archivePath)!;
+    return cachedArchives.get(archivePath);
   }
 
   try {
@@ -40,8 +39,6 @@ const getOrCreateArchive = (archivePath: string) => {
   }
 };
 
-process._getOrCreateArchive = getOrCreateArchive;
-
 const asarRe = /\.asar/i;
 
 // Separate asar package's path from full path.
@@ -68,22 +65,18 @@ const gid = process.getgid?.() ?? 0;
 
 const fakeTime = new Date();
 
-enum AsarFileType {
-  kFile = (constants as any).UV_DIRENT_FILE,
-  kDirectory = (constants as any).UV_DIRENT_DIR,
-  kLink = (constants as any).UV_DIRENT_LINK,
-}
-
-const fileTypeToMode = new Map<AsarFileType, number>([
-  [AsarFileType.kFile, constants.S_IFREG],
-  [AsarFileType.kDirectory, constants.S_IFDIR],
-  [AsarFileType.kLink, constants.S_IFLNK]
-]);
-
 const asarStatsToFsStats = function (stats: NodeJS.AsarFileStat) {
-  const { Stats } = require('fs');
+  const { Stats, constants } = require('fs');
 
-  const mode = constants.S_IROTH | constants.S_IRGRP | constants.S_IRUSR | constants.S_IWUSR | fileTypeToMode.get(stats.type)!;
+  let mode = constants.S_IROTH ^ constants.S_IRGRP ^ constants.S_IRUSR ^ constants.S_IWUSR;
+
+  if (stats.isFile) {
+    mode ^= constants.S_IFREG;
+  } else if (stats.isDirectory) {
+    mode ^= constants.S_IFDIR;
+  } else if (stats.isLink) {
+    mode ^= constants.S_IFLNK;
+  }
 
   return new Stats(
     1, // dev
@@ -246,6 +239,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
   const logASARAccess = (asarPath: string, filePath: string, offset: number) => {
     if (!process.env.ELECTRON_LOG_ASAR_READS) return;
     if (!logFDs.has(asarPath)) {
+      const path = require('path');
       const logFilename = `${path.basename(asarPath, '.asar')}-access-log.txt`;
       const logPath = path.join(require('os').tmpdir(), logFilename);
       logFDs.set(asarPath, fs.openSync(logPath, 'a'));
@@ -661,7 +655,13 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
           nextTick(callback!, [error]);
           return;
         }
-        dirents.push(new fs.Dirent(file, stats.type));
+        if (stats.isFile) {
+          dirents.push(new fs.Dirent(file, fs.constants.UV_DIRENT_FILE));
+        } else if (stats.isDirectory) {
+          dirents.push(new fs.Dirent(file, fs.constants.UV_DIRENT_DIR));
+        } else if (stats.isLink) {
+          dirents.push(new fs.Dirent(file, fs.constants.UV_DIRENT_LINK));
+        }
       }
       nextTick(callback!, [null, dirents]);
       return;
@@ -698,7 +698,13 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
         if (!stats) {
           throw createError(AsarError.NOT_FOUND, { asarPath, filePath: childPath });
         }
-        dirents.push(new fs.Dirent(file, stats.type));
+        if (stats.isFile) {
+          dirents.push(new fs.Dirent(file, fs.constants.UV_DIRENT_FILE));
+        } else if (stats.isDirectory) {
+          dirents.push(new fs.Dirent(file, fs.constants.UV_DIRENT_DIR));
+        } else if (stats.isLink) {
+          dirents.push(new fs.Dirent(file, fs.constants.UV_DIRENT_LINK));
+        }
       }
       return dirents;
     }
@@ -749,7 +755,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
     const stats = archive.stat(filePath);
     if (!stats) return -34;
 
-    return (stats.type === AsarFileType.kDirectory) ? 1 : 0;
+    return (stats.isDirectory) ? 1 : 0;
   };
 
   // Calling mkdir for directory inside asar archive should throw ENOTDIR

lib/browser/api/app.ts

@@ -114,11 +114,5 @@ for (const name of events) {
 }
 
 // Deprecation.
-deprecate.event(app, 'gpu-process-crashed', 'child-process-gone', () => {
-  // the old event is still emitted by App::OnGpuProcessCrashed()
-  return undefined;
-});
-
-deprecate.event(app, 'renderer-process-crashed', 'render-process-gone', (event: Electron.Event, webContents: Electron.WebContents, details: Electron.RenderProcessGoneDetails) => {
-  return [event, webContents, details.reason === 'killed'];
-});
+deprecate.event(app, 'gpu-process-crashed', 'child-process-gone');
+deprecate.event(app, 'renderer-process-crashed', 'render-process-gone');

lib/browser/api/menu.ts

@@ -69,7 +69,7 @@ Menu.prototype.popup = function (options = {}) {
   if (options == null || typeof options !== 'object') {
     throw new TypeError('Options must be an object');
   }
-  let { window, x, y, positioningItem, sourceType, callback } = options;
+  let { window, x, y, positioningItem, callback } = options;
 
   // no callback passed
   if (!callback || typeof callback !== 'function') callback = () => {};
@@ -78,7 +78,6 @@ Menu.prototype.popup = function (options = {}) {
   if (typeof x !== 'number') x = -1;
   if (typeof y !== 'number') y = -1;
   if (typeof positioningItem !== 'number') positioningItem = -1;
-  if (typeof sourceType !== 'string' || !sourceType) sourceType = 'mouse';
 
   // find which window to use
   const wins = BaseWindow.getAllWindows();
@@ -92,7 +91,7 @@ Menu.prototype.popup = function (options = {}) {
     }
   }
 
-  this.popupAt(window as unknown as BaseWindow, x, y, positioningItem, sourceType, callback);
+  this.popupAt(window as unknown as BaseWindow, x, y, positioningItem, callback);
   return { browserWindow: window, x, y, position: positioningItem };
 };
 

lib/browser/api/protocol.ts

@@ -9,7 +9,7 @@ const { registerSchemesAsPrivileged, getStandardSchemes, Protocol } = process._l
 const ERR_FAILED = -2;
 const ERR_UNEXPECTED = -9;
 
-const isBuiltInScheme = (scheme: string) => ['http', 'https', 'file'].includes(scheme);
+const isBuiltInScheme = (scheme: string) => scheme === 'http' || scheme === 'https';
 
 function makeStreamFromPipe (pipe: any): ReadableStream {
   const buf = new Uint8Array(1024 * 1024 /* 1 MB */);

lib/browser/api/system-preferences.ts

@@ -1,31 +1,12 @@
-import * as deprecate from '@electron/internal/common/deprecate';
-
 const { systemPreferences } = process._linkedBinding('electron_browser_system_preferences');
 
 if ('getAppLevelAppearance' in systemPreferences) {
   const nativeALAGetter = systemPreferences.getAppLevelAppearance;
   const nativeALASetter = systemPreferences.setAppLevelAppearance;
-  const warnALA = deprecate.warnOnce('appLevelAppearance');
-  const warnALAGetter = deprecate.warnOnce('getAppLevelAppearance function');
-  const warnALASetter = deprecate.warnOnce('setAppLevelAppearance function');
   Object.defineProperty(systemPreferences, 'appLevelAppearance', {
-    get: () => {
-      warnALA();
-      return nativeALAGetter.call(systemPreferences);
-    },
-    set: (appearance) => {
-      warnALA();
-      nativeALASetter.call(systemPreferences, appearance);
-    }
+    get: () => nativeALAGetter.call(systemPreferences),
+    set: (appearance) => nativeALASetter.call(systemPreferences, appearance)
   });
-  systemPreferences.getAppLevelAppearance = () => {
-    warnALAGetter();
-    return nativeALAGetter.call(systemPreferences);
-  };
-  systemPreferences.setAppLevelAppearance = (appearance) => {
-    warnALASetter();
-    nativeALASetter.call(systemPreferences, appearance);
-  };
 }
 
 if ('getEffectiveAppearance' in systemPreferences) {

lib/browser/api/web-contents.ts

@@ -338,53 +338,49 @@ WebContents.prototype.printToPDF = async function (options) {
 // TODO(codebytere): deduplicate argument sanitization by moving rest of
 // print param logic into new file shared between printToPDF and print
 WebContents.prototype.print = function (options: ElectronInternal.WebContentsPrintOptions, callback) {
-  if (typeof options !== 'object') {
-    throw new Error('webContents.print(): Invalid print settings specified.');
-  }
+  if (typeof options === 'object') {
+    const pageSize = options.pageSize ?? 'A4';
+    if (typeof pageSize === 'object') {
+      if (!pageSize.height || !pageSize.width) {
+        throw new Error('height and width properties are required for pageSize');
+      }
 
-  const printSettings: Record<string, any> = { ...options };
+      // Dimensions in Microns - 1 meter = 10^6 microns
+      const height = Math.ceil(pageSize.height);
+      const width = Math.ceil(pageSize.width);
+      if (!isValidCustomPageSize(width, height)) {
+        throw new Error('height and width properties must be minimum 352 microns.');
+      }
 
-  const pageSize = options.pageSize ?? 'A4';
-  if (typeof pageSize === 'object') {
-    if (!pageSize.height || !pageSize.width) {
-      throw new Error('height and width properties are required for pageSize');
+      options.mediaSize = {
+        name: 'CUSTOM',
+        custom_display_name: 'Custom',
+        height_microns: height,
+        width_microns: width,
+        imageable_area_left_microns: 0,
+        imageable_area_bottom_microns: 0,
+        imageable_area_right_microns: width,
+        imageable_area_top_microns: height
+      };
+    } else if (typeof pageSize === 'string' && PDFPageSizes[pageSize]) {
+      const mediaSize = PDFPageSizes[pageSize];
+      options.mediaSize = {
+        ...mediaSize,
+        imageable_area_left_microns: 0,
+        imageable_area_bottom_microns: 0,
+        imageable_area_right_microns: mediaSize.width_microns,
+        imageable_area_top_microns: mediaSize.height_microns
+      };
+    } else {
+      throw new Error(`Unsupported pageSize: ${pageSize}`);
     }
-
-    // Dimensions in Microns - 1 meter = 10^6 microns
-    const height = Math.ceil(pageSize.height);
-    const width = Math.ceil(pageSize.width);
-    if (!isValidCustomPageSize(width, height)) {
-      throw new Error('height and width properties must be minimum 352 microns.');
-    }
-
-    printSettings.mediaSize = {
-      name: 'CUSTOM',
-      custom_display_name: 'Custom',
-      height_microns: height,
-      width_microns: width,
-      imageable_area_left_microns: 0,
-      imageable_area_bottom_microns: 0,
-      imageable_area_right_microns: width,
-      imageable_area_top_microns: height
-    };
-  } else if (typeof pageSize === 'string' && PDFPageSizes[pageSize]) {
-    const mediaSize = PDFPageSizes[pageSize];
-    printSettings.mediaSize = {
-      ...mediaSize,
-      imageable_area_left_microns: 0,
-      imageable_area_bottom_microns: 0,
-      imageable_area_right_microns: mediaSize.width_microns,
-      imageable_area_top_microns: mediaSize.height_microns
-    };
-  } else {
-    throw new Error(`Unsupported pageSize: ${pageSize}`);
   }
 
   if (this._print) {
     if (callback) {
-      this._print(printSettings, callback);
+      this._print(options, callback);
     } else {
-      this._print(printSettings);
+      this._print(options);
     }
   } else {
     console.error('Error: Printing feature is disabled.');
@@ -451,7 +447,6 @@ WebContents.prototype.loadURL = function (url, options) {
     };
 
     let navigationStarted = false;
-    let browserInitiatedInPageNavigation = false;
     const navigationListener = (event: Electron.Event, url: string, isSameDocument: boolean, isMainFrame: boolean) => {
       if (isMainFrame) {
         if (navigationStarted && !isSameDocument) {
@@ -466,7 +461,6 @@ WebContents.prototype.loadURL = function (url, options) {
           // as the routing does not leave the document
           return rejectAndCleanup(-3, 'ERR_ABORTED', url);
         }
-        browserInitiatedInPageNavigation = navigationStarted && isSameDocument;
         navigationStarted = true;
       }
     };
@@ -481,22 +475,17 @@ WebContents.prototype.loadURL = function (url, options) {
       // would be more appropriate.
       rejectAndCleanup(-2, 'ERR_FAILED', url);
     };
-    const finishListenerWhenUserInitiatedNavigation = () => {
-      if (!browserInitiatedInPageNavigation) {
-        finishListener();
-      }
-    };
     const removeListeners = () => {
       this.removeListener('did-finish-load', finishListener);
       this.removeListener('did-fail-load', failListener);
-      this.removeListener('did-navigate-in-page', finishListenerWhenUserInitiatedNavigation);
+      this.removeListener('did-navigate-in-page', finishListener);
       this.removeListener('did-start-navigation', navigationListener);
       this.removeListener('did-stop-loading', stopLoadingListener);
       this.removeListener('destroyed', stopLoadingListener);
     };
     this.on('did-finish-load', finishListener);
     this.on('did-fail-load', failListener);
-    this.on('did-navigate-in-page', finishListenerWhenUserInitiatedNavigation);
+    this.on('did-navigate-in-page', finishListener);
     this.on('did-start-navigation', navigationListener);
     this.on('did-stop-loading', stopLoadingListener);
     this.on('destroyed', stopLoadingListener);
@@ -669,8 +658,8 @@ WebContents.prototype._init = function () {
     ipcMain.emit(channel, event, message);
   });
 
-  deprecate.event(this, 'crashed', 'render-process-gone', (event: Electron.Event, details: Electron.RenderProcessGoneDetails) => {
-    return [event, details.reason === 'killed'];
+  this.on('crashed', (event, ...args) => {
+    app.emit('renderer-process-crashed', event, this, ...args);
   });
 
   this.on('render-process-gone', (event, details) => {

lib/browser/guest-view-manager.ts

@@ -8,7 +8,7 @@ import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 interface GuestInstance {
   elementInstanceId: number;
-  visibilityState?: VisibilityState;
+  visibilityState?: DocumentVisibilityState;
   embedder: Electron.WebContents;
   guest: Electron.WebContents;
 }
@@ -229,7 +229,7 @@ const watchEmbedder = function (embedder: Electron.WebContents) {
   watchedEmbedders.add(embedder);
 
   // Forward embedder window visibility change events to guest
-  const onVisibilityChange = function (visibilityState: VisibilityState) {
+  const onVisibilityChange = function (visibilityState: DocumentVisibilityState) {
     for (const guestInstance of guestInstances.values()) {
       guestInstance.visibilityState = visibilityState;
       if (guestInstance.embedder === embedder) {

lib/browser/init.ts

@@ -84,20 +84,11 @@ const v8Util = process._linkedBinding('electron_common_v8_util');
 let packagePath = null;
 let packageJson = null;
 const searchPaths: string[] = v8Util.getHiddenValue(global, 'appSearchPaths');
-const searchPathsOnlyLoadASAR: boolean = v8Util.getHiddenValue(global, 'appSearchPathsOnlyLoadASAR');
-// Borrow the _getOrCreateArchive asar helper
-const getOrCreateArchive = process._getOrCreateArchive;
-delete process._getOrCreateArchive;
 
 if (process.resourcesPath) {
   for (packagePath of searchPaths) {
     try {
       packagePath = path.join(process.resourcesPath, packagePath);
-      if (searchPathsOnlyLoadASAR) {
-        if (!getOrCreateArchive?.(packagePath)) {
-          continue;
-        }
-      }
       packageJson = Module._load(path.join(packagePath, 'package.json'));
       break;
     } catch {

lib/common/deprecate.ts

@@ -66,17 +66,14 @@ export function renameFunction<T extends Function> (fn: T, newName: string): T {
 }
 
 // change the name of an event
-export function event (emitter: NodeJS.EventEmitter, oldName: string, newName: string, transformer: (...args: any[]) => any[] | undefined = (...args) => args) {
+export function event (emitter: NodeJS.EventEmitter, oldName: string, newName: string) {
   const warn = newName.startsWith('-') /* internal event */
     ? warnOnce(`${oldName} event`)
     : warnOnce(`${oldName} event`, `${newName} event`);
   return emitter.on(newName, function (this: NodeJS.EventEmitter, ...args) {
     if (this.listenerCount(oldName) !== 0) {
       warn();
-      const transformedArgs = transformer(...args);
-      if (transformedArgs) {
-        this.emit(oldName, ...transformedArgs);
-      }
+      this.emit(oldName, ...args);
     }
   });
 }
@@ -113,7 +110,7 @@ export function removeProperty<T, K extends (keyof T & string)>(object: T, remov
 }
 
 // change the name of a property
-export function renameProperty<T, K extends (keyof T & string)>(object: T, oldName: string, newName: K): T {
+export function renameProperty<T extends Object, K extends (keyof T & string)>(object: T, oldName: string, newName: K): T {
   const warn = warnOnce(oldName, newName);
 
   // if the new property isn't there yet,

lib/renderer/common-init.ts

@@ -17,13 +17,13 @@ const isWebView = mainFrame.getWebPreference('isWebView');
 // ElectronApiServiceImpl will look for the "ipcNative" hidden object when
 // invoking the 'onMessage' callback.
 v8Util.setHiddenValue(global, 'ipcNative', {
-  onMessage (internal: boolean, channel: string, ports: MessagePort[], args: any[], senderId: number, senderIsMainFrame: boolean) {
+  onMessage (internal: boolean, channel: string, ports: MessagePort[], args: any[], senderId: number) {
     if (internal && senderId !== 0) {
       console.error(`Message ${channel} sent by unexpected WebContents (${senderId})`);
       return;
     }
     const sender = internal ? ipcRendererInternal : ipcRenderer;
-    sender.emit(channel, { sender, senderId, ...(senderId ? { senderIsMainFrame } : {}), ports }, ...args);
+    sender.emit(channel, { sender, senderId, ports }, ...args);
   }
 });
 

lib/renderer/init.ts

@@ -122,7 +122,10 @@ if (nodeIntegration) {
   }
 }
 
-const { preloadPaths } = ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_NONSANDBOX_LOAD);
+const { preloadPaths } = ipcRendererUtils.invokeSync<{
+  preloadPaths: string[]
+}>(IPC_MESSAGES.BROWSER_NONSANDBOX_LOAD);
+
 // Load the preload scripts.
 for (const preloadScript of preloadPaths) {
   try {

lib/renderer/window-setup.ts

@@ -30,7 +30,7 @@ export const windowSetup = (isWebView: boolean, isHiddenPage: boolean) => {
     let cachedVisibilityState = isHiddenPage ? 'hidden' : 'visible';
 
     // Subscribe to visibilityState changes.
-    ipcRendererInternal.on(IPC_MESSAGES.GUEST_INSTANCE_VISIBILITY_CHANGE, function (_event, visibilityState: VisibilityState) {
+    ipcRendererInternal.on(IPC_MESSAGES.GUEST_INSTANCE_VISIBILITY_CHANGE, function (_event, visibilityState: DocumentVisibilityState) {
       if (cachedVisibilityState !== visibilityState) {
         cachedVisibilityState = visibilityState;
         document.dispatchEvent(new Event('visibilitychange'));

lib/sandboxed_renderer/init.ts

@@ -30,7 +30,17 @@ Object.setPrototypeOf(process, EventEmitter.prototype);
 const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal') as typeof ipcRendererInternalModule;
 const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils') as typeof ipcRendererUtilsModule;
 
-const { preloadScripts, process: processProps } = ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_SANDBOX_LOAD);
+const {
+  preloadScripts,
+  process: processProps
+} = ipcRendererUtils.invokeSync<{
+  preloadScripts: {
+    preloadPath: string;
+    preloadSrc: string | null;
+    preloadError: null | Error;
+  }[];
+  process: NodeJS.Process;
+}>(IPC_MESSAGES.BROWSER_SANDBOX_LOAD);
 
 const electron = require('electron');
 

package.json

@@ -70,7 +70,7 @@
     "timers-browserify": "1.4.2",
     "ts-loader": "^8.0.2",
     "ts-node": "6.2.0",
-    "typescript": "^4.5.5",
+    "typescript": "^5.1.2",
     "url": "^0.11.0",
     "webpack": "^5.76.0",
     "webpack-cli": "^4.10.0",

patches/angle/.patches

@@ -1,3 +0,0 @@
-cherry-pick-285c7712c506.patch
-cherry-pick-2bf945775fe6.patch
-cherry-pick-cafe56b591ed.patch

patches/angle/cherry-pick-285c7712c506.patch

@@ -1,153 +0,0 @@
-From 285c7712c50654e3d7238b059c4631bc91285514 Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Thu, 13 Jul 2023 15:23:49 -0400
-Subject: [PATCH] M116: Translator: Unconditionally limit variable sizes
-
-... instead of just for WebGL.  This is to avoid hitting driver bugs
-that were prevented with this check for WebGL on a compromised renderer
-that can create non-WebGL contexts.
-
-Bug: chromium:1464682
-Change-Id: I2b1c5a8c51f06225f5f850109d30778d97e574c7
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4717371
-Reviewed-by: Roman Lavrov <romanl@google.com>
----
-
-diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
-index 7b1ac4e..383feeb 100644
---- a/src/compiler/translator/Compiler.cpp
-+++ b/src/compiler/translator/Compiler.cpp
-@@ -397,9 +397,10 @@
- 
- bool TCompiler::shouldLimitTypeSizes() const
- {
--    // WebGL shaders limit the size of variables' types in shaders,
--    // including arrays, structs and interface blocks.
--    return IsWebGLBasedSpec(mShaderSpec);
-+    // Prevent unrealistically large variable sizes in shaders.  This works around driver bugs
-+    // around int-size limits (such as 2GB).  The limits are generously large enough that no real
-+    // shader should ever hit it.
-+    return true;
- }
- 
- bool TCompiler::Init(const ShBuiltInResources &resources)
-diff --git a/src/compiler/translator/ValidateTypeSizeLimitations.cpp b/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-index 2a033ad..19a4821 100644
---- a/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-+++ b/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-@@ -23,10 +23,10 @@
- // Arbitrarily enforce that all types declared with a size in bytes of over 2 GB will cause
- // compilation failure.
- //
--// For local and global variables, the limit is much lower (1MB) as that much memory won't fit in
-+// For local and global variables, the limit is much lower (16MB) as that much memory won't fit in
- // the GPU registers anyway.
- constexpr size_t kMaxVariableSizeInBytes        = static_cast<size_t>(2) * 1024 * 1024 * 1024;
--constexpr size_t kMaxPrivateVariableSizeInBytes = static_cast<size_t>(1) * 1024 * 1024;
-+constexpr size_t kMaxPrivateVariableSizeInBytes = static_cast<size_t>(16) * 1024 * 1024;
- 
- // Traverses intermediate tree to ensure that the shader does not
- // exceed certain implementation-defined limits on the sizes of types.
-diff --git a/src/compiler/translator/util.cpp b/src/compiler/translator/util.cpp
-index a91f8b0..a866b25 100644
---- a/src/compiler/translator/util.cpp
-+++ b/src/compiler/translator/util.cpp
-@@ -282,6 +282,9 @@
- 
-             return kBoolGLType[type.getNominalSize() - 1];
- 
-+        case EbtYuvCscStandardEXT:
-+            return GL_UNSIGNED_INT;
-+
-         case EbtSampler2D:
-             return GL_SAMPLER_2D;
-         case EbtSampler3D:
-diff --git a/src/tests/gl_tests/WebGLCompatibilityTest.cpp b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-index 9ae56f5..a8d2ce4 100644
---- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-@@ -5284,8 +5284,8 @@
- 
-     constexpr char kVSArrayTooLarge[] =
-         R"(varying vec4 color;
--// 1 MB / 32 aligned bytes per mat2 = 32768
--const int array_size = 32769;
-+// 16 MB / 32 aligned bytes per mat2 = 524288
-+const int array_size = 524289;
- void main()
- {
-     mat2 array[array_size];
-@@ -5297,7 +5297,7 @@
- 
-     constexpr char kVSArrayMuchTooLarge[] =
-         R"(varying vec4 color;
--const int array_size = 55600;
-+const int array_size = 757000;
- void main()
- {
-     mat2 array[array_size];
-@@ -5361,9 +5361,9 @@
-     constexpr char kTooLargeGlobalMemory1[] =
-         R"(precision mediump float;
- 
--// 1 MB / 16 bytes per vec4 = 65536
--vec4 array[32768];
--vec4 array2[32769];
-+// 16 MB / 16 bytes per vec4 = 1048576
-+vec4 array[524288];
-+vec4 array2[524289];
- 
- void main()
- {
-@@ -5376,9 +5376,9 @@
-     constexpr char kTooLargeGlobalMemory2[] =
-         R"(precision mediump float;
- 
--// 1 MB / 16 bytes per vec4 = 65536
--vec4 array[32767];
--vec4 array2[32767];
-+// 16 MB / 16 bytes per vec4 = 1048576
-+vec4 array[524287];
-+vec4 array2[524287];
- vec4 x, y, z;
- 
- void main()
-@@ -5392,12 +5392,12 @@
-     constexpr char kTooLargeGlobalAndLocalMemory1[] =
-         R"(precision mediump float;
- 
--// 1 MB / 16 bytes per vec4 = 65536
--vec4 array[32768];
-+// 16 MB / 16 bytes per vec4 = 1048576
-+vec4 array[524288];
- 
- void main()
- {
--    vec4 array2[32769];
-+    vec4 array2[524289];
-     if (array[0].x + array[1].x == 2.0)
-         gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
-     else
-@@ -5408,18 +5408,18 @@
-     constexpr char kTooLargeGlobalAndLocalMemory2[] =
-         R"(precision mediump float;
- 
--// 1 MB / 16 bytes per vec4 = 65536
--vec4 array[32768];
-+// 16 MB / 16 bytes per vec4 = 1048576
-+vec4 array[524288];
- 
- float f()
- {
--    vec4 array2[16384];
-+    vec4 array2[524288];
-     return array2[0].x;
- }
- 
- float g()
- {
--    vec4 array3[16383];
-+    vec4 array3[524287];
-     return array3[0].x;
- }
- 

patches/angle/cherry-pick-2bf945775fe6.patch

@@ -1,197 +0,0 @@
-From 2bf945775fe634eb9e420c2263dae6043bbb5ece Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Fri, 14 Jul 2023 12:30:15 -0400
-Subject: [PATCH] M116: Translator: Limit variable sizes vs uint overflow
-
-Bug: chromium:1464680
-Change-Id: Iee41a2da7a7a330e6cc4d6da59a6e9836ee9dd36
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4717372
-Reviewed-by: Roman Lavrov <romanl@google.com>
----
-
-diff --git a/src/compiler/translator/ValidateTypeSizeLimitations.cpp b/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-index 19a4821..f0ff9cb 100644
---- a/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-+++ b/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-@@ -7,6 +7,7 @@
- #include "compiler/translator/ValidateTypeSizeLimitations.h"
- 
- #include "angle_gl.h"
-+#include "common/mathutil.h"
- #include "compiler/translator/Diagnostics.h"
- #include "compiler/translator/Symbol.h"
- #include "compiler/translator/SymbolTable.h"
-@@ -113,7 +114,8 @@
- 
-     void validateTotalPrivateVariableSize()
-     {
--        if (mTotalPrivateVariablesSize > kMaxPrivateVariableSizeInBytes)
-+        if (mTotalPrivateVariablesSize.ValueOrDefault(std::numeric_limits<size_t>::max()) >
-+            kMaxPrivateVariableSizeInBytes)
-         {
-             mDiagnostics->error(
-                 TSourceLoc{},
-@@ -231,7 +233,7 @@
-     TDiagnostics *mDiagnostics;
-     std::vector<int> mLoopSymbolIds;
- 
--    size_t mTotalPrivateVariablesSize;
-+    angle::base::CheckedNumeric<size_t> mTotalPrivateVariablesSize;
- };
- 
- }  // namespace
-diff --git a/src/tests/gl_tests/WebGLCompatibilityTest.cpp b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-index a8d2ce4..542d49f 100644
---- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-@@ -5426,7 +5426,7 @@
- float h()
- {
-     vec4 value;
--    float value2
-+    float value2;
-     return value.x + value2;
- }
- 
-@@ -5438,6 +5438,131 @@
-         gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
- })";
- 
-+    constexpr char kTooLargeGlobalMemoryOverflow[] =
-+        R"(precision mediump float;
-+
-+// 16 MB / 16 bytes per vec4 = 1048576
-+// Create 256 arrays so each is small, but the total overflows a 32-bit number
-+vec4 array[1048576], array2[1048576], array3[1048576], array4[1048576], array5[1048576];
-+vec4 array6[1048576], array7[1048576], array8[1048576], array9[1048576], array10[1048576];
-+vec4 array11[1048576], array12[1048576], array13[1048576], array14[1048576], array15[1048576];
-+vec4 array16[1048576], array17[1048576], array18[1048576], array19[1048576], array20[1048576];
-+vec4 array21[1048576], array22[1048576], array23[1048576], array24[1048576], array25[1048576];
-+vec4 array26[1048576], array27[1048576], array28[1048576], array29[1048576], array30[1048576];
-+vec4 array31[1048576], array32[1048576], array33[1048576], array34[1048576], array35[1048576];
-+vec4 array36[1048576], array37[1048576], array38[1048576], array39[1048576], array40[1048576];
-+vec4 array41[1048576], array42[1048576], array43[1048576], array44[1048576], array45[1048576];
-+vec4 array46[1048576], array47[1048576], array48[1048576], array49[1048576], array50[1048576];
-+vec4 array51[1048576], array52[1048576], array53[1048576], array54[1048576], array55[1048576];
-+vec4 array56[1048576], array57[1048576], array58[1048576], array59[1048576], array60[1048576];
-+vec4 array61[1048576], array62[1048576], array63[1048576], array64[1048576], array65[1048576];
-+vec4 array66[1048576], array67[1048576], array68[1048576], array69[1048576], array70[1048576];
-+vec4 array71[1048576], array72[1048576], array73[1048576], array74[1048576], array75[1048576];
-+vec4 array76[1048576], array77[1048576], array78[1048576], array79[1048576], array80[1048576];
-+vec4 array81[1048576], array82[1048576], array83[1048576], array84[1048576], array85[1048576];
-+vec4 array86[1048576], array87[1048576], array88[1048576], array89[1048576], array90[1048576];
-+vec4 array91[1048576], array92[1048576], array93[1048576], array94[1048576], array95[1048576];
-+vec4 array96[1048576], array97[1048576], array98[1048576], array99[1048576], array100[1048576];
-+vec4 array101[1048576], array102[1048576], array103[1048576], array104[1048576], array105[1048576];
-+vec4 array106[1048576], array107[1048576], array108[1048576], array109[1048576], array110[1048576];
-+vec4 array111[1048576], array112[1048576], array113[1048576], array114[1048576], array115[1048576];
-+vec4 array116[1048576], array117[1048576], array118[1048576], array119[1048576], array120[1048576];
-+vec4 array121[1048576], array122[1048576], array123[1048576], array124[1048576], array125[1048576];
-+vec4 array126[1048576], array127[1048576], array128[1048576], array129[1048576], array130[1048576];
-+vec4 array131[1048576], array132[1048576], array133[1048576], array134[1048576], array135[1048576];
-+vec4 array136[1048576], array137[1048576], array138[1048576], array139[1048576], array140[1048576];
-+vec4 array141[1048576], array142[1048576], array143[1048576], array144[1048576], array145[1048576];
-+vec4 array146[1048576], array147[1048576], array148[1048576], array149[1048576], array150[1048576];
-+vec4 array151[1048576], array152[1048576], array153[1048576], array154[1048576], array155[1048576];
-+vec4 array156[1048576], array157[1048576], array158[1048576], array159[1048576], array160[1048576];
-+vec4 array161[1048576], array162[1048576], array163[1048576], array164[1048576], array165[1048576];
-+vec4 array166[1048576], array167[1048576], array168[1048576], array169[1048576], array170[1048576];
-+vec4 array171[1048576], array172[1048576], array173[1048576], array174[1048576], array175[1048576];
-+vec4 array176[1048576], array177[1048576], array178[1048576], array179[1048576], array180[1048576];
-+vec4 array181[1048576], array182[1048576], array183[1048576], array184[1048576], array185[1048576];
-+vec4 array186[1048576], array187[1048576], array188[1048576], array189[1048576], array190[1048576];
-+vec4 array191[1048576], array192[1048576], array193[1048576], array194[1048576], array195[1048576];
-+vec4 array196[1048576], array197[1048576], array198[1048576], array199[1048576], array200[1048576];
-+vec4 array201[1048576], array202[1048576], array203[1048576], array204[1048576], array205[1048576];
-+vec4 array206[1048576], array207[1048576], array208[1048576], array209[1048576], array210[1048576];
-+vec4 array211[1048576], array212[1048576], array213[1048576], array214[1048576], array215[1048576];
-+vec4 array216[1048576], array217[1048576], array218[1048576], array219[1048576], array220[1048576];
-+vec4 array221[1048576], array222[1048576], array223[1048576], array224[1048576], array225[1048576];
-+vec4 array226[1048576], array227[1048576], array228[1048576], array229[1048576], array230[1048576];
-+vec4 array231[1048576], array232[1048576], array233[1048576], array234[1048576], array235[1048576];
-+vec4 array236[1048576], array237[1048576], array238[1048576], array239[1048576], array240[1048576];
-+vec4 array241[1048576], array242[1048576], array243[1048576], array244[1048576], array245[1048576];
-+vec4 array246[1048576], array247[1048576], array248[1048576], array249[1048576], array250[1048576];
-+vec4 array251[1048576], array252[1048576], array253[1048576], array254[1048576], array255[1048576];
-+vec4 array256[1048576];
-+
-+void main()
-+{
-+    float f = array[0].x; f += array2[0].x; f += array3[0].x; f += array4[0].x; f += array5[0].x;
-+    f += array6[0].x; f += array7[0].x; f += array8[0].x; f += array9[0].x; f += array10[0].x;
-+    f += array11[0].x; f += array12[0].x; f += array13[0].x; f += array14[0].x; f += array15[0].x;
-+    f += array16[0].x; f += array17[0].x; f += array18[0].x; f += array19[0].x; f += array20[0].x;
-+    f += array21[0].x; f += array22[0].x; f += array23[0].x; f += array24[0].x; f += array25[0].x;
-+    f += array26[0].x; f += array27[0].x; f += array28[0].x; f += array29[0].x; f += array30[0].x;
-+    f += array31[0].x; f += array32[0].x; f += array33[0].x; f += array34[0].x; f += array35[0].x;
-+    f += array36[0].x; f += array37[0].x; f += array38[0].x; f += array39[0].x; f += array40[0].x;
-+    f += array41[0].x; f += array42[0].x; f += array43[0].x; f += array44[0].x; f += array45[0].x;
-+    f += array46[0].x; f += array47[0].x; f += array48[0].x; f += array49[0].x; f += array50[0].x;
-+    f += array51[0].x; f += array52[0].x; f += array53[0].x; f += array54[0].x; f += array55[0].x;
-+    f += array56[0].x; f += array57[0].x; f += array58[0].x; f += array59[0].x; f += array60[0].x;
-+    f += array61[0].x; f += array62[0].x; f += array63[0].x; f += array64[0].x; f += array65[0].x;
-+    f += array66[0].x; f += array67[0].x; f += array68[0].x; f += array69[0].x; f += array70[0].x;
-+    f += array71[0].x; f += array72[0].x; f += array73[0].x; f += array74[0].x; f += array75[0].x;
-+    f += array76[0].x; f += array77[0].x; f += array78[0].x; f += array79[0].x; f += array80[0].x;
-+    f += array81[0].x; f += array82[0].x; f += array83[0].x; f += array84[0].x; f += array85[0].x;
-+    f += array86[0].x; f += array87[0].x; f += array88[0].x; f += array89[0].x; f += array90[0].x;
-+    f += array91[0].x; f += array92[0].x; f += array93[0].x; f += array94[0].x; f += array95[0].x;
-+    f += array96[0].x; f += array97[0].x; f += array98[0].x; f += array99[0].x; f += array100[0].x;
-+    f += array101[0].x; f += array102[0].x; f += array103[0].x; f += array104[0].x;
-+    f += array105[0].x; f += array106[0].x; f += array107[0].x; f += array108[0].x;
-+    f += array109[0].x; f += array110[0].x; f += array111[0].x; f += array112[0].x;
-+    f += array113[0].x; f += array114[0].x; f += array115[0].x; f += array116[0].x;
-+    f += array117[0].x; f += array118[0].x; f += array119[0].x; f += array120[0].x;
-+    f += array121[0].x; f += array122[0].x; f += array123[0].x; f += array124[0].x;
-+    f += array125[0].x; f += array126[0].x; f += array127[0].x; f += array128[0].x;
-+    f += array129[0].x; f += array130[0].x; f += array131[0].x; f += array132[0].x;
-+    f += array133[0].x; f += array134[0].x; f += array135[0].x; f += array136[0].x;
-+    f += array137[0].x; f += array138[0].x; f += array139[0].x; f += array140[0].x;
-+    f += array141[0].x; f += array142[0].x; f += array143[0].x; f += array144[0].x;
-+    f += array145[0].x; f += array146[0].x; f += array147[0].x; f += array148[0].x;
-+    f += array149[0].x; f += array150[0].x; f += array151[0].x; f += array152[0].x;
-+    f += array153[0].x; f += array154[0].x; f += array155[0].x; f += array156[0].x;
-+    f += array157[0].x; f += array158[0].x; f += array159[0].x; f += array160[0].x;
-+    f += array161[0].x; f += array162[0].x; f += array163[0].x; f += array164[0].x;
-+    f += array165[0].x; f += array166[0].x; f += array167[0].x; f += array168[0].x;
-+    f += array169[0].x; f += array170[0].x; f += array171[0].x; f += array172[0].x;
-+    f += array173[0].x; f += array174[0].x; f += array175[0].x; f += array176[0].x;
-+    f += array177[0].x; f += array178[0].x; f += array179[0].x; f += array180[0].x;
-+    f += array181[0].x; f += array182[0].x; f += array183[0].x; f += array184[0].x;
-+    f += array185[0].x; f += array186[0].x; f += array187[0].x; f += array188[0].x;
-+    f += array189[0].x; f += array190[0].x; f += array191[0].x; f += array192[0].x;
-+    f += array193[0].x; f += array194[0].x; f += array195[0].x; f += array196[0].x;
-+    f += array197[0].x; f += array198[0].x; f += array199[0].x; f += array200[0].x;
-+    f += array201[0].x; f += array202[0].x; f += array203[0].x; f += array204[0].x;
-+    f += array205[0].x; f += array206[0].x; f += array207[0].x; f += array208[0].x;
-+    f += array209[0].x; f += array210[0].x; f += array211[0].x; f += array212[0].x;
-+    f += array213[0].x; f += array214[0].x; f += array215[0].x; f += array216[0].x;
-+    f += array217[0].x; f += array218[0].x; f += array219[0].x; f += array220[0].x;
-+    f += array221[0].x; f += array222[0].x; f += array223[0].x; f += array224[0].x;
-+    f += array225[0].x; f += array226[0].x; f += array227[0].x; f += array228[0].x;
-+    f += array229[0].x; f += array230[0].x; f += array231[0].x; f += array232[0].x;
-+    f += array233[0].x; f += array234[0].x; f += array235[0].x; f += array236[0].x;
-+    f += array237[0].x; f += array238[0].x; f += array239[0].x; f += array240[0].x;
-+    f += array241[0].x; f += array242[0].x; f += array243[0].x; f += array244[0].x;
-+    f += array245[0].x; f += array246[0].x; f += array247[0].x; f += array248[0].x;
-+    f += array249[0].x; f += array250[0].x; f += array251[0].x; f += array252[0].x;
-+    f += array253[0].x; f += array254[0].x; f += array255[0].x; f += array256[0].x;
-+    if (f == 2.0)
-+        gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
-+    else
-+        gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
-+})";
-+
-     GLuint program = CompileProgram(essl1_shaders::vs::Simple(), kTooLargeGlobalMemory1);
-     EXPECT_EQ(0u, program);
- 
-@@ -5449,6 +5574,9 @@
- 
-     program = CompileProgram(essl1_shaders::vs::Simple(), kTooLargeGlobalAndLocalMemory2);
-     EXPECT_EQ(0u, program);
-+
-+    program = CompileProgram(essl1_shaders::vs::Simple(), kTooLargeGlobalMemoryOverflow);
-+    EXPECT_EQ(0u, program);
- }
- 
- // Linking should fail when corresponding vertex/fragment uniform blocks have different precision

patches/angle/cherry-pick-cafe56b591ed.patch

@@ -1,286 +0,0 @@
-From cafe56b591edb77f041be70b58cac3a61565644a Mon Sep 17 00:00:00 2001
-From: Geoff Lang <geofflang@chromium.org>
-Date: Fri, 23 Jun 2023 14:46:28 -0400
-Subject: [PATCH] M116: GL: Ensure all instanced attributes have a buffer with data
-
-Apple OpenGL drivers sometimes crash when given an instanced draw with
-a buffer that has never been given data.
-
-It's not efficient to check if the attribute is both zero-sized and
-instanced so just ensure that every time a zero-sized buffer is bound
-to an attribute, it gets initialized with some data.
-
-Bug: chromium:1456243
-Change-Id: I66b7c7017843153db2df3bc50010cba765d03c5f
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4642048
-Commit-Queue: Geoff Lang <geofflang@chromium.org>
-Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
-(cherry picked from commit 4e6124dae892690204f8e5996aeaad14f45e0a97)
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4727452
----
-
-diff --git a/include/platform/FeaturesGL_autogen.h b/include/platform/FeaturesGL_autogen.h
-index aa0565c..2f6e094 100644
---- a/include/platform/FeaturesGL_autogen.h
-+++ b/include/platform/FeaturesGL_autogen.h
-@@ -501,6 +501,12 @@
-         "supportsShaderPixelLocalStorageEXT", FeatureCategory::OpenGLFeatures,
-         "Backend GL context supports EXT_shader_pixel_local_storage extension", &members,
-         "http://anglebug.com/7279"};
-+
-+    FeatureInfo ensureNonEmptyBufferIsBoundForDraw = {
-+        "ensureNonEmptyBufferIsBoundForDraw", FeatureCategory::OpenGLFeatures,
-+        "Apple OpenGL drivers crash when drawing with a zero-sized buffer bound using a non-zero "
-+        "divisor.",
-+        &members, "http://crbug.com/1456243"};
- };
- 
- inline FeaturesGL::FeaturesGL()  = default;
-diff --git a/include/platform/gl_features.json b/include/platform/gl_features.json
-index 032f29a..b358cea 100644
---- a/include/platform/gl_features.json
-+++ b/include/platform/gl_features.json
-@@ -699,6 +699,14 @@
-                 "Backend GL context supports EXT_shader_pixel_local_storage extension"
-             ],
-             "issue": "http://anglebug.com/7279"
-+        },
-+        {
-+            "name": "ensure_non_empty_buffer_is_bound_for_draw",
-+            "category": "Features",
-+            "description": [
-+                "Apple OpenGL drivers crash when drawing with a zero-sized buffer bound using a non-zero divisor."
-+            ],
-+            "issue": "http://crbug.com/1456243"
-         }
-     ]
- }
-diff --git a/scripts/code_generation_hashes/ANGLE_features.json b/scripts/code_generation_hashes/ANGLE_features.json
-index d4576c2..503001c 100644
---- a/scripts/code_generation_hashes/ANGLE_features.json
-+++ b/scripts/code_generation_hashes/ANGLE_features.json
-@@ -2,7 +2,7 @@
-   "include/platform/FeaturesD3D_autogen.h":
-     "9923fb44d0a6f31948d0c8f46ee1d9e2",
-   "include/platform/FeaturesGL_autogen.h":
--    "a795a806d71b0e6d1f9e6d95c6e11971",
-+    "fef16ab3946346a2a7d5b76bb39471a4",
-   "include/platform/FeaturesMtl_autogen.h":
-     "407426c8874de9295482ace9c94bd812",
-   "include/platform/FeaturesVk_autogen.h":
-@@ -16,13 +16,13 @@
-   "include/platform/gen_features.py":
-     "062989f7a8f3ff3b383f98fc8908dc33",
-   "include/platform/gl_features.json":
--    "3335055a70e35ebb7bf74c6d7c58897b",
-+    "c9aead89696e7fd0c8bfe5c5ca85ca63",
-   "include/platform/mtl_features.json":
-     "c66d170e7a8eb3448030f4c423ed0133",
-   "include/platform/vk_features.json":
-     "416bbb28b9fa1a3c4ef141f243c0a9e6",
-   "util/angle_features_autogen.cpp":
--    "73169f63c755192c3b4bd27d6f4096ca",
-+    "288daaec490eb816883d744f108d74c9",
-   "util/angle_features_autogen.h":
--    "7aa8120eb8f8fd335946b8c27074745d"
-+    "daf25d3e4ffea143d1c082416513f7e7"
- }
-\ No newline at end of file
-diff --git a/src/libANGLE/renderer/gl/BufferGL.cpp b/src/libANGLE/renderer/gl/BufferGL.cpp
-index c99fd5d..9651838 100644
---- a/src/libANGLE/renderer/gl/BufferGL.cpp
-+++ b/src/libANGLE/renderer/gl/BufferGL.cpp
-@@ -296,6 +296,11 @@
-     return angle::Result::Continue;
- }
- 
-+size_t BufferGL::getBufferSize() const
-+{
-+    return mBufferSize;
-+}
-+
- GLuint BufferGL::getBufferID() const
- {
-     return mBufferID;
-diff --git a/src/libANGLE/renderer/gl/BufferGL.h b/src/libANGLE/renderer/gl/BufferGL.h
-index 7b57594..fe9138e 100644
---- a/src/libANGLE/renderer/gl/BufferGL.h
-+++ b/src/libANGLE/renderer/gl/BufferGL.h
-@@ -56,6 +56,7 @@
-                                 bool primitiveRestartEnabled,
-                                 gl::IndexRange *outRange) override;
- 
-+    size_t getBufferSize() const;
-     GLuint getBufferID() const;
- 
-   private:
-diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
-index dc981de..fda9099 100644
---- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
-+++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
-@@ -646,6 +646,7 @@
- 
- angle::Result VertexArrayGL::updateAttribPointer(const gl::Context *context, size_t attribIndex)
- {
-+    const angle::FeaturesGL &features = GetFeaturesGL(context);
- 
-     const VertexAttribute &attrib = mState.getVertexAttribute(attribIndex);
- 
-@@ -687,8 +688,16 @@
-     // is not NULL.
- 
-     StateManagerGL *stateManager = GetStateManagerGL(context);
--    GLuint bufferId              = GetNativeBufferID(arrayBuffer);
-+    BufferGL *bufferGL           = GetImplAs<BufferGL>(arrayBuffer);
-+    GLuint bufferId              = bufferGL->getBufferID();
-     stateManager->bindBuffer(gl::BufferBinding::Array, bufferId);
-+    if (features.ensureNonEmptyBufferIsBoundForDraw.enabled && bufferGL->getBufferSize() == 0)
-+    {
-+        constexpr uint32_t data = 0;
-+        ANGLE_TRY(bufferGL->setData(context, gl::BufferBinding::Array, &data, sizeof(data),
-+                                    gl::BufferUsage::StaticDraw));
-+        ASSERT(bufferGL->getBufferSize() > 0);
-+    }
-     ANGLE_TRY(callVertexAttribPointer(context, static_cast<GLuint>(attribIndex), attrib,
-                                       binding.getStride(), binding.getOffset()));
- 
-diff --git a/src/libANGLE/renderer/gl/renderergl_utils.cpp b/src/libANGLE/renderer/gl/renderergl_utils.cpp
-index 6911247..ab2a608 100644
---- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
-+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
-@@ -2465,6 +2465,9 @@
-     // EXT_shader_pixel_local_storage
-     ANGLE_FEATURE_CONDITION(features, supportsShaderPixelLocalStorageEXT,
-                             functions->hasGLESExtension("GL_EXT_shader_pixel_local_storage"));
-+
-+    // http://crbug.com/1456243
-+    ANGLE_FEATURE_CONDITION(features, ensureNonEmptyBufferIsBoundForDraw, IsApple() || IsAndroid());
- }
- 
- void InitializeFrontendFeatures(const FunctionsGL *functions, angle::FrontendFeatures *features)
-diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
-index 59ec7c2..44ff3e4 100644
---- a/src/tests/angle_end2end_tests_expectations.txt
-+++ b/src/tests/angle_end2end_tests_expectations.txt
-@@ -380,6 +380,7 @@
- 7294 WIN D3D11 : StateChangeTestES3.StencilWriteMask/* = SKIP
- 7316 WIN D3D11 : StateChangeTestES3.StencilTestAndFunc/* = SKIP
- 7329 WIN D3D11 : StateChangeTestES3.PrimitiveRestart/* = SKIP
-+1456243 WIN D3D11 : WebGL2CompatibilityTest.DrawWithZeroSizedBuffer/* = SKIP
- 
- // Android
- 6095 ANDROID GLES : GLSLTest_ES3.InitGlobalComplexConstant/* = SKIP
-diff --git a/src/tests/gl_tests/WebGLCompatibilityTest.cpp b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-index 7dc56cd..bd7ecd1 100644
---- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-@@ -1632,10 +1632,10 @@
- 
-     constexpr GLuint kMaxIntAsGLuint = static_cast<GLuint>(std::numeric_limits<GLint>::max());
-     constexpr GLuint kIndexData[]    = {
--           kMaxIntAsGLuint,
--           kMaxIntAsGLuint + 1,
--           kMaxIntAsGLuint + 2,
--           kMaxIntAsGLuint + 3,
-+        kMaxIntAsGLuint,
-+        kMaxIntAsGLuint + 1,
-+        kMaxIntAsGLuint + 2,
-+        kMaxIntAsGLuint + 3,
-     };
- 
-     GLBuffer indexBuffer;
-@@ -3687,8 +3687,8 @@
- 
-     constexpr float readPixelsData[] = {-5000.0f, 0.0f, 0.0f, 1.0f};
-     const GLushort textureData[]     = {
--            gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
--            gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
-+        gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
-+        gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
- 
-     for (auto extension : FloatingPointTextureExtensions)
-     {
-@@ -3748,8 +3748,8 @@
- 
-     constexpr float readPixelsData[] = {7108.0f, -10.0f, 0.0f, 1.0f};
-     const GLushort textureData[]     = {
--            gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
--            gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
-+        gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
-+        gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
- 
-     for (auto extension : FloatingPointTextureExtensions)
-     {
-@@ -3811,8 +3811,8 @@
- 
-     constexpr float readPixelsData[] = {7000.0f, 100.0f, 33.0f, 1.0f};
-     const GLushort textureData[]     = {
--            gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
--            gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
-+        gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
-+        gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
- 
-     for (auto extension : FloatingPointTextureExtensions)
-     {
-@@ -3874,8 +3874,8 @@
- 
-     constexpr float readPixelsData[] = {7000.0f, 100.0f, 33.0f, -1.0f};
-     const GLushort textureData[]     = {
--            gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
--            gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
-+        gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
-+        gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
- 
-     for (auto extension : FloatingPointTextureExtensions)
-     {
-@@ -5803,6 +5803,26 @@
-     }
- }
- 
-+// Test for a mishandling of instanced vertex attributes with zero-sized buffers bound on Apple
-+// OpenGL drivers.
-+TEST_P(WebGL2CompatibilityTest, DrawWithZeroSizedBuffer)
-+{
-+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), essl3_shaders::fs::Red());
-+    glUseProgram(program);
-+
-+    GLBuffer buffer;
-+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
-+
-+    GLint posLocation = glGetAttribLocation(program, essl3_shaders::PositionAttrib());
-+    glEnableVertexAttribArray(posLocation);
-+
-+    glVertexAttribDivisor(posLocation, 1);
-+    glVertexAttribPointer(posLocation, 1, GL_UNSIGNED_BYTE, GL_FALSE, 9,
-+                          reinterpret_cast<void *>(0x41424344));
-+
-+    glDrawArrays(GL_TRIANGLES, 0, 6);
-+}
-+
- ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(WebGLCompatibilityTest);
- 
- GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(WebGL2CompatibilityTest);
-diff --git a/util/angle_features_autogen.cpp b/util/angle_features_autogen.cpp
-index adb9610..a060dd2 100644
---- a/util/angle_features_autogen.cpp
-+++ b/util/angle_features_autogen.cpp
-@@ -118,6 +118,7 @@
-     {Feature::EnablePrecisionQualifiers, "enablePrecisionQualifiers"},
-     {Feature::EnablePreRotateSurfaces, "enablePreRotateSurfaces"},
-     {Feature::EnableProgramBinaryForCapture, "enableProgramBinaryForCapture"},
-+    {Feature::EnsureNonEmptyBufferIsBoundForDraw, "ensureNonEmptyBufferIsBoundForDraw"},
-     {Feature::ExpandIntegerPowExpressions, "expandIntegerPowExpressions"},
-     {Feature::ExplicitlyEnablePerSampleShading, "explicitlyEnablePerSampleShading"},
-     {Feature::ExposeNonConformantExtensionsAndVersions, "exposeNonConformantExtensionsAndVersions"},
-diff --git a/util/angle_features_autogen.h b/util/angle_features_autogen.h
-index 3d8c47f..4064425 100644
---- a/util/angle_features_autogen.h
-+++ b/util/angle_features_autogen.h
-@@ -112,6 +112,7 @@
-     EnablePrecisionQualifiers,
-     EnablePreRotateSurfaces,
-     EnableProgramBinaryForCapture,
-+    EnsureNonEmptyBufferIsBoundForDraw,
-     ExpandIntegerPowExpressions,
-     ExplicitlyEnablePerSampleShading,
-     ExposeNonConformantExtensionsAndVersions,

patches/chromium/.patches

@@ -100,6 +100,7 @@ make_gtk_getlibgtk_public.patch
 build_disable_print_content_analysis.patch
 custom_protocols_plzserviceworker.patch
 feat_filter_out_non-shareable_windows_in_the_current_application_in.patch
+fix_allow_guest_webcontents_to_enter_fullscreen.patch
 disable_freezing_flags_after_init_in_node.patch
 short-circuit_permissions_checks_in_mediastreamdevicescontroller.patch
 chore_add_electron_deps_to_gitignores.patch
@@ -126,17 +127,3 @@ chore_defer_usb_service_getdevices_request_until_usb_service_is.patch
 fix_remove_profiles_from_spellcheck_service.patch
 chore_patch_out_profile_methods_in_chrome_browser_pdf.patch
 chore_patch_out_profile_methods_in_titlebar_config.patch
-fix_crash_on_nativetheme_change_during_context_menu_close.patch
-potential_fix_for_flaky_desktopcaptureapitest_delegation_unittest.patch
-fix_select_the_first_menu_item_when_opened_via_keyboard.patch
-chore_add_buildflag_guard_around_new_include.patch
-fix_use_delegated_generic_capturer_when_available.patch
-revert_remove_the_allowaggressivethrottlingwithwebsocket_feature.patch
-cherry-pick-b11e7d07a6f4.patch
-cherry-pick-f218b4f37018.patch
-cherry-pick-d756d71a652c.patch
-parameterize_axtreeserializer_by_vector_type.patch
-avoid_allocating_recordid_objects_in_elementtiming_and_lcp.patch
-cherry-pick-80106e31c7ea.patch
-gpu_use_load_program_shader_shm_count_on_drdc_thread.patch
-crash_gpu_process_and_clear_shader_cache_when_skia_reports.patch

patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch

@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
 This should be upstreamed.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index 280c8b9d08a35c7fbe9e352f2f71ed104cbde955..12bbcb8518110a5f4873e4f4a89e43c8920ec7b6 100644
+index 16610b7729464949eb78ecaf78c87b2d6df3d973..386fadd8ba7e654707c41e32291c9d3d17e6756a 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -260,6 +260,10 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -255,6 +255,10 @@ int GpuMain(MainFunctionParams parameters) {
    // to the GpuProcessHost once the GpuServiceImpl has started.
    viz::GpuServiceImpl::InstallPreInitializeLogHandler();
  
@@ -24,7 +24,7 @@ index 280c8b9d08a35c7fbe9e352f2f71ed104cbde955..12bbcb8518110a5f4873e4f4a89e43c8
    // We are experiencing what appear to be memory-stomp issues in the GPU
    // process. These issues seem to be impacting the task executor and listeners
    // registered to it. Create the task executor on the heap to guard against
-@@ -344,7 +348,6 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -339,7 +343,6 @@ int GpuMain(MainFunctionParams parameters) {
        const_cast<base::CommandLine*>(&command_line), gpu_preferences);
    const bool dead_on_arrival = !init_success;
  

patches/chromium/add_didinstallconditionalfeatures.patch

@@ -23,10 +23,10 @@ index 103a9d9fb17e954ecaf0acecaa3eeafc23e39c94..de299316216dba204decba3b0eb57f5c
                                          int32_t world_id) {}
    virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 68cc76c0f63f3f828ab582dab88f893453144b2a..5547fb35630d2f2c24b21640a90b8c0858f604ce 100644
+index bbe58fc8970ba61489e3d2e6d0a31b00f768c011..7a26dfa0207573316b6397b13b4a58e4408ae8e1 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4438,6 +4438,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4430,6 +4430,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
      observer.DidCreateScriptContext(context, world_id);
  }
  
@@ -79,7 +79,7 @@ index 1cada05806cb35a82822507f708d43979d97de61..f8e063397b161b7501308945a7df9fb8
    if (World().IsMainWorld()) {
      probe::DidCreateMainWorldContext(GetFrame());
 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 62e611ec3ac95eac88d4665d2640429e9d833594..7bf646d6cd8eaf29267b6136de0952e2545ec503 100644
+index fb229297df448dbe48e5b0ef2978bce2a8affc83..892d971c749b5bf7499c2fc246bc9d5fe5b63b79 100644
 --- a/third_party/blink/renderer/core/frame/local_frame_client.h
 +++ b/third_party/blink/renderer/core/frame/local_frame_client.h
 @@ -319,6 +319,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
@@ -92,7 +92,7 @@ index 62e611ec3ac95eac88d4665d2640429e9d833594..7bf646d6cd8eaf29267b6136de0952e2
                                          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 dbf7fd73a855f7d45eeeeff17582696aac66ff0d..9b489f661f524f380523e38518345e9b22eb8dec 100644
+index fa8c26e31341b2b53879a8760ad8314a569374c6..76ba9e3761d85acdaeeb017f52e24efc3d40e9b7 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
 @@ -283,6 +283,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index dbf7fd73a855f7d45eeeeff17582696aac66ff0d..9b489f661f524f380523e38518345e9b
      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 28e1c00e05e74d5a79f32897e57a854ff14ce7a9..1cd704b1bb53eaf226d1c72c97e3f765a4b1f10e 100644
+index 9f6a7e8337a4ade6b902d36919bee58f5e461790..9a73f4ceb6111b7e8bcb607b4e8eb96ebbfb0d42 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
 @@ -84,6 +84,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -123,10 +123,10 @@ index 28e1c00e05e74d5a79f32897e57a854ff14ce7a9..1cd704b1bb53eaf226d1c72c97e3f765
                                  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 1934ca82e3e26e0f5c4f2f7b417df6bcd6e66abf..1277b858f2d5b4b0a0dd1c97282eff0d763cdc2b 100644
+index 6b695ab181bc7e8a8b6ecb48ca56145ddc63d6e8..4955c7246498139a20be290a48eee234de44530e 100644
 --- a/third_party/blink/renderer/core/loader/empty_clients.h
 +++ b/third_party/blink/renderer/core/loader/empty_clients.h
-@@ -403,6 +403,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
+@@ -401,6 +401,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

@@ -7,10 +7,10 @@ Ensure that licenses for the dependencies introduced by Electron
 are included in `LICENSES.chromium.html`
 
 diff --git a/tools/licenses/licenses.py b/tools/licenses/licenses.py
-index 2a6a4733128dfc5916163c1c91c26f27da1d2f0a..f248f68e22d94b5762f0a64e0fe6804eef1d61d1 100755
+index d775931a09f38db3eb472d095d461b50c5ef76f0..9d844edc8f7c2f526fa99804e8a072da1f47c656 100755
 --- a/tools/licenses/licenses.py
 +++ b/tools/licenses/licenses.py
-@@ -413,6 +413,31 @@ SPECIAL_CASES = {
+@@ -383,6 +383,31 @@ SPECIAL_CASES = {
          "License": "Apache 2.0",
          "License File": "/third_party/selenium-atoms/LICENSE.closure",
      },
@@ -41,4 +41,4 @@ index 2a6a4733128dfc5916163c1c91c26f27da1d2f0a..f248f68e22d94b5762f0a64e0fe6804e
 +    },
  }
  
- # Soon-to-be-deprecated special value for 'License File' field used to indicate
+ # Special value for 'License File' field used to indicate that the license file

patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch

@@ -33,23 +33,8 @@ index 180abdc9f983887c83fd9d4a596472222e9ab472..00842717a7570561ee9e3eca11190ab5
    void SendWebPreferencesToRenderer();
    void SendRendererPreferencesToRenderer(
        const blink::RendererPreferences& preferences);
-diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index 9716c8f8a5fe15ffabe4eeedb7b5b35a57b61bac..75796596daeda51d303856ae767e2bae9b9d2d18 100644
---- a/content/browser/renderer_host/render_widget_host_view_aura.cc
-+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -554,8 +554,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
-   // OnShowWithPageVisibility will not call NotifyHostAndDelegateOnWasShown,
-   // which updates `visibility_`, unless the host is hidden. Make sure no update
-   // is needed.
--  DCHECK(host_->is_hidden() || visibility_ == Visibility::VISIBLE);
--  OnShowWithPageVisibility(page_visibility);
-+  if (host_->is_hidden() || visibility_ == Visibility::VISIBLE)
-+    OnShowWithPageVisibility(page_visibility);
- }
- 
- void RenderWidgetHostViewAura::NotifyHostAndDelegateOnWasShown(
 diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h
-index 9979c25ecd57e68331b628a518368635db5c2027..32733bf951af3eff7da5fd5758bbcbaa49ff0e3c 100644
+index 9979c25ecd57e68331b628a518368635db5c2027..f65bfbbb663a5bb0511ffa389d3163e0fdeb4d1f 100644
 --- a/content/public/browser/render_view_host.h
 +++ b/content/public/browser/render_view_host.h
 @@ -76,6 +76,9 @@ class CONTENT_EXPORT RenderViewHost {
@@ -57,7 +42,7 @@ index 9979c25ecd57e68331b628a518368635db5c2027..32733bf951af3eff7da5fd5758bbcbaa
        perfetto::TracedProto<TraceProto> context) const = 0;
  
 +  // Disable/Enable scheduler throttling.
-+  virtual void SetSchedulerThrottling(bool allowed) = 0;
++  virtual void SetSchedulerThrottling(bool allowed) {}
 +
   private:
    // This interface should only be implemented inside content.
@@ -87,32 +72,22 @@ index d3877e946b1d65eba5bb45efe786fbcc7925ca6e..73bd5056baf7e4278b7260e550e2b851
 +  SetSchedulerThrottling(bool allowed);
  };
 diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
-index 8a18ecf567cd3a6a2fb1627083a5544a93198bf4..8b6436f3ba6c8bfc2cba054e77ab888625ae668d 100644
+index 8a18ecf567cd3a6a2fb1627083a5544a93198bf4..6bb4074e033e045de164bc776f75f152ea7be16f 100644
 --- a/third_party/blink/public/web/web_view.h
 +++ b/third_party/blink/public/web/web_view.h
 @@ -371,6 +371,7 @@ class BLINK_EXPORT WebView {
    // Scheduling -----------------------------------------------------------
  
    virtual PageScheduler* Scheduler() const = 0;
-+  virtual void SetSchedulerThrottling(bool allowed) = 0;
++  virtual void SetSchedulerThrottling(bool allowed) {}
  
    // 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 3fd94156edd9868f0d46746227ae40da604bbc2c..6ce650e2fc879ae135e5bb731750f8929b592f17 100644
+index 3fd94156edd9868f0d46746227ae40da604bbc2c..ce99c90306bf2988fdb9a92e04d2ed8ec318da78 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -2386,6 +2386,9 @@ void WebViewImpl::SetPageLifecycleStateInternal(
-   TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
-                "old_state", old_state, "new_state", new_state);
- 
-+  if (!scheduler_throttling_allowed_)
-+      new_state->visibility = mojom::blink::PageVisibilityState::kVisible;
-+
-   bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
-                             !old_state->is_in_back_forward_cache;
-   bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
-@@ -3847,17 +3850,30 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -3847,13 +3847,21 @@ PageScheduler* WebViewImpl::Scheduler() const {
    return GetPage()->GetPageScheduler();
  }
  
@@ -127,29 +102,14 @@ index 3fd94156edd9868f0d46746227ae40da604bbc2c..6ce650e2fc879ae135e5bb731750f892
      mojom::blink::PageVisibilityState visibility_state,
      bool is_initial_state) {
    DCHECK(GetPage());
--  GetPage()->SetVisibilityState(visibility_state, is_initial_state);
--  GetPage()->GetPageScheduler()->SetPageVisible(
+   GetPage()->SetVisibilityState(visibility_state, is_initial_state);
+   GetPage()->GetPageScheduler()->SetPageVisible(
 -      visibility_state == mojom::blink::PageVisibilityState::kVisible);
--  // Notify observers of the change.
--  if (!is_initial_state) {
--    for (auto& observer : observers_)
--      observer.OnPageVisibilityChanged(visibility_state);
-+  // If backgroundThrottling is disabled, the page is always visible.
-+  if (!scheduler_throttling_allowed_) {
-+    GetPage()->SetVisibilityState(mojom::blink::PageVisibilityState::kVisible, is_initial_state);
-+    GetPage()->GetPageScheduler()->SetPageVisible(true);
-+  } else {
-+    bool is_visible = visibility_state == mojom::blink::PageVisibilityState::kVisible;
-+    GetPage()->SetVisibilityState(visibility_state, is_initial_state);
-+    GetPage()->GetPageScheduler()->SetPageVisible(is_visible);
-+    // Notify observers of the change.
-+    if (!is_initial_state) {
-+      for (auto& observer : observers_)
-+        observer.OnPageVisibilityChanged(visibility_state);
-+    }
-   }
- }
- 
++      scheduler_throttling_allowed_ ?
++          (visibility_state == mojom::blink::PageVisibilityState::kVisible) : true);
+   // Notify observers of the change.
+   if (!is_initial_state) {
+     for (auto& observer : observers_)
 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 6a180620e00c77d0f4be346d1296f62feb714abb..c0ccf14faa52ab190c5848e8e9b597bcf637d4c0 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h

patches/chromium/avoid_allocating_recordid_objects_in_elementtiming_and_lcp.patch

@@ -1,655 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Yoav Weiss <yoavweiss@chromium.org>
-Date: Thu, 31 Aug 2023 10:11:57 +0000
-Subject: Avoid allocating RecordId objects in ElementTiming and LCP
-
-RecordId objects in current code keep around references to LayoutObject
-and ImageResourceContent, both GCed objects.
-Turn out that most of these references are not needed and are only used
-as hashmap keys that would be better served with an actual hash. The
-ones that are needed don't need extensive lifetimes and can be stack
-allocated.
-
-Bug=1472365,1472366
-
-Change-Id: I3fd77bed9899932d5bfadc2a8e6403a8e434235f
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4821128
-Commit-Queue: Yoav Weiss <yoavweiss@chromium.org>
-Reviewed-by: Omer Katz <omerkatz@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1190644}
-
-diff --git a/third_party/blink/renderer/core/paint/DEPS b/third_party/blink/renderer/core/paint/DEPS
-index c6d60f8f418f03a3dcf1db94ca0e7feb87d85efa..16a5c09a09bf5343e7b05375bd55345f1023a9a3 100644
---- a/third_party/blink/renderer/core/paint/DEPS
-+++ b/third_party/blink/renderer/core/paint/DEPS
-@@ -4,6 +4,8 @@ include_rules = [
-     "+cc/layers/picture_layer.h",
-     # For DCHECK.
-     "+base/logging.h",
-+    # Hash function access
-+    "+base/hash/hash.h",
- ]
- 
- specific_include_rules = {
-diff --git a/third_party/blink/renderer/core/paint/build.gni b/third_party/blink/renderer/core/paint/build.gni
-index fd75feaf315977a60b80e66b4a8ecd09d8edb7e4..663cdaf120c579b75b94af835e62d937e9f2a115 100644
---- a/third_party/blink/renderer/core/paint/build.gni
-+++ b/third_party/blink/renderer/core/paint/build.gni
-@@ -200,6 +200,8 @@ blink_core_sources_paint = [
-   "timing/image_paint_timing_detector.h",
-   "timing/largest_contentful_paint_calculator.cc",
-   "timing/largest_contentful_paint_calculator.h",
-+  "timing/media_record_id.cc",
-+  "timing/media_record_id.h",
-   "timing/paint_timing.cc",
-   "timing/paint_timing_detector.cc",
-   "timing/paint_timing_detector.h",
-diff --git a/third_party/blink/renderer/core/paint/timing/image_element_timing.cc b/third_party/blink/renderer/core/paint/timing/image_element_timing.cc
-index a8501cfcc91e57b3348e3db8ff11256c4d7176b2..21f7a0ac38732e5381da6b82544044b8e6da3a11 100644
---- a/third_party/blink/renderer/core/paint/timing/image_element_timing.cc
-+++ b/third_party/blink/renderer/core/paint/timing/image_element_timing.cc
-@@ -68,7 +68,7 @@ void ImageElementTiming::NotifyImageFinished(
-     return;
- 
-   const auto& insertion_result = images_notified_.insert(
--      std::make_pair(&layout_object, cached_image), ImageInfo());
-+      MediaRecordId::GenerateHash(&layout_object, cached_image), ImageInfo());
-   if (insertion_result.is_new_entry)
-     insertion_result.stored_value->value.load_time_ = base::TimeTicks::Now();
- }
-@@ -97,8 +97,8 @@ void ImageElementTiming::NotifyImagePainted(
-   if (!internal::IsExplicitlyRegisteredForTiming(layout_object))
-     return;
- 
--  auto it =
--      images_notified_.find(std::make_pair(&layout_object, &cached_image));
-+  auto it = images_notified_.find(
-+      MediaRecordId::GenerateHash(&layout_object, &cached_image));
-   // It is possible that the pair is not in |images_notified_|. See
-   // https://crbug.com/1027948
-   if (it != images_notified_.end() && !it->value.is_painted_) {
-@@ -218,7 +218,8 @@ void ImageElementTiming::NotifyBackgroundImagePainted(
- 
-   ImageInfo& info =
-       images_notified_
--          .insert(std::make_pair(layout_object, cached_image), ImageInfo())
-+          .insert(MediaRecordId::GenerateHash(layout_object, cached_image),
-+                  ImageInfo())
-           .stored_value->value;
-   if (!info.is_painted_) {
-     info.is_painted_ = true;
-@@ -246,7 +247,7 @@ void ImageElementTiming::ReportImagePaintPresentationTime(
- 
- void ImageElementTiming::NotifyImageRemoved(const LayoutObject* layout_object,
-                                             const ImageResourceContent* image) {
--  images_notified_.erase(std::make_pair(layout_object, image));
-+  images_notified_.erase(MediaRecordId::GenerateHash(layout_object, image));
- }
- 
- void ImageElementTiming::Trace(Visitor* visitor) const {
-diff --git a/third_party/blink/renderer/core/paint/timing/image_element_timing.h b/third_party/blink/renderer/core/paint/timing/image_element_timing.h
-index 0a152210de91ab69c255be8caa951616afb3df06..7d3f5dd7c9137b277543e52d4d1e327d75b01e84 100644
---- a/third_party/blink/renderer/core/paint/timing/image_element_timing.h
-+++ b/third_party/blink/renderer/core/paint/timing/image_element_timing.h
-@@ -5,12 +5,11 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_PAINT_TIMING_IMAGE_ELEMENT_TIMING_H_
- #define THIRD_PARTY_BLINK_RENDERER_CORE_PAINT_TIMING_IMAGE_ELEMENT_TIMING_H_
- 
--#include <utility>
--
- #include "base/time/time.h"
- #include "third_party/blink/renderer/core/core_export.h"
- #include "third_party/blink/renderer/core/dom/element.h"
- #include "third_party/blink/renderer/core/frame/local_dom_window.h"
-+#include "third_party/blink/renderer/core/paint/timing/media_record_id.h"
- #include "third_party/blink/renderer/platform/heap/collection_support/heap_hash_map.h"
- #include "third_party/blink/renderer/platform/heap/collection_support/heap_vector.h"
- #include "third_party/blink/renderer/platform/supplementable.h"
-@@ -123,13 +122,12 @@ class CORE_EXPORT ImageElementTiming final
- 
-     DISALLOW_NEW();
-   };
--  typedef std::pair<const LayoutObject*, const ImageResourceContent*> RecordId;
-   // Hashmap of pairs of elements, LayoutObjects (for the elements) and
-   // ImageResourceContent (for the src) which correspond to either images or
-   // background images whose paint has been observed. For background images,
-   // only the |is_painted_| bit is used, as the timestamp needs to be tracked by
-   // |background_image_timestamps_|.
--  WTF::HashMap<RecordId, ImageInfo> images_notified_;
-+  WTF::HashMap<MediaRecordIdHash, ImageInfo> images_notified_;
- 
-   // Hashmap of background images which contain information about the load time
-   // of the background image.
-diff --git a/third_party/blink/renderer/core/paint/timing/image_element_timing_test.cc b/third_party/blink/renderer/core/paint/timing/image_element_timing_test.cc
-index 963493d548df51a704cb332c0df7a70ffa091011..6ed8840f58b0bafd50a67acfd389a41c2b4cc78d 100644
---- a/third_party/blink/renderer/core/paint/timing/image_element_timing_test.cc
-+++ b/third_party/blink/renderer/core/paint/timing/image_element_timing_test.cc
-@@ -9,6 +9,7 @@
- #include "third_party/blink/renderer/core/layout/layout_image.h"
- #include "third_party/blink/renderer/core/layout/svg/layout_svg_image.h"
- #include "third_party/blink/renderer/core/loader/resource/image_resource_content.h"
-+#include "third_party/blink/renderer/core/paint/timing/media_record_id.h"
- #include "third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.h"
- #include "third_party/blink/renderer/platform/testing/paint_test_configurations.h"
- #include "third_party/blink/renderer/platform/testing/url_test_helpers.h"
-@@ -60,11 +61,9 @@ class ImageElementTimingTest : public testing::Test,
-     return nullptr;
-   }
- 
--  bool ImagesNotifiedContains(
--      const std::pair<const LayoutObject*, const ImageResourceContent*>&
--          record_id) {
-+  bool ImagesNotifiedContains(MediaRecordIdHash record_id_hash) {
-     return ImageElementTiming::From(*GetDoc()->domWindow())
--        .images_notified_.Contains(record_id);
-+        .images_notified_.Contains(record_id_hash);
-   }
- 
-   unsigned ImagesNotifiedSize() {
-@@ -159,7 +158,7 @@ TEST_P(ImageElementTimingTest, IgnoresUnmarkedElement) {
-   ASSERT_TRUE(layout_image);
-   UpdateAllLifecyclePhases();
-   EXPECT_FALSE(ImagesNotifiedContains(
--      std::make_pair(layout_image, layout_image->CachedImage())));
-+      MediaRecordId::GenerateHash(layout_image, layout_image->CachedImage())));
- }
- 
- TEST_P(ImageElementTimingTest, ImageInsideSVG) {
-@@ -179,7 +178,7 @@ TEST_P(ImageElementTimingTest, ImageInsideSVG) {
- 
-   // |layout_image| should have had its paint notified to ImageElementTiming.
-   EXPECT_TRUE(ImagesNotifiedContains(
--      std::make_pair(layout_image, layout_image->CachedImage())));
-+      MediaRecordId::GenerateHash(layout_image, layout_image->CachedImage())));
- }
- 
- TEST_P(ImageElementTimingTest, ImageInsideNonRenderedSVG) {
-@@ -214,7 +213,7 @@ TEST_P(ImageElementTimingTest, ImageRemoved) {
-   ASSERT_TRUE(layout_image);
-   UpdateAllLifecyclePhases();
-   EXPECT_TRUE(ImagesNotifiedContains(
--      std::make_pair(layout_image, layout_image->CachedImage())));
-+      MediaRecordId::GenerateHash(layout_image, layout_image->CachedImage())));
- 
-   GetDoc()->getElementById("target")->remove();
-   // |layout_image| should no longer be part of |images_notified| since it will
-@@ -234,7 +233,7 @@ TEST_P(ImageElementTimingTest, SVGImageRemoved) {
-   LayoutSVGImage* layout_image = SetSVGImageResource("target", 5, 5);
-   ASSERT_TRUE(layout_image);
-   UpdateAllLifecyclePhases();
--  EXPECT_TRUE(ImagesNotifiedContains(std::make_pair(
-+  EXPECT_TRUE(ImagesNotifiedContains(MediaRecordId::GenerateHash(
-       layout_image, layout_image->ImageResource()->CachedImage())));
- 
-   GetDoc()->getElementById("target")->remove();
-@@ -261,7 +260,8 @@ TEST_P(ImageElementTimingTest, BackgroundImageRemoved) {
-       object->Style()->BackgroundLayers().GetImage()->CachedImage();
-   UpdateAllLifecyclePhases();
-   EXPECT_EQ(ImagesNotifiedSize(), 1u);
--  EXPECT_TRUE(ImagesNotifiedContains(std::make_pair(object, content)));
-+  EXPECT_TRUE(
-+      ImagesNotifiedContains(MediaRecordId::GenerateHash(object, content)));
- 
-   GetDoc()->getElementById("target")->remove();
-   EXPECT_EQ(ImagesNotifiedSize(), 0u);
-diff --git a/third_party/blink/renderer/core/paint/timing/image_paint_timing_detector.cc b/third_party/blink/renderer/core/paint/timing/image_paint_timing_detector.cc
-index b4ed09ccd893b39d4497fc9a237c1ab00bda91fa..e516c2a15a362fa71fcb1d644e8eb61ea2934b1e 100644
---- a/third_party/blink/renderer/core/paint/timing/image_paint_timing_detector.cc
-+++ b/third_party/blink/renderer/core/paint/timing/image_paint_timing_detector.cc
-@@ -231,8 +231,8 @@ void ImagePaintTimingDetector::OnPaintFinished() {
- void ImagePaintTimingDetector::NotifyImageRemoved(
-     const LayoutObject& object,
-     const MediaTiming* media_timing) {
--  RecordId record_id = std::make_pair(&object, media_timing);
--  records_manager_.RemoveRecord(record_id);
-+  records_manager_.RemoveRecord(
-+      MediaRecordId::GenerateHash(&object, media_timing));
- }
- 
- void ImagePaintTimingDetector::StopRecordEntries() {
-@@ -270,7 +270,7 @@ void ImageRecordsManager::AssignPaintTimeToRegisteredQueuedRecords(
-     unsigned last_queued_frame_index) {
-   while (!images_queued_for_paint_time_.empty()) {
-     const base::WeakPtr<ImageRecord>& record =
--        images_queued_for_paint_time_.front().first;
-+        images_queued_for_paint_time_.front().image_record;
-     if (!record) {
-       images_queued_for_paint_time_.pop_front();
-       continue;
-@@ -282,8 +282,8 @@ void ImageRecordsManager::AssignPaintTimeToRegisteredQueuedRecords(
-       record->first_animated_frame_time = timestamp;
-       record->queue_animated_paint = false;
-     }
--    auto it =
--        pending_images_.find(images_queued_for_paint_time_.front().second);
-+    auto it = pending_images_.find(
-+        images_queued_for_paint_time_.front().record_id_hash);
-     images_queued_for_paint_time_.pop_front();
-     // A record may be in |images_queued_for_paint_time_| twice, for instance if
-     // is already loaded by the time of its first paint.
-@@ -319,7 +319,8 @@ bool ImagePaintTimingDetector::RecordImage(
-   if (image_border.IsEmpty())
-     return false;
- 
--  RecordId record_id = std::make_pair(&object, &media_timing);
-+  MediaRecordId record_id(&object, &media_timing);
-+  MediaRecordIdHash record_id_hash = record_id.GetHash();
- 
-   if (int depth = IgnorePaintTimingScope::IgnoreDepth()) {
-     // Record the largest loaded image that is hidden due to documentElement
-@@ -340,17 +341,18 @@ bool ImagePaintTimingDetector::RecordImage(
-     return false;
-   }
- 
--  if (records_manager_.IsRecordedImage(record_id)) {
-+  if (records_manager_.IsRecordedImage(record_id_hash)) {
-     base::WeakPtr<ImageRecord> record =
--        records_manager_.GetPendingImage(record_id);
-+        records_manager_.GetPendingImage(record_id_hash);
-     if (!record)
-       return false;
-     if (ShouldReportAnimatedImages() && media_timing.IsPaintedFirstFrame()) {
-       added_entry_in_latest_frame_ |=
--          records_manager_.OnFirstAnimatedFramePainted(record_id, frame_index_);
-+          records_manager_.OnFirstAnimatedFramePainted(record_id_hash,
-+                                                       frame_index_);
-     }
-     if (!record->loaded && media_timing.IsSufficientContentLoadedForPaint()) {
--      records_manager_.OnImageLoaded(record_id, frame_index_, style_image);
-+      records_manager_.OnImageLoaded(record_id_hash, frame_index_, style_image);
-       added_entry_in_latest_frame_ = true;
-       if (absl::optional<PaintTimingVisualizer>& visualizer =
-               frame_view_->GetPaintTimingDetector().Visualizer()) {
-@@ -386,10 +388,11 @@ bool ImagePaintTimingDetector::RecordImage(
- 
-   if (ShouldReportAnimatedImages() && media_timing.IsPaintedFirstFrame()) {
-     added_entry_in_latest_frame_ |=
--        records_manager_.OnFirstAnimatedFramePainted(record_id, frame_index_);
-+        records_manager_.OnFirstAnimatedFramePainted(record_id_hash,
-+                                                     frame_index_);
-   }
-   if (media_timing.IsSufficientContentLoadedForPaint()) {
--    records_manager_.OnImageLoaded(record_id, frame_index_, style_image);
-+    records_manager_.OnImageLoaded(record_id_hash, frame_index_, style_image);
-     added_entry_in_latest_frame_ = true;
-     return true;
-   }
-@@ -445,8 +448,8 @@ uint64_t ImagePaintTimingDetector::ComputeImageRectSize(
- void ImagePaintTimingDetector::NotifyImageFinished(
-     const LayoutObject& object,
-     const MediaTiming* media_timing) {
--  RecordId record_id = std::make_pair(&object, media_timing);
--  records_manager_.NotifyImageFinished(record_id);
-+  records_manager_.NotifyImageFinished(
-+      MediaRecordId::GenerateHash(&object, media_timing));
- }
- 
- void ImagePaintTimingDetector::ReportLargestIgnoredImage() {
-@@ -458,9 +461,9 @@ ImageRecordsManager::ImageRecordsManager(LocalFrameView* frame_view)
-     : size_ordered_set_(&LargeImageFirst), frame_view_(frame_view) {}
- 
- bool ImageRecordsManager::OnFirstAnimatedFramePainted(
--    const RecordId& record_id,
-+    MediaRecordIdHash record_id_hash,
-     unsigned current_frame_index) {
--  base::WeakPtr<ImageRecord> record = GetPendingImage(record_id);
-+  base::WeakPtr<ImageRecord> record = GetPendingImage(record_id_hash);
-   DCHECK(record);
-   if (record->media_timing &&
-       !record->media_timing->GetFirstVideoFrameTime().is_null()) {
-@@ -473,19 +476,19 @@ bool ImageRecordsManager::OnFirstAnimatedFramePainted(
-     // Otherwise, this is an animated images, and so we should wait for the
-     // presentation callback to fire to set the first frame presentation time.
-     record->queue_animated_paint = true;
--    QueueToMeasurePaintTime(record_id, record, current_frame_index);
-+    QueueToMeasurePaintTime(record_id_hash, record, current_frame_index);
-     return true;
-   }
-   return false;
- }
- 
--void ImageRecordsManager::OnImageLoaded(const RecordId& record_id,
-+void ImageRecordsManager::OnImageLoaded(MediaRecordIdHash record_id_hash,
-                                         unsigned current_frame_index,
-                                         const StyleFetchedImage* style_image) {
--  base::WeakPtr<ImageRecord> record = GetPendingImage(record_id);
-+  base::WeakPtr<ImageRecord> record = GetPendingImage(record_id_hash);
-   DCHECK(record);
-   if (!style_image) {
--    auto it = image_finished_times_.find(record_id);
-+    auto it = image_finished_times_.find(record_id_hash);
-     if (it != image_finished_times_.end()) {
-       record->load_time = it->value;
-       DCHECK(!record->load_time.is_null());
-@@ -498,7 +501,7 @@ void ImageRecordsManager::OnImageLoaded(const RecordId& record_id,
-       record->origin_clean = style_image->IsOriginClean();
-     }
-   }
--  OnImageLoadedInternal(record_id, record, current_frame_index);
-+  OnImageLoadedInternal(record_id_hash, record, current_frame_index);
- }
- 
- void ImageRecordsManager::ReportLargestIgnoredImage(
-@@ -518,25 +521,25 @@ void ImageRecordsManager::ReportLargestIgnoredImage(
-   DCHECK(document);
-   PaintTiming::From(*document).MarkFirstContentfulPaint();
- 
--  RecordId record_id = std::make_pair(node->GetLayoutObject(),
--                                      largest_ignored_image_->media_timing);
--  recorded_images_.insert(record_id);
-+  MediaRecordIdHash record_id_hash = MediaRecordId::GenerateHash(
-+      node->GetLayoutObject(), largest_ignored_image_->media_timing);
-+  recorded_images_.insert(record_id_hash);
-   base::WeakPtr<ImageRecord> record = largest_ignored_image_->AsWeakPtr();
-   size_ordered_set_.insert(record);
--  pending_images_.insert(record_id, std::move(largest_ignored_image_));
--  OnImageLoadedInternal(record_id, record, current_frame_index);
-+  pending_images_.insert(record_id_hash, std::move(largest_ignored_image_));
-+  OnImageLoadedInternal(record_id_hash, record, current_frame_index);
- }
- 
- void ImageRecordsManager::OnImageLoadedInternal(
--    const RecordId& record_id,
-+    MediaRecordIdHash record_id_hash,
-     base::WeakPtr<ImageRecord>& record,
-     unsigned current_frame_index) {
-   SetLoaded(record);
--  QueueToMeasurePaintTime(record_id, record, current_frame_index);
-+  QueueToMeasurePaintTime(record_id_hash, record, current_frame_index);
- }
- 
- void ImageRecordsManager::MaybeUpdateLargestIgnoredImage(
--    const RecordId& record_id,
-+    const MediaRecordId& record_id,
-     const uint64_t& visual_size,
-     const gfx::Rect& frame_visual_rect,
-     const gfx::RectF& root_visual_rect,
-@@ -544,14 +547,14 @@ void ImageRecordsManager::MaybeUpdateLargestIgnoredImage(
-   if (visual_size && (!largest_ignored_image_ ||
-                       visual_size > largest_ignored_image_->recorded_size)) {
-     largest_ignored_image_ = CreateImageRecord(
--        *record_id.first, record_id.second, visual_size, frame_visual_rect,
--        root_visual_rect, is_loaded_after_mouseover);
-+        *record_id.GetLayoutObject(), record_id.GetMediaTiming(), visual_size,
-+        frame_visual_rect, root_visual_rect, is_loaded_after_mouseover);
-     largest_ignored_image_->load_time = base::TimeTicks::Now();
-   }
- }
- 
- bool ImageRecordsManager::RecordFirstPaintAndReturnIsPending(
--    const RecordId& record_id,
-+    const MediaRecordId& record_id,
-     const uint64_t& visual_size,
-     const gfx::Rect& frame_visual_rect,
-     const gfx::RectF& root_visual_rect,
-@@ -562,7 +565,7 @@ bool ImageRecordsManager::RecordFirstPaintAndReturnIsPending(
-   if (visual_size == 0u) {
-     return false;
-   }
--  recorded_images_.insert(record_id);
-+  recorded_images_.insert(record_id.GetHash());
-   // If this cannot become an LCP candidate, no need to do anything else.
-   if (visual_size == 0u ||
-       (largest_painted_image_ &&
-@@ -588,10 +591,10 @@ bool ImageRecordsManager::RecordFirstPaintAndReturnIsPending(
-   }
- 
-   std::unique_ptr<ImageRecord> record = CreateImageRecord(
--      *record_id.first, record_id.second, visual_size, frame_visual_rect,
--      root_visual_rect, is_loaded_after_mouseover);
-+      *record_id.GetLayoutObject(), record_id.GetMediaTiming(), visual_size,
-+      frame_visual_rect, root_visual_rect, is_loaded_after_mouseover);
-   size_ordered_set_.insert(record->AsWeakPtr());
--  pending_images_.insert(record_id, std::move(record));
-+  pending_images_.insert(record_id.GetHash(), std::move(record));
-   return true;
- }
- 
-diff --git a/third_party/blink/renderer/core/paint/timing/image_paint_timing_detector.h b/third_party/blink/renderer/core/paint/timing/image_paint_timing_detector.h
-index 6625edaafdce8697dbe14c86f6a8fba0042a1e5f..188df4392e6409170842147ec4768307869297da 100644
---- a/third_party/blink/renderer/core/paint/timing/image_paint_timing_detector.h
-+++ b/third_party/blink/renderer/core/paint/timing/image_paint_timing_detector.h
-@@ -16,6 +16,7 @@
- #include "third_party/blink/renderer/core/core_export.h"
- #include "third_party/blink/renderer/core/dom/dom_node_ids.h"
- #include "third_party/blink/renderer/core/loader/resource/image_resource_content.h"
-+#include "third_party/blink/renderer/core/paint/timing/media_record_id.h"
- #include "third_party/blink/renderer/core/paint/timing/paint_timing_detector.h"
- #include "third_party/blink/renderer/platform/allow_discouraged_type.h"
- #include "third_party/blink/renderer/platform/loader/fetch/media_timing.h"
-@@ -91,8 +92,6 @@ class ImageRecord : public base::SupportsWeakPtr<ImageRecord> {
-   bool is_loaded_after_mouseover = false;
- };
- 
--typedef std::pair<const LayoutObject*, const MediaTiming*> RecordId;
--
- // |ImageRecordsManager| is the manager of all of the images that Largest
- // Image Paint cares about. Note that an image does not necessarily correspond
- // to a node; it can also be one of the background images attached to a node.
-@@ -116,10 +115,10 @@ class CORE_EXPORT ImageRecordsManager {
-   ImageRecordsManager& operator=(const ImageRecordsManager&) = delete;
-   ImageRecord* LargestImage() const;
- 
--  inline void RemoveRecord(const RecordId& record_id) {
--    recorded_images_.erase(record_id);
--    image_finished_times_.erase(record_id);
--    auto it = pending_images_.find(record_id);
-+  inline void RemoveRecord(MediaRecordIdHash record_id_hash) {
-+    recorded_images_.erase(record_id_hash);
-+    image_finished_times_.erase(record_id_hash);
-+    auto it = pending_images_.find(record_id_hash);
-     if (it != pending_images_.end()) {
-       size_ordered_set_.erase(it->value->AsWeakPtr());
-       pending_images_.erase(it);
-@@ -129,41 +128,42 @@ class CORE_EXPORT ImageRecordsManager {
-     }
-   }
-   // Returns whether an image was added to |pending_images_|.
--  bool RecordFirstPaintAndReturnIsPending(const RecordId& record_id,
-+  bool RecordFirstPaintAndReturnIsPending(const MediaRecordId& record_id,
-                                           const uint64_t& visual_size,
-                                           const gfx::Rect& frame_visual_rect,
-                                           const gfx::RectF& root_visual_rect,
-                                           double bpp,
-                                           bool is_loaded_after_mouseover);
--  bool IsRecordedImage(const RecordId& record_id) const {
--    return recorded_images_.Contains(record_id);
-+  bool IsRecordedImage(MediaRecordIdHash record_id_hash) const {
-+    return recorded_images_.Contains(record_id_hash);
-   }
- 
--  void NotifyImageFinished(const RecordId& record_id) {
-+  void NotifyImageFinished(MediaRecordIdHash record_id_hash) {
-     // TODO(npm): Ideally NotifyImageFinished() would only be called when the
-     // record has not yet been inserted in |image_finished_times_| but that's
-     // not currently the case. If we plumb some information from
-     // MediaTiming we may be able to ensure that this call does not
-     // require the Contains() check, which would save time.
--    if (!image_finished_times_.Contains(record_id)) {
--      image_finished_times_.insert(record_id, base::TimeTicks::Now());
-+    if (!image_finished_times_.Contains(record_id_hash)) {
-+      image_finished_times_.insert(record_id_hash, base::TimeTicks::Now());
-     }
-   }
- 
--  inline base::WeakPtr<ImageRecord> GetPendingImage(const RecordId& record_id) {
--    auto it = pending_images_.find(record_id);
-+  inline base::WeakPtr<ImageRecord> GetPendingImage(
-+      MediaRecordIdHash record_id_hash) {
-+    auto it = pending_images_.find(record_id_hash);
-     return it == pending_images_.end() ? nullptr : it->value->AsWeakPtr();
-   }
--  bool OnFirstAnimatedFramePainted(const RecordId&,
-+  bool OnFirstAnimatedFramePainted(MediaRecordIdHash,
-                                    unsigned current_frame_index);
--  void OnImageLoaded(const RecordId&,
-+  void OnImageLoaded(MediaRecordIdHash,
-                      unsigned current_frame_index,
-                      const StyleFetchedImage*);
- 
-   // Receives a candidate image painted under opacity 0 but without nested
-   // opacity. May update |largest_ignored_image_| if the new candidate has a
-   // larger size.
--  void MaybeUpdateLargestIgnoredImage(const RecordId&,
-+  void MaybeUpdateLargestIgnoredImage(const MediaRecordId&,
-                                       const uint64_t& visual_size,
-                                       const gfx::Rect& frame_visual_rect,
-                                       const gfx::RectF& root_visual_rect,
-@@ -187,19 +187,31 @@ class CORE_EXPORT ImageRecordsManager {
-       const gfx::Rect& frame_visual_rect,
-       const gfx::RectF& root_visual_rect,
-       bool is_loaded_after_mouseover);
--  inline void QueueToMeasurePaintTime(const RecordId& record_id,
-+  inline void QueueToMeasurePaintTime(MediaRecordIdHash record_id_hash,
-                                       base::WeakPtr<ImageRecord>& record,
-                                       unsigned current_frame_index) {
-     record->frame_index = current_frame_index;
--    images_queued_for_paint_time_.push_back(std::make_pair(record, record_id));
-+    images_queued_for_paint_time_.push_back(
-+        ImageRecordAndHashPair(record, record_id_hash));
-   }
-   inline void SetLoaded(base::WeakPtr<ImageRecord>& record) {
-     record->loaded = true;
-   }
--  void OnImageLoadedInternal(const RecordId&,
-+  void OnImageLoadedInternal(MediaRecordIdHash,
-                              base::WeakPtr<ImageRecord>&,
-                              unsigned current_frame_index);
- 
-+  struct ImageRecordAndHashPair {
-+    ImageRecordAndHashPair(base::WeakPtr<ImageRecord>& record,
-+                           MediaRecordIdHash id_hash) {
-+      image_record = record;
-+      record_id_hash = id_hash;
-+    }
-+
-+    base::WeakPtr<ImageRecord> image_record;
-+    MediaRecordIdHash record_id_hash;
-+  };
-+
-   // The ImageRecord corresponding to the largest image that has been loaded and
-   // painted.
-   std::unique_ptr<ImageRecord> largest_painted_image_;
-@@ -208,24 +220,23 @@ class CORE_EXPORT ImageRecordsManager {
-   // timestamp, ordered by size.
-   ImageRecordSet size_ordered_set_;
- 
--  // RecordId for images for which we have seen a first paint. A RecordId is
--  // added to this set regardless of whether the image could be an LCP
--  // candidate.
--  HashSet<RecordId> recorded_images_;
-+  // MediaRecordId for images for which we have seen a first paint. A
-+  // MediaRecordId is added to this set regardless of whether the image could be
-+  // an LCP candidate.
-+  HashSet<MediaRecordIdHash> recorded_images_;
- 
--  // Map of RecordId to ImageRecord for images for which the first paint has
--  // been seen but which do not have the paint time set yet. This may contain
--  // only images which are potential LCP candidates.
--  HashMap<RecordId, std::unique_ptr<ImageRecord>> pending_images_;
-+  // Map of MediaRecordId to ImageRecord for images for which the first paint
-+  // has been seen but which do not have the paint time set yet. This may
-+  // contain only images which are potential LCP candidates.
-+  HashMap<MediaRecordIdHash, std::unique_ptr<ImageRecord>> pending_images_;
- 
-   // |ImageRecord|s waiting for paint time are stored in this map
-   // until they get a presentation time.
--  Deque<std::pair<base::WeakPtr<ImageRecord>, RecordId>>
--      images_queued_for_paint_time_;
-+  Deque<ImageRecordAndHashPair> images_queued_for_paint_time_;
- 
-   // Map containing timestamps of when LayoutObject::ImageNotifyFinished is
-   // first called.
--  HashMap<RecordId, base::TimeTicks> image_finished_times_;
-+  HashMap<MediaRecordIdHash, base::TimeTicks> image_finished_times_;
- 
-   Member<LocalFrameView> frame_view_;
- 
-diff --git a/third_party/blink/renderer/core/paint/timing/media_record_id.cc b/third_party/blink/renderer/core/paint/timing/media_record_id.cc
-new file mode 100644
-index 0000000000000000000000000000000000000000..e49c898d1111015d80a71ddc11bd791bb2a0dca1
---- /dev/null
-+++ b/third_party/blink/renderer/core/paint/timing/media_record_id.cc
-@@ -0,0 +1,27 @@
-+// Copyright 2023 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "third_party/blink/renderer/core/paint/timing/media_record_id.h"
-+
-+#include "base/hash/hash.h"
-+
-+namespace blink {
-+
-+MediaRecordId::MediaRecordId(const LayoutObject* layout,
-+                             const MediaTiming* media)
-+    : layout_object_(layout),
-+      media_timing_(media),
-+      hash_(GenerateHash(layout, media)) {}
-+
-+// This hash is used as a key where previously MediaRecordId was used directly.
-+// That helps us avoid storing references to the GCed LayoutObject and
-+// MediaTiming, as that can be unsafe when using regular WTF containers. It also
-+// helps us avoid needlessly allocating MediaRecordId on the heap.
-+MediaRecordIdHash MediaRecordId::GenerateHash(const LayoutObject* layout,
-+                                              const MediaTiming* media) {
-+  return base::HashInts(reinterpret_cast<MediaRecordIdHash>(layout),
-+                        reinterpret_cast<MediaRecordIdHash>(media));
-+}
-+
-+}  // namespace blink
-diff --git a/third_party/blink/renderer/core/paint/timing/media_record_id.h b/third_party/blink/renderer/core/paint/timing/media_record_id.h
-new file mode 100644
-index 0000000000000000000000000000000000000000..32952101e8463e31617d1b5f67c36abf04303c4a
---- /dev/null
-+++ b/third_party/blink/renderer/core/paint/timing/media_record_id.h
-@@ -0,0 +1,37 @@
-+// Copyright 2023 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef THIRD_PARTY_BLINK_RENDERER_CORE_PAINT_TIMING_MEDIA_RECORD_ID_H_
-+#define THIRD_PARTY_BLINK_RENDERER_CORE_PAINT_TIMING_MEDIA_RECORD_ID_H_
-+
-+#include "third_party/blink/renderer/core/core_export.h"
-+#include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
-+
-+namespace blink {
-+class LayoutObject;
-+class MediaTiming;
-+
-+using MediaRecordIdHash = size_t;
-+
-+class MediaRecordId {
-+  STACK_ALLOCATED();
-+
-+ public:
-+  static MediaRecordIdHash CORE_EXPORT GenerateHash(const LayoutObject* layout,
-+                                                    const MediaTiming* media);
-+
-+  MediaRecordId(const LayoutObject* layout, const MediaTiming* media);
-+
-+  MediaRecordIdHash GetHash() const { return hash_; }
-+  const LayoutObject* GetLayoutObject() const { return layout_object_; }
-+  const MediaTiming* GetMediaTiming() const { return media_timing_; }
-+
-+ private:
-+  const LayoutObject* const layout_object_;
-+  const MediaTiming* const media_timing_;
-+  const MediaRecordIdHash hash_;
-+};
-+
-+}  // namespace blink
-+#endif
-diff --git a/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py b/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py
-index 408a2916a00bb2a871f3a680215de54e7be2077c..caa3d8277acbecbeb25b3449719866e061a82761 100755
---- a/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py
-+++ b/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py
-@@ -67,6 +67,7 @@ _CONFIG = [
-             'base::DefaultTickClock',
-             'base::ElapsedTimer',
-             'base::EnumSet',
-+            'base::HashInts',
-             'base::JobDelegate',
-             'base::JobHandle',
-             'base::PostJob',

patches/chromium/blink_local_frame.patch

@@ -49,10 +49,10 @@ index 22c4d4e9718a503d9c7ca26a40c97149b0f8986a..6bdc2757c96a28022fda9e6f5e3b74a0
    // 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 51ac02abf2f2e61538b26fcbbaa437567310c164..f91a1af51c01e29ee6ec734eee368e04bf714311 100644
+index f57d2b2705b456273ff8fc8d8246e012e73d4175..19d253696c57f957e9f564c5f8366f39ef1ae349 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
-@@ -665,10 +665,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -664,10 +664,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    }
    DCHECK(!view_ || !view_->IsAttached());
  
@@ -63,7 +63,7 @@ index 51ac02abf2f2e61538b26fcbbaa437567310c164..f91a1af51c01e29ee6ec734eee368e04
    if (!Client())
      return false;
  
-@@ -716,6 +712,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
+@@ -715,6 +711,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
    DCHECK(!view_->IsAttached());
    Client()->WillBeDetached();
  

patches/chromium/build_add_electron_tracing_category.patch

@@ -8,7 +8,7 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.
 
 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index da966a58b11be318770fccdd14986efd2a92ccf8..2a7ea1edd970a205ec5f16c66b5722282f2bcf59 100644
+index 32d4063e9cbbc917cd57db41729fc6e15803d01f..fd054d5f8ea223355423918318c437d133f73bf9 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
 @@ -80,6 +80,8 @@

patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch

@@ -33,10 +33,10 @@ index 884bccba58c66861b43b3b50a7535cba543302e2..82e7bf534aa6b998cee8df53be3ca7db
            "//base",
            "//build:branding_buildflags",
 diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
-index 01194da83fe3f14c5f84671a186ed01fdbd2dc1e..191766f5e9cf2a0f3c43a6abb2d7e0139d1b666c 100644
+index d96f137d79665af0eb895abacc3f88c147b6f0d4..70a8debfcbd7db29279c75d6a833f0d8aa93d7a1 100644
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -4618,7 +4618,7 @@ static_library("browser") {
+@@ -4591,7 +4591,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 01194da83fe3f14c5f84671a186ed01fdbd2dc1e..191766f5e9cf2a0f3c43a6abb2d7e013
        sources += [ "certificate_viewer_stub.cc" ]
      }
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index 1029220fce0773fffc4fd8259f09e3659daa1979..bbe49d76df9287fe2561a674c1d8acb622508057 100644
+index 4d945c691b9020ed29284c68d2f4e90a2bf2a3d6..859ffee6b62d55e3294d82b630c480b1ebec0043 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -6589,7 +6589,6 @@ test("unit_tests") {
+@@ -6605,7 +6605,6 @@ test("unit_tests") {
  
      deps += [
        "//chrome:other_version",
@@ -57,7 +57,7 @@ index 1029220fce0773fffc4fd8259f09e3659daa1979..bbe49d76df9287fe2561a674c1d8acb6
        "//chrome//services/util_win:unit_tests",
        "//chrome/app:chrome_dll_resources",
        "//chrome/app:win_unit_tests",
-@@ -6615,6 +6614,10 @@ test("unit_tests") {
+@@ -6631,6 +6630,10 @@ test("unit_tests") {
        "//ui/resources",
      ]
  
@@ -68,7 +68,7 @@ index 1029220fce0773fffc4fd8259f09e3659daa1979..bbe49d76df9287fe2561a674c1d8acb6
      ldflags = [
        "/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
-@@ -7542,7 +7545,6 @@ test("unit_tests") {
+@@ -7552,7 +7555,6 @@ test("unit_tests") {
      }
  
      deps += [
@@ -76,7 +76,7 @@ index 1029220fce0773fffc4fd8259f09e3659daa1979..bbe49d76df9287fe2561a674c1d8acb6
        "//chrome/browser/apps:icon_standardizer",
        "//chrome/browser/apps/app_service",
        "//chrome/browser/apps/app_service:test_support",
-@@ -7629,6 +7631,10 @@ test("unit_tests") {
+@@ -7638,6 +7640,10 @@ test("unit_tests") {
        "//ui/webui/resources/js/browser_command:mojo_bindings",
      ]
  

patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch

@@ -6,7 +6,7 @@ Subject: build: only use the mas build config in the required components
 Before landing this patch should be split into the relevant MAS patches, or at least the patch this one partially reverts
 
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 304223b58a7062e3a6ae466d54b9e877708e5cb3..e9efa7f9d44977982fdf72153623e423753f0386 100644
+index ba907d51ea11537e83a6c7c813c13ec51da808c0..16933abf6878f3e31f3e29a77505b8c125b33b58 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
 @@ -228,6 +228,7 @@ if (is_apple) {
@@ -38,10 +38,10 @@ index 63b32e52a11af599dbc5154ed353e2bf7250e9d3..fc6ed0cdbe211cb29dd5a1dded36b3b0
  
  if (is_win) {
 diff --git a/components/os_crypt/sync/BUILD.gn b/components/os_crypt/sync/BUILD.gn
-index 7ed10085264af6f50b05e51dd93c49e3828d5b3b..d8c77f52376a13af7636e64ff0b5cf58f4fbcf97 100644
+index a20e1b68ebd112d66ad82e5753b756218e457c9e..65c7170d1c2dbe4ecfc75c4fed92d6e7ff8efb27 100644
 --- a/components/os_crypt/sync/BUILD.gn
 +++ b/components/os_crypt/sync/BUILD.gn
-@@ -48,6 +48,8 @@ component("os_crypt") {
+@@ -71,6 +71,8 @@ component("os_crypt") {
        "os_crypt_mac.mm",
      ]
      configs += [ "//build/config/compiler:enable_arc" ]
@@ -71,10 +71,10 @@ index 3bc799978ea24e2f6e566dcc7f8638789e18d61d..cd8910dbc57813d41cd0fa28bb2ad61a
      "alert.h",
      "alert.mm",
 diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
-index 488abc9ed0d61a4b73f4bec34cbca416abfbf715..7b1b36d6ab787e2c43d7556b1e4bb1d39c279879 100644
+index 4793d5bc9de9a3a158f90e0432c32c4818bcef2e..c42793c782c13a62b6205d0ed555ad5abab16197 100644
 --- a/components/viz/service/BUILD.gn
 +++ b/components/viz/service/BUILD.gn
-@@ -331,6 +331,7 @@ viz_component("service") {
+@@ -332,6 +332,7 @@ viz_component("service") {
          "frame_sinks/external_begin_frame_source_mac.h",
        ]
      }
@@ -82,7 +82,7 @@ index 488abc9ed0d61a4b73f4bec34cbca416abfbf715..7b1b36d6ab787e2c43d7556b1e4bb1d3
    }
  
    if (is_android || use_ozone) {
-@@ -587,6 +588,8 @@ viz_source_set("unit_tests") {
+@@ -588,6 +589,8 @@ viz_source_set("unit_tests") {
        "display_embedder/software_output_device_mac_unittest.mm",
      ]
      frameworks = [ "IOSurface.framework" ]
@@ -92,7 +92,7 @@ index 488abc9ed0d61a4b73f4bec34cbca416abfbf715..7b1b36d6ab787e2c43d7556b1e4bb1d3
  
    if (is_win) {
 diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
-index abc33d4abffaff80f6c23f63e206505ffacade86..6e6fe7a75ae6ec87e1f4f13d28ffdffc1bb0e7ea 100644
+index e6125b6af20434f3ec3171c044d515b8c120a7b5..1e2ccffbe25e5149a8e5c8174f75119014386f57 100644
 --- a/content/browser/BUILD.gn
 +++ b/content/browser/BUILD.gn
 @@ -56,6 +56,7 @@ source_set("browser") {
@@ -104,10 +104,10 @@ index abc33d4abffaff80f6c23f63e206505ffacade86..6e6fe7a75ae6ec87e1f4f13d28ffdffc
    libs = []
    frameworks = []
 diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
-index aa1ae523aee045fb1db412a42af8aadb97e9ee2a..e5fe6c0212721a67d67b17ee8871eb92e339f845 100644
+index 9e9a06ef58e9aeff8193df7b198ee69939c2dd8f..fcf5e3f5403c6dfe7fcd6da243695d378e0d21fb 100644
 --- a/content/common/BUILD.gn
 +++ b/content/common/BUILD.gn
-@@ -174,6 +174,7 @@ source_set("common") {
+@@ -172,6 +172,7 @@ source_set("common") {
      "//content:content_implementation",
      "//build/config:precompiled_headers",
    ]
@@ -116,7 +116,7 @@ index aa1ae523aee045fb1db412a42af8aadb97e9ee2a..e5fe6c0212721a67d67b17ee8871eb92
    public_deps = [
      ":mojo_bindings",
 diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
-index 65714a5dca013794527640645d8eb2ce36049ac6..b2df50b4cd64816ddf9c5b7e222c47b60304f01e 100644
+index abf8aa4dcf498f9684c10fbbe85547040029401a..6a3897cb80071cf9cdd0ee035a7ade263e798478 100644
 --- a/content/renderer/BUILD.gn
 +++ b/content/renderer/BUILD.gn
 @@ -228,6 +228,7 @@ target(link_target_type, "renderer") {
@@ -128,10 +128,10 @@ index 65714a5dca013794527640645d8eb2ce36049ac6..b2df50b4cd64816ddf9c5b7e222c47b6
  
    public_deps = [
 diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
-index 027fa679e34298ec627282796355b6284876520f..14fc5a7c899145872d0df98d7eab019a320da984 100644
+index d27590a1629161bf9f2e28c12bda4a78c95c194d..2e9c6979d0ebb17394d8c67fbc56df24801943bb 100644
 --- a/content/test/BUILD.gn
 +++ b/content/test/BUILD.gn
-@@ -475,6 +475,7 @@ static_library("test_support") {
+@@ -477,6 +477,7 @@ static_library("test_support") {
    configs += [
      "//build/config:precompiled_headers",
      "//v8:external_startup_data",
@@ -177,10 +177,10 @@ index ed977f540a2920858a05292f823bf49c669aa6d2..9acd66a086654d77f2a2f84b91779519
    if (is_ios) {
      sources += [
 diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
-index fbed855d14713ec3507b62d86d37b7be9969581e..b08bdea30ad4e5caf26f59c66c34fd63cd6207e4 100644
+index 93cf87a37792691f41d7c611104a378d9af45195..2d3a0f923f4991be41534e7f951fe5dfcceda5c9 100644
 --- a/media/audio/BUILD.gn
 +++ b/media/audio/BUILD.gn
-@@ -203,6 +203,7 @@ source_set("audio") {
+@@ -199,6 +199,7 @@ source_set("audio") {
        "mac/coreaudio_dispatch_override.h",
      ]
      frameworks += [ "AudioUnit.framework" ]
@@ -230,7 +230,7 @@ index 5e9fc18352d1bf0939f8366d2282b49aeb307994..69dcc2cafa27b3d8bdf3fe8d0a22a980
  
  source_set("sandbox_unittests") {
 diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
-index d1ab6d45d519dd131a854b01b90295b5e7316d71..7086774c980636b160f5152ac2c3c6b737217dd1 100644
+index ea98141f7cf3c4fcacfd82061963129b5d66bfa4..7ec5889a61e5575936a31196270333d39dcb6154 100644
 --- a/third_party/blink/renderer/core/BUILD.gn
 +++ b/third_party/blink/renderer/core/BUILD.gn
 @@ -308,6 +308,7 @@ component("core") {
@@ -279,7 +279,7 @@ index e6a0ca42d0fa2446b300714372986da7e2013f16..fd651028ead9103dabcbb3686e412c12
  
    if (is_apple) {
 diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
-index e7e52516cec15d41abb9f9c9458c5f3420de7dc0..2e13ca6442c616944577b3374fae082554e585c0 100644
+index 4fb4a862d285fababc67d4f2fe38036ea83bd8a9..fa71bc82342412d85fb05312b441cecbfd9da778 100644
 --- a/ui/display/BUILD.gn
 +++ b/ui/display/BUILD.gn
 @@ -67,6 +67,10 @@ component("display") {
@@ -294,10 +294,10 @@ index e7e52516cec15d41abb9f9c9458c5f3420de7dc0..2e13ca6442c616944577b3374fae0825
  
    if (is_win) {
 diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
-index f5038c6478eeccc17e061681dbee0f384dac4911..bf23c3576bb7b2d10a840e6eb2a420b739b4f4d7 100644
+index ac1875a96d3d877a81b0f26c6a18036e0674c590..d4d74d3bee9be3735ca3245c8a9b0d06c8f82eca 100644
 --- a/ui/gfx/BUILD.gn
 +++ b/ui/gfx/BUILD.gn
-@@ -193,6 +193,7 @@ component("gfx") {
+@@ -192,6 +192,7 @@ component("gfx") {
        "scoped_ns_graphics_context_save_gstate_mac.h",
        "scoped_ns_graphics_context_save_gstate_mac.mm",
      ]
@@ -306,10 +306,10 @@ index f5038c6478eeccc17e061681dbee0f384dac4911..bf23c3576bb7b2d10a840e6eb2a420b7
    if (is_win) {
      sources += [
 diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn
-index a4072a85236ad029ecb292be0085e537a7c482bb..d9250541ab197f625c42feb96d94aca4cd791195 100644
+index 146d5428d9ab82da74a427ee9ac05258e23d681d..ba6b43d205145e3bae0f094ecdaa0cebda3e0a66 100644
 --- a/ui/views/BUILD.gn
 +++ b/ui/views/BUILD.gn
-@@ -682,6 +682,7 @@ component("views") {
+@@ -680,6 +680,7 @@ component("views") {
        "IOSurface.framework",
        "QuartzCore.framework",
      ]
@@ -317,7 +317,7 @@ index a4072a85236ad029ecb292be0085e537a7c482bb..d9250541ab197f625c42feb96d94aca4
    }
  
    if (is_win) {
-@@ -1098,6 +1099,8 @@ source_set("test_support") {
+@@ -1096,6 +1097,8 @@ source_set("test_support") {
      "//testing/gtest",
    ]