build: fix Appveyor test workflow checkout (#39170)

* build: fix Appveyor test workflow checkout

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* fix: +refs/pull/num/merge -> +refs/pull/num/head

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

* chore: add to appveyor-woa as well

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>

.circleci/config/base.yml

@@ -52,7 +52,7 @@ executors:
       size:
         description: "macOS executor size"
         type: enum
-        enum: ["macos.x86.medium.gen2", "macos.m1.large.gen1", "macos.m1.medium.gen1"]
+        enum: ["macos.x86.medium.gen2"]
       version:
         description: "xcode version"
         type: enum
@@ -119,8 +119,9 @@ env-arm: &env-arm
   TARGET_ARCH: arm
 
 env-apple-silicon: &env-apple-silicon
-  GN_EXTRA_ARGS: 'target_cpu = "arm64"'
+  GN_EXTRA_ARGS: 'target_cpu = "arm64" use_prebuilt_v8_context_snapshot = true'
   TARGET_ARCH: arm64
+  USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1
   npm_config_arch: arm64
 
 env-runner: &env-runner
@@ -137,9 +138,10 @@ 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'
+  GN_EXTRA_ARGS: 'target_cpu = "arm64" is_mas_build = true use_prebuilt_v8_context_snapshot = 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
@@ -175,6 +177,9 @@ 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'
@@ -251,7 +256,7 @@ step-depot-tools-get: &step-depot-tools-get
       --- a/gclient.py
       +++ b/gclient.py
       @@ -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', []):
@@ -393,24 +398,18 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
           fi
         }
 
-        strip_universal_deep() {
+        strip_arm_deep() {
           opwd=$(pwd)
           cd $1
           f=$(find . -perm +111 -type f)
           for fp in $f
           do
             if [[ $(file "$fp") == *"universal binary"* ]]; then
-              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
+              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
           done
@@ -466,7 +465,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_universal_deep $(xcode-select -p)/../SharedFrameworks
+        strip_arm_deep $(xcode-select -p)/../SharedFrameworks
         # strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
       fi
     background: true
@@ -525,24 +524,6 @@ 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 rustc (wrong binary)
-        rm -rf src/third_party/rust-toolchain
-        python3 src/tools/rust/update_rust.py
-        
-        # 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
@@ -623,7 +604,7 @@ step-electron-chromedriver-build: &step-electron-chromedriver-build
     name: Build chromedriver.zip
     command: |
       cd src
-      if [ "`uname`" != "Darwin" ] && ([ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]); then
+      if [ "$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
@@ -634,7 +615,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 [ "`uname`" != "Darwin" ] && ([ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]); then
+      if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
         cp out/chromedriver/chromedriver.zip out/Default
       fi
 
@@ -711,7 +692,7 @@ step-verify-mksnapshot: &step-verify-mksnapshot
     command: |
       if [ "$IS_ASAN" != "1" ]; then
         cd src
-        if [ "`uname`" != "Darwin" ] && ([ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]); then
+        if [ "$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
@@ -754,15 +735,17 @@ step-mksnapshot-build: &step-mksnapshot-build
     no_output_timeout: 30m
     command: |
       cd src
-      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 ''"
+      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
       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
@@ -775,7 +758,7 @@ step-mksnapshot-build: &step-mksnapshot-build
           electron/script/strip-binaries.py --file $PWD/out/Default/v8_context_snapshot_generator
         fi
       fi
-      if [ "$SKIP_DIST_ZIP" != "1" ]; then
+      if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" != "1" ] && [ "$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
@@ -1059,7 +1042,7 @@ commands:
       artifact-key:
         type: string
       build-type:
-        type: string
+        type: string      
       build-nonproprietary-ffmpeg:
         type: boolean
         default: true
@@ -1238,6 +1221,32 @@ 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
@@ -1277,7 +1286,7 @@ commands:
       artifact-key:
         type: string
       build-type:
-        type: string
+        type: string        
       after-build-and-save:
         type: steps
         default: []
@@ -1656,7 +1665,7 @@ jobs:
           artifact-key: 'nil'
           build-type: 'nil'
 
-  mac-make-src-cache-x64:
+  mac-make-src-cache:
     executor:
       name: linux-docker
       size: xlarge
@@ -1675,25 +1684,6 @@ jobs:
           artifact-key: 'nil'
           build-type: 'nil'
 
-  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:
@@ -1731,6 +1721,23 @@ jobs:
           artifact-key: 'linux-x64-asan'
           build-type: 'Linux'
 
+  linux-x64-testing-no-run-as-node:
+    executor:
+      name: linux-docker
+      size: xlarge
+    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'
+
   linux-x64-testing-gn-check:
     executor:
       name: linux-docker
@@ -1934,7 +1941,7 @@ jobs:
   osx-publish-arm64:
     executor:
       name: macos
-      size: macos.m1.large.gen1
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -1957,7 +1964,7 @@ jobs:
   osx-testing-arm64:
     executor:
       name: macos
-      size: macos.m1.medium.gen1
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -1965,6 +1972,7 @@ 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
@@ -2015,7 +2023,7 @@ jobs:
   mas-publish-arm64:
     executor:
       name: macos
-      size: macos.m1.large.gen1
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
@@ -2214,6 +2222,9 @@ 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
@@ -2260,20 +2271,19 @@ workflows:
         - equal: [false, << pipeline.parameters.run-linux-publish >>]
         - equal: [true, << pipeline.parameters.run-build-mac >>]
     jobs:
-      - mac-make-src-cache-x64
-      - mac-make-src-cache-arm64
+      - mac-make-src-cache
       - osx-testing-x64:
           requires:
-            - mac-make-src-cache-x64
+            - mac-make-src-cache
       - osx-testing-x64-gn-check:
           requires:
-            - mac-make-src-cache-x64
+            - mac-make-src-cache
       - darwin-testing-x64-tests:
           requires:
             - osx-testing-x64
       - osx-testing-arm64:
           requires:
-            - mac-make-src-cache-arm64
+            - mac-make-src-cache
       - darwin-testing-arm64-tests:
           filters:
             branches:

.eslintrc.json

@@ -10,6 +10,7 @@
     "semi": ["error", "always"],
     "no-var": "error",
     "no-unused-vars": "off",
+    "no-global-assign": "off",
     "guard-for-in": "error",
     "@typescript-eslint/no-unused-vars": ["error", {
       "vars": "all",
@@ -19,13 +20,20 @@
     "prefer-const": ["error", {
       "destructuring": "all"
     }],
-    "standard/no-callback-literal": "off"
+    "standard/no-callback-literal": "off",
+    "node/no-deprecated-api": "off"
   },
   "parserOptions": {
     "ecmaVersion": 6,
     "sourceType": "module"
   },
   "overrides": [
+    {
+      "files": "*.js",
+      "rules": {
+        "@typescript-eslint/no-unused-vars": "off"
+      }
+    },
     {
       "files": "*.ts",
       "rules": {

.github/CODEOWNERS

@@ -15,5 +15,6 @@ DEPS                                    @electron/wg-upgrades
 # Security WG
 /lib/browser/devtools.ts                @electron/wg-security
 /lib/browser/guest-view-manager.ts      @electron/wg-security
+/lib/browser/guest-window-proxy.ts      @electron/wg-security
 /lib/browser/rpc-server.ts              @electron/wg-security
 /lib/renderer/security-warnings.ts      @electron/wg-security

.github/workflows/branch-created.yml

@@ -15,195 +15,41 @@ jobs:
       repository-projects: write  # Required for labels
     runs-on: ubuntu-latest
     steps:
-      - name: Determine Major Version
-        id: check-major-version
-        run: |
-          if [[ ${{ github.event.ref }} =~ ^([0-9]+)-x-y$ ]]; then
-            echo "MAJOR=${BASH_REMATCH[1]}" >> "$GITHUB_OUTPUT"
-          else
-            echo "Not a release branch: ${{ github.event.ref }}"
-          fi
       - name: New Release Branch Tasks
-        if: ${{ steps.check-major-version.outputs.MAJOR }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_REPO: electron/electron
-          MAJOR: ${{ steps.check-major-version.outputs.MAJOR }}
           NUM_SUPPORTED_VERSIONS: 3
         run: |
-          PREVIOUS_MAJOR=$((MAJOR - 1))
-          UNSUPPORTED_MAJOR=$((MAJOR - NUM_SUPPORTED_VERSIONS - 1))
+          if [[ ${{ github.event.ref }} =~ ^([0-9]+)-x-y$ ]]; then
+            MAJOR=${BASH_REMATCH[1]}
+            PREVIOUS_MAJOR=$((MAJOR - 1))
+            UNSUPPORTED_MAJOR=$((MAJOR - NUM_SUPPORTED_VERSIONS - 1))
 
-          # Create new labels
-          gh label create $MAJOR-x-y --color 8d9ee8 || 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
+            # 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 in-flight/$MAJOR-x-y --color db69a6 || true
+            gh label create needs-manual-bp/$MAJOR-x-y --color 8b5dba || true
 
-          # Change color of old labels
-          gh label edit $UNSUPPORTED_MAJOR-x-y --color ededed || true
-          gh label edit target/$UNSUPPORTED_MAJOR-x-y --color ededed || true
-          gh label edit merged/$UNSUPPORTED_MAJOR-x-y --color ededed || true
-          gh label edit in-flight/$UNSUPPORTED_MAJOR-x-y --color ededed || true
-          gh label edit needs-manual-bp/$UNSUPPORTED_MAJOR-x-y --color ededed || true
+            # Change color of old labels
+            gh label edit $UNSUPPORTED_MAJOR-x-y --color ededed || true
+            gh label edit target/$UNSUPPORTED_MAJOR-x-y --color ededed || true
+            gh label edit merged/$UNSUPPORTED_MAJOR-x-y --color ededed || true
+            gh label edit in-flight/$UNSUPPORTED_MAJOR-x-y --color ededed || true
+            gh label edit needs-manual-bp/$UNSUPPORTED_MAJOR-x-y --color ededed || true
 
-          # Add the new target label to any PRs which:
-          #   * target the previous major
-          #   * are in-flight for the previous major
-          #   * need manual backport for the previous major
-          for PREVIOUS_MAJOR_LABEL in target/$PREVIOUS_MAJOR-x-y in-flight/$PREVIOUS_MAJOR-x-y needs-manual-bp/$PREVIOUS_MAJOR-x-y; do
-            PULL_REQUESTS=$(gh pr list --label $PREVIOUS_MAJOR_LABEL --jq .[].number --json number --limit 500)
-            if [[ $PULL_REQUESTS ]]; then
-              echo $PULL_REQUESTS | xargs -n 1 gh pr edit --add-label target/$MAJOR-x-y || true
-            fi
-          done
-      - name: Generate GitHub App token
-        if: ${{ steps.check-major-version.outputs.MAJOR }}
-        id: generate-token
-        env:
-          RELEASE_BOARD_GH_APP_CREDS: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
-        run: |
-          TOKEN=$(npx @electron/github-app-auth --creds=$RELEASE_BOARD_GH_APP_CREDS --org electron)
-          echo "TOKEN=$TOKEN" >> "$GITHUB_OUTPUT"
-      - name: Create Release Project Board
-        if: ${{ steps.check-major-version.outputs.MAJOR }}
-        env:
-          GITHUB_TOKEN: ${{ steps.generate-token.outputs.TOKEN }}
-          MAJOR: ${{ steps.check-major-version.outputs.MAJOR }}
-          ELECTRON_ORG_ID: "O_kgDOAMybxg"
-          ELECTRON_REPO_ID: "R_kgDOAI8xSw"
-          TEMPLATE_PROJECT_ID: "PVT_kwDOAMybxs4AQvib"
-        run: |
-          # Copy template to create new project board
-          PROJECT_ID=$(gh api graphql -f query='mutation ($ownerId: ID!, $projectId: ID!, $title: String!) {  
-            copyProjectV2(input: {
-              includeDraftIssues: true,
-              ownerId: $ownerId,
-              projectId: $projectId,
-              title: $title
-            }) {
-              projectV2 {
-                id
-              }
-            }
-          }' -f ownerId=$ELECTRON_ORG_ID -f projectId=$TEMPLATE_PROJECT_ID -f title="${MAJOR}-x-y" | jq -r '.data.copyProjectV2.projectV2.id')
-
-          # Make the new project public
-          gh api graphql -f query='mutation ($projectId: ID!) {                                                                                             
-            updateProjectV2(input: {
-              projectId: $projectId,
-              public: true,
-            }) {
-              projectV2 {
-                id
-              }
-            }
-          }' -f projectId=$PROJECT_ID
-
-          # Link the new project to the Electron repository
-          gh api graphql -f query='mutation ($projectId: ID!, $repositoryId: ID!) {                                                                                             
-            linkProjectV2ToRepository(input: {
-              projectId: $projectId,
-              repositoryId: $repositoryId
-            }) {
-              clientMutationId
-            }
-          }' -f projectId=$PROJECT_ID -f repositoryId=$ELECTRON_REPO_ID
-
-          # Get all draft issues on the new project board
-          gh api graphql -f query='query ($id: ID!) {
-            node(id: $id) {
-              ... on ProjectV2 {
-                items(first: 100) {
-                  nodes {
-                    ... on ProjectV2Item {
-                      id
-                      content {
-                        ... on DraftIssue { id title
-                          body
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }' -f id=$PROJECT_ID > issues.json
-          PROJECT_ITEMS=$(jq '.data.node.items.nodes[] | select(.content.id != null) | .id' issues.json)
-
-          # TODO(dsanders11): remove the following "Stable Prep Items" sections once
-          # GitHub extends project template copying to retain the status field value
-          # of draft issues in the template.
-          #
-          # Refs https://github.com/orgs/community/discussions/54576#discussioncomment-6096892
-
-          # Get field ID and option value for "Stable Prep Items"
-          gh api graphql -f query='query ($id: ID!) {
-            node(id: $id) {
-              ... on ProjectV2 {
-                field(name: "Status") {
-                  ... on ProjectV2SingleSelectField {
-                    id
-                    options {
-                      ... on ProjectV2SingleSelectFieldOption {
-                        id
-                        name
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }' -f id=$PROJECT_ID > status_field.json
-          FIELD_ID=$(jq -r '.data.node.field.id' status_field.json)
-          FIELD_OPTION_ID=$(jq -r '.data.node.field.options[] | select(.name == "Stable Prep Items") | .id' status_field.json)
-
-          # Move draft issues to "Stable Prep" column
-          echo "$PROJECT_ITEMS" | xargs -I ITEM_ID -n 1 gh api graphql -f query='mutation ($projectId: ID!, $fieldId: ID!, $itemId: ID!, $value: String!) {                                                                                             
-            updateProjectV2ItemFieldValue(input: {
-              projectId: $projectId,
-              fieldId: $fieldId,
-              itemId: $itemId,
-              value: {
-                singleSelectOptionId: $value
-              }
-            }) {
-              projectV2Item {
-                id
-              }
-            }
-          }' -f projectId=$PROJECT_ID -f fieldId=$FIELD_ID -f itemId=ITEM_ID -f value=$FIELD_OPTION_ID
-
-          #
-          # Do template replacement for draft issues
-          #
-          echo "{\"major\": $MAJOR, \"next-major\": $((MAJOR + 1))}" > variables.json
-
-          # npx mustache is annoyingly slow, so install mustache directly
-          yarn add -D mustache
-
-          for PROJECT_ITEM_ID in $PROJECT_ITEMS; do
-            # These are done with the raw output flag and sent to file to better retain formatting
-            jq -r ".data.node.items.nodes[] | select(.id == $PROJECT_ITEM_ID) | .content.title" issues.json > title.txt
-            jq -r ".data.node.items.nodes[] | select(.id == $PROJECT_ITEM_ID) | .content.body" issues.json > body.txt
-
-            ./node_modules/.bin/mustache variables.json title.txt new_title.txt
-            ./node_modules/.bin/mustache variables.json body.txt new_body.txt
-
-            # Only update draft issues which had content change when interpolated
-            if ! cmp --silent -- new_title.txt title.txt || ! cmp --silent -- new_body.txt body.txt; then
-              DRAFT_ISSUE_ID=$(jq ".data.node.items.nodes[] | select(.id == $PROJECT_ITEM_ID) | .content.id" issues.json)
-              gh api graphql -f query='mutation ($draftIssueId: ID!, $title: String!, $body: String!) {                                                                                             
-                updateProjectV2DraftIssue(input: {
-                  draftIssueId: $draftIssueId,
-                  title: $title,
-                  body: $body
-                }) {
-                  draftIssue {
-                    id
-                  }
-                }
-              }' -f draftIssueId=$DRAFT_ISSUE_ID -f title="$(cat new_title.txt)" -f body="$(cat new_body.txt)"
-            fi
-          done
+            # Add the new target label to any PRs which:
+            #   * target the previous major
+            #   * are in-flight for the previous major
+            #   * need manual backport for the previous major
+            for PREVIOUS_MAJOR_LABEL in target/$PREVIOUS_MAJOR-x-y in-flight/$PREVIOUS_MAJOR-x-y needs-manual-bp/$PREVIOUS_MAJOR-x-y; do
+              PULL_REQUESTS=$(gh pr list --label $PREVIOUS_MAJOR_LABEL --jq .[].number --json number --limit 500)
+              if [[ $PULL_REQUESTS ]]; then
+                echo $PULL_REQUESTS | xargs -n 1 gh pr edit --add-label target/$MAJOR-x-y || true
+              fi
+            done
+          else
+            echo "Not a release branch: ${{ github.event.ref }}"
+          fi

.github/workflows/release_dependency_versions.yml

@@ -0,0 +1,33 @@
+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

@@ -37,7 +37,7 @@ if (is_mac) {
   import("build/rules.gni")
 
   assert(
-      mac_deployment_target == "10.15",
+      mac_deployment_target == "10.13",
       "Chromium has updated the mac_deployment_target, please update this assert, update the supported versions documentation (docs/tutorial/support.md) and flag this as a breaking change")
 }
 
@@ -99,6 +99,10 @@ 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
@@ -457,7 +461,6 @@ 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",
@@ -471,7 +474,6 @@ 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",
@@ -671,6 +673,39 @@ 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",
@@ -746,58 +781,22 @@ source_set("electron_lib") {
 
 if (is_mac) {
   source_set("electron_lib_arc") {
-    public_configs = [ ":branding" ]
     include_dirs = [ "." ]
     sources = [
-      "shell/app/electron_main_delegate_mac.h",
-      "shell/app/electron_main_delegate_mac.mm",
-      "shell/browser/api/electron_api_menu_mac.h",
-      "shell/browser/api/electron_api_menu_mac.mm",
-      "shell/browser/api/electron_api_native_theme_mac.mm",
-      "shell/browser/api/electron_api_push_notifications_mac.mm",
-      "shell/browser/api/electron_api_system_preferences_mac.mm",
-      "shell/browser/browser_mac.mm",
-      "shell/browser/electron_browser_main_parts_mac.mm",
       "shell/browser/mac/dict_util.h",
       "shell/browser/mac/dict_util.mm",
-      "shell/browser/mac/electron_application.h",
-      "shell/browser/mac/electron_application.mm",
       "shell/browser/mac/electron_application_delegate.h",
       "shell/browser/mac/electron_application_delegate.mm",
-      "shell/browser/native_window_mac.h",
-      "shell/browser/native_window_mac.mm",
-      "shell/browser/ui/cocoa/delayed_native_view_host.h",
-      "shell/browser/ui/cocoa/delayed_native_view_host.mm",
-      "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h",
-      "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm",
-      "shell/browser/ui/cocoa/electron_menu_controller.mm",
-      "shell/browser/ui/cocoa/electron_ns_window.h",
-      "shell/browser/ui/cocoa/electron_ns_window.mm",
-      "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
-      "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
-      "shell/browser/ui/cocoa/electron_touch_bar.h",
-      "shell/browser/ui/cocoa/electron_touch_bar.mm",
-      "shell/browser/ui/inspectable_web_contents_view_mac.h",
-      "shell/browser/ui/inspectable_web_contents_view_mac.mm",
-      "shell/browser/ui/tray_icon_cocoa.h",
-      "shell/browser/ui/tray_icon_cocoa.mm",
     ]
 
     deps = [
-      "buildflags",
-      "shell/common/api:mojo",
       "//base",
       "//skia",
       "//third_party/electron_node:node_lib",
-      "//third_party/webrtc_overrides:webrtc_component",
       "//v8",
     ]
 
-    configs += [
-      "//build/config/compiler:enable_arc",
-      "//electron/build/config:mas_build",
-      "//third_party/electron_node:node_internals",
-    ]
+    configs += [ "//build/config/compiler:enable_arc" ]
   }
 }
 
@@ -820,6 +819,15 @@ 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 = []
@@ -830,8 +838,13 @@ if (is_mac) {
     if (v8_use_external_startup_data) {
       public_deps += [ "//v8" ]
       if (use_v8_context_snapshot) {
-        sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
-        public_deps += [ "//tools/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" ]
+        }
       } else {
         sources += [ "$root_out_dir/snapshot_blob.bin" ]
       }
@@ -931,7 +944,11 @@ if (is_mac) {
 
     include_dirs = [ "." ]
     sources = filenames.framework_sources
-    frameworks = [ "IOSurface.framework" ]
+    frameworks = []
+
+    if (enable_osr) {
+      frameworks += [ "IOSurface.framework" ]
+    }
 
     ldflags = [
       "-Wl,-install_name,@rpath/$output_name.framework/$output_name",
@@ -969,7 +986,7 @@ if (is_mac) {
         deps += [ "//sandbox/mac:seatbelt" ]
       }
       defines = [ "HELPER_EXECUTABLE" ]
-      configs += [ "//electron/build/config:mas_build" ]
+      extra_configs = [ "//electron/build/config:mas_build" ]
       sources = [
         "shell/app/electron_main_mac.cc",
         "shell/app/uv_stdio_fix.cc",
@@ -1140,7 +1157,7 @@ if (is_mac) {
       "-rpath",
       "@executable_path/../Frameworks",
     ]
-    configs += [ "//electron/build/config:mas_build" ]
+    extra_configs = [ "//electron/build/config:mas_build" ]
   }
 
   if (enable_dsyms) {

DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '117.0.5897.0',
+    '116.0.5845.14',
   'node_version':
     'v18.16.1',
   'nan_version':

appveyor-woa.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-116.0.5845.0
+image: e-116.0.5791.0
 environment:
   GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -38,9 +38,7 @@ environment:
   MOCHA_REPORTER: mocha-multi-reporters
   MOCHA_MULTI_REPORTERS: "@marshallofsound/mocha-appveyor-reporter, tap"
   GOMA_FALLBACK_ON_AUTH_FAILURE: true
-  DEPOT_TOOLS_WIN_TOOLCHAIN: 1
-  DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: "https://dev-cdn.electronjs.org/windows-toolchains/_"
-  GYP_MSVS_HASH_27370823e7: 28622d16b1
+  DEPOT_TOOLS_WIN_TOOLCHAIN: 0
   PYTHONIOENCODING: UTF-8
 
   matrix:

appveyor.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-116.0.5845.0
+image: e-116.0.5791.0
 environment:
   GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -38,9 +38,7 @@ environment:
   MOCHA_REPORTER: mocha-multi-reporters
   MOCHA_MULTI_REPORTERS: "@marshallofsound/mocha-appveyor-reporter, tap"
   GOMA_FALLBACK_ON_AUTH_FAILURE: true
-  DEPOT_TOOLS_WIN_TOOLCHAIN: 1
-  DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: "https://dev-cdn.electronjs.org/windows-toolchains/_"
-  GYP_MSVS_HASH_27370823e7: 28622d16b1
+  DEPOT_TOOLS_WIN_TOOLCHAIN: 0
   PYTHONIOENCODING: UTF-8
 
   matrix:

build/.eslintrc.json

@@ -1,8 +0,0 @@
-{
-  "plugins": [
-    "unicorn"
-  ],
-  "rules": {
-    "unicorn/prefer-node-protocol": "error"
-  }
-}

build/fake_v8_context_snapshot_generator.py

@@ -0,0 +1,8 @@
+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])

build/webpack/webpack.config.base.js

@@ -1,5 +1,5 @@
-const fs = require('node:fs');
-const path = require('node:path');
+const fs = require('fs');
+const path = require('path');
 const webpack = require('webpack');
 const TerserPlugin = require('terser-webpack-plugin');
 const WrapperPlugin = require('wrapper-webpack-plugin');

buildflags/BUILD.gn

@@ -9,10 +9,13 @@ 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,10 +3,17 @@
 # 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,8 +51,6 @@ 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",
@@ -96,28 +94,6 @@ 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",
@@ -127,6 +103,13 @@ static_library("chrome") {
     sources += [ "//chrome/browser/process_singleton_posix.cc" ]
   }
 
+  if (is_mac) {
+    sources += [
+      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
+      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
+    ]
+  }
+
   if (is_win) {
     sources += [
       "//chrome/browser/extensions/global_shortcut_listener_win.cc",
@@ -174,12 +157,9 @@ 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) {
@@ -286,6 +266,41 @@ 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",
@@ -342,8 +357,6 @@ if (is_mac) {
       "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
       "//chrome/browser/platform_util_mac.mm",
       "//chrome/browser/process_singleton_mac.mm",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
     ]
 
     deps = [

default_app/.eslintrc.json

@@ -1,8 +0,0 @@
-{
-  "plugins": [
-    "unicorn"
-  ],
-  "rules": {
-    "unicorn/prefer-node-protocol": "error"
-  }
-}

default_app/default_app.ts

@@ -1,7 +1,7 @@
 import { shell } from 'electron/common';
 import { app, dialog, BrowserWindow, ipcMain } from 'electron/main';
-import * as path from 'node:path';
-import * as url from 'node:url';
+import * as path from 'path';
+import * as url from 'url';
 
 let mainWindow: BrowserWindow | null = null;
 

default_app/main.ts

@@ -1,8 +1,8 @@
 import * as electron from 'electron/main';
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as url from 'node:url';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as url from 'url';
 const { app, dialog } = electron;
 
 type DefaultAppOptions = {
@@ -15,7 +15,7 @@ type DefaultAppOptions = {
   modules: string[];
 }
 
-const Module = require('node:module');
+const Module = require('module');
 
 // Parse command line options.
 const argv = process.argv.slice(1);
@@ -112,7 +112,7 @@ function loadApplicationPackage (packagePath: string) {
       // Set v8 flags, deliberately lazy load so that apps that do not use this
       // feature do not pay the price
       if (packageJson.v8Flags) {
-        require('node:v8').setFlagsFromString(packageJson.v8Flags);
+        require('v8').setFlagsFromString(packageJson.v8Flags);
       }
       appPath = packagePath;
     }
@@ -171,7 +171,7 @@ function startRepl () {
     Using: Node.js ${nodeVersion} and Electron.js ${electronVersion}
   `);
 
-  const { REPLServer } = require('node:repl');
+  const { REPLServer } = require('repl');
   const repl = new REPLServer({
     prompt: '> '
   }).on('exit', () => {

docs/api/app.md

@@ -1276,9 +1276,6 @@ 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.

docs/api/browser-window.md

@@ -1531,10 +1531,6 @@ tabs in the window.
 Selects the next tab when native tabs are enabled and there are other
 tabs in the window.
 
-#### `win.showAllTabs()` _macOS_
-
-Shows or hides the tab overview when native tabs are enabled.
-
 #### `win.mergeAllWindows()` _macOS_
 
 Merges all windows into one window with multiple tabs when native tabs
@@ -1558,12 +1554,16 @@ Adds a window as a tab on this window, after the tab for the window instance.
 
 #### `win.setVibrancy(type)` _macOS_
 
-* `type` string | null - Can be `titlebar`, `selection`, `menu`, `popover`, `sidebar`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`, `tooltip`, `content`, `under-window`, or `under-page`. See
+* `type` string | null - Can be `appearance-based`, `light`, `dark`, `titlebar`,
+  `selection`, `menu`, `popover`, `sidebar`, `medium-light`, `ultra-dark`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`, `tooltip`, `content`, `under-window`, or `under-page`. See
   the [macOS documentation][vibrancy-docs] for more details.
 
 Adds a vibrancy effect to the browser window. Passing `null` or an empty string
 will remove the vibrancy effect on the window.
 
+Note that `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` have been
+deprecated and will be removed in an upcoming version of macOS.
+
 #### `win.setBackgroundMaterial(material)` _Windows_
 
 * `material` string
@@ -1651,8 +1651,8 @@ Throws an error if `browserView` is not attached to `win`.
 
 #### `win.getBrowserViews()` _Experimental_
 
-Returns `BrowserView[]` - a sorted by z-index array of all BrowserViews that have been attached
-with `addBrowserView` or `setBrowserView`. The top-most BrowserView is the last element of the array.
+Returns `BrowserView[]` - an array of all BrowserViews that have been attached
+with `addBrowserView` or `setBrowserView`.
 
 **Note:** The BrowserView API is currently experimental and may change or be
 removed in future Electron releases.

docs/api/menu-item.md

@@ -14,7 +14,7 @@ See [`Menu`](menu.md) for examples.
     * `menuItem` MenuItem
     * `browserWindow` [BrowserWindow](browser-window.md) | undefined - This will not be defined if no window is open.
     * `event` [KeyboardEvent](structures/keyboard-event.md)
-  * `role` string (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `showSubstitutions`, `toggleSmartQuotes`, `toggleSmartDashes`, `toggleTextReplacement`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `showAllTabs`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
+  * `role` string (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `showSubstitutions`, `toggleSmartQuotes`, `toggleSmartDashes`, `toggleTextReplacement`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
     `click` property will be ignored. See [roles](#roles).
   * `type` string (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
     `radio`.
@@ -111,7 +111,6 @@ The following additional roles are available on _macOS_:
 * `toggleTabBar` - Map to the `toggleTabBar` action.
 * `selectNextTab` - Map to the `selectNextTab` action.
 * `selectPreviousTab` - Map to the `selectPreviousTab` action.
-* `showAllTabs` - Map to the `showAllTabs` action.
 * `mergeAllWindows` - Map to the `mergeAllWindows` action.
 * `moveTabToNewWindow` - Map to the `moveTabToNewWindow` action.
 * `window` - The submenu is a "Window" menu.
@@ -160,7 +159,7 @@ A `string` indicating the type of the item. Can be `normal`, `separator`, `subme
 
 #### `menuItem.role`
 
-A `string` (optional) indicating the item's role, if set. Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `showAllTabs`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu`
+A `string` (optional) indicating the item's role, if set. Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu`
 
 #### `menuItem.accelerator`
 

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

@@ -104,9 +104,12 @@
   Windows, which adds standard window frame. Setting it to `false` will remove
   window shadow and window animations. Default is `true`.
 * `vibrancy` string (optional) _macOS_ - Add a type of vibrancy effect to
-  the window, only on macOS. Can be `appearance-based`, `titlebar`, `selection`,
-  `menu`, `popover`, `sidebar`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`,
-  `tooltip`, `content`, `under-window`, or `under-page`.
+  the window, only on macOS. Can be `appearance-based`, `light`, `dark`,
+  `titlebar`, `selection`, `menu`, `popover`, `sidebar`, `medium-light`,
+  `ultra-dark`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`,
+  `tooltip`, `content`, `under-window`, or `under-page`. Please note that
+  `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` are
+  deprecated and have been removed in macOS Catalina (10.15).
 * `backgroundMaterial` string (optional) _Windows_ - Set the window's
   system-drawn background material, including behind the non-client area.
   Can be `auto`, `none`, `mica`, `acrylic` or `tabbed`. See [win.setBackgroundMaterial](../browser-window.md#winsetbackgroundmaterialmaterial-windows) for more information.

docs/api/structures/product.md

@@ -3,6 +3,8 @@
 * `productIdentifier` string - The string that identifies the product to the Apple App Store.
 * `localizedDescription` string - A description of the product.
 * `localizedTitle` string - The name of the product.
+* `contentVersion` string - A string that identifies the version of the content.
+* `contentLengths` number[] - The total size of the content, in bytes.
 * `price` number - The cost of the product in the local currency.
 * `formattedPrice` string - The locale formatted price of the product.
 * `currencyCode` string - 3 character code presenting a product's currency based on the ISO 4217 standard.

docs/api/structures/web-preferences.md

@@ -67,7 +67,6 @@
   * `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/fiddles/features/dark-mode/main.js

@@ -1,5 +1,5 @@
 const { app, BrowserWindow, ipcMain, nativeTheme } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 function createWindow () {
   const win = new BrowserWindow({

docs/fiddles/features/drag-and-drop/main.js

@@ -1,7 +1,7 @@
 const { app, BrowserWindow, ipcMain } = require('electron')
-const path = require('node:path')
-const fs = require('node:fs')
-const https = require('node:https')
+const path = require('path')
+const fs = require('fs')
+const https = require('https')
 
 function createWindow () {
   const win = new BrowserWindow({

docs/fiddles/features/offscreen-rendering/main.js

@@ -1,6 +1,6 @@
 const { app, BrowserWindow } = require('electron')
-const fs = require('node:fs')
-const path = require('node:path')
+const fs = require('fs')
+const path = require('path')
 
 app.disableHardwareAcceleration()
 

docs/fiddles/features/recent-documents/main.js

@@ -1,6 +1,6 @@
 const { app, BrowserWindow } = require('electron')
-const fs = require('node:fs')
-const path = require('node:path')
+const fs = require('fs')
+const path = require('path')
 
 function createWindow () {
   const win = new BrowserWindow({

docs/fiddles/features/represented-file/main.js

@@ -1,5 +1,5 @@
 const { app, BrowserWindow } = require('electron')
-const os = require('node:os')
+const os = require('os')
 
 function createWindow () {
   const win = new BrowserWindow({

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

@@ -1,5 +1,5 @@
 const { app, BrowserWindow, ipcMain } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 let bluetoothPinCallback
 let selectBluetoothCallback

docs/fiddles/ipc/pattern-1/main.js

@@ -1,5 +1,5 @@
 const { app, BrowserWindow, ipcMain } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 function createWindow () {
   const mainWindow = new BrowserWindow({

docs/fiddles/ipc/pattern-2/main.js

@@ -1,5 +1,5 @@
 const { app, BrowserWindow, ipcMain, dialog } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 async function handleFileOpen () {
   const { canceled, filePaths } = await dialog.showOpenDialog()

docs/fiddles/ipc/pattern-3/main.js

@@ -1,5 +1,5 @@
 const { app, BrowserWindow, Menu, ipcMain } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 function createWindow () {
   const mainWindow = new BrowserWindow({

docs/fiddles/ipc/webview-new-window/main.js

@@ -1,6 +1,6 @@
 // Modules to control application life and create native browser window
 const { app, BrowserWindow } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 function createWindow () {
   // Create the browser window.

docs/fiddles/media/screenshot/take-screenshot/main.js

@@ -12,7 +12,6 @@ function createWindow () {
     height: 300,
     title: 'Take a Screenshot',
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   }

docs/fiddles/media/screenshot/take-screenshot/renderer.js

@@ -1,8 +1,8 @@
 const { desktopCapturer, shell, ipcRenderer } = require('electron')
 
-const fs = require('node:fs')
-const os = require('node:os')
-const path = require('node:path')
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
 
 const screenshot = document.getElementById('screen-shot')
 const screenshotMsg = document.getElementById('screenshot-path')

docs/fiddles/menus/customize-menus/main.js

@@ -294,7 +294,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/menus/customize-menus/renderer.js

@@ -1,4 +1,4 @@
-const { ipcRenderer, shell } = require('electron')
+const { ipcRenderer } = require('electron')
 
 // Tell main process to show the menu when demo button is clicked
 const contextMenuBtn = document.getElementById('context-menu')
@@ -6,15 +6,3 @@ const contextMenuBtn = document.getElementById('context-menu')
 contextMenuBtn.addEventListener('click', () => {
   ipcRenderer.send('show-context-menu')
 })
-
-const links = document.querySelectorAll('a[href]')
-
-for (const link of links) {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-}

docs/fiddles/menus/shortcuts/index.html

@@ -68,10 +68,6 @@
 			</div>
 		</div>
 	</div>
-    <script>
-      // You can also require other files to run in this process
-      require("./renderer.js");
-    </script>
 </body>
 
 </html>

docs/fiddles/menus/shortcuts/main.js

@@ -11,7 +11,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/menus/shortcuts/renderer.js

@@ -1,13 +0,0 @@
-const { shell } = require('electron')
-
-const links = document.querySelectorAll('a[href]')
-
-for (const link of links) {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-}

docs/fiddles/native-ui/dialogs/error-dialog/main.js

@@ -11,7 +11,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/native-ui/dialogs/error-dialog/renderer.js

@@ -7,7 +7,7 @@ errorBtn.addEventListener('click', event => {
   ipcRenderer.send('open-error-dialog')
 })
 
-for (const link of links) {
+Array.prototype.forEach.call(links, (link) => {
   const url = link.getAttribute('href')
   if (url.indexOf('http') === 0) {
     link.addEventListener('click', (e) => {
@@ -15,4 +15,4 @@ for (const link of links) {
       shell.openExternal(url)
     })
   }
-}
+})

docs/fiddles/native-ui/dialogs/information-dialog/main.js

@@ -11,7 +11,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/native-ui/dialogs/information-dialog/renderer.js

@@ -14,7 +14,7 @@ ipcRenderer.on('information-dialog-selection', (event, index) => {
   document.getElementById('info-selection').innerHTML = message
 })
 
-for (const link of links) {
+Array.prototype.forEach.call(links, (link) => {
   const url = link.getAttribute('href')
   if (url.indexOf('http') === 0) {
     link.addEventListener('click', (e) => {
@@ -22,4 +22,4 @@ for (const link of links) {
       shell.openExternal(url)
     })
   }
-}
+})

docs/fiddles/native-ui/dialogs/open-file-or-directory/main.js

@@ -11,7 +11,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/native-ui/dialogs/open-file-or-directory/renderer.js

@@ -11,7 +11,7 @@ ipcRenderer.on('selected-directory', (event, path) => {
   document.getElementById('selected-file').innerHTML = `You selected: ${path}`
 })
 
-for (const link of links) {
+Array.prototype.forEach.call(links, (link) => {
   const url = link.getAttribute('href')
   if (url.indexOf('http') === 0) {
     link.addEventListener('click', (e) => {
@@ -19,4 +19,4 @@ for (const link of links) {
       shell.openExternal(url)
     })
   }
-}
+})

docs/fiddles/native-ui/dialogs/save-dialog/main.js

@@ -11,7 +11,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/native-ui/dialogs/save-dialog/renderer.js

@@ -12,7 +12,7 @@ ipcRenderer.on('saved-file', (event, path) => {
   document.getElementById('file-saved').innerHTML = `Path selected: ${path}`
 })
 
-for (const link of links) {
+Array.prototype.forEach.call(links, (link) => {
   const url = link.getAttribute('href')
   if (url.indexOf('http') === 0) {
     link.addEventListener('click', (e) => {
@@ -20,4 +20,4 @@ for (const link of links) {
       shell.openExternal(url)
     })
   }
-}
+})

docs/fiddles/native-ui/drag-and-drop/main.js

@@ -10,7 +10,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/native-ui/drag-and-drop/renderer.js

@@ -3,7 +3,7 @@ const shell = require('electron').shell
 
 const links = document.querySelectorAll('a[href]')
 
-for (const link of links) {
+Array.prototype.forEach.call(links, (link) => {
   const url = link.getAttribute('href')
   if (url.indexOf('http') === 0) {
     link.addEventListener('click', (e) => {
@@ -11,7 +11,7 @@ for (const link of links) {
       shell.openExternal(url)
     })
   }
-}
+})
 
 const dragFileLink = document.getElementById('drag-file-link')
 

docs/fiddles/native-ui/external-links-file-manager/external-links/index.html

@@ -45,15 +45,14 @@
             <pre><code>
                 const { shell } = require('electron')
                 const links = document.querySelectorAll('a[href]')
-                for (const link of links) {
+                Array.prototype.forEach.call(links, (link) => {
                     const url = link.getAttribute('href')
                     if (url.indexOf('http') === 0) {
-                        link.addEventListener('click', (e) => {
-                            e.preventDefault()
-                            shell.openExternal(url)
-                        })
-                    }
-                }
+                    link.addEventListener('click', (e) => {
+                        e.preventDefault()
+                        shell.openExternal(url)
+                    })
+                }})
             </code></pre>
           </div>
         </div>

docs/fiddles/native-ui/external-links-file-manager/external-links/main.js

@@ -8,7 +8,6 @@ function createWindow () {
     height: 400,
     title: 'Open External Links',
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   }

docs/fiddles/native-ui/external-links-file-manager/index.html

@@ -80,7 +80,7 @@ const shell = require('electron').shell
 
 const links = document.querySelectorAll('a[href]')
 
-for (const link of links) {
+Array.prototype.forEach.call(links, (link) => {
   const url = link.getAttribute('href')
   if (url.indexOf('http') === 0) {
     link.addEventListener('click', (e) => {
@@ -88,7 +88,7 @@ for (const link of links) {
       shell.openExternal(url)
     })
   }
-}
+})
                 </code>
               </pre>
           </div>

docs/fiddles/native-ui/external-links-file-manager/main.js

@@ -11,7 +11,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/native-ui/external-links-file-manager/path-in-file-manager/main.js

@@ -8,7 +8,6 @@ function createWindow () {
     height: 400,
     title: 'Open Path in File Manager',
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   }

docs/fiddles/native-ui/external-links-file-manager/path-in-file-manager/renderer.js

@@ -1,5 +1,5 @@
 const { shell } = require('electron')
-const os = require('node:os')
+const os = require('os')
 
 const fileManagerBtn = document.getElementById('open-file-manager')
 

docs/fiddles/native-ui/external-links-file-manager/renderer.js

@@ -1,5 +1,5 @@
 const { shell } = require('electron')
-const os = require('node:os')
+const os = require('os')
 
 const exLinksBtn = document.getElementById('open-ex-links')
 const fileManagerBtn = document.getElementById('open-file-manager')
@@ -11,15 +11,3 @@ fileManagerBtn.addEventListener('click', (event) => {
 exLinksBtn.addEventListener('click', (event) => {
   shell.openExternal('https://electronjs.org')
 })
-
-const links = document.querySelectorAll('a[href]')
-
-for (const link of links) {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-}

docs/fiddles/native-ui/notifications/basic-notification/index.html

@@ -6,7 +6,7 @@
   <body>
     <div>
       <h3>Basic notification</h3>
-      <em>Supports: Win 7+, macOS, Linux (that supports libnotify)<span>|</span> Process: Renderer</em>
+      <i>Supports: Win 7+, macOS, Linux (that supports libnotify)<span>|</span> Process: Renderer</i>
       <div>
         <div>
           <button id="basic-noti">View demo</button>

docs/fiddles/native-ui/notifications/basic-notification/main.js

@@ -8,7 +8,6 @@ function createWindow () {
     height: 300,
     title: 'Basic Notification',
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   }

docs/fiddles/native-ui/notifications/main.js

@@ -11,7 +11,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/native-ui/notifications/notification-with-image/main.js

@@ -8,7 +8,6 @@ function createWindow () {
     height: 300,
     title: 'Advanced Notification',
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   }

docs/fiddles/native-ui/notifications/renderer.js

@@ -1,5 +1,3 @@
-const { shell } = require('electron')
-
 const basicNotification = {
   title: 'Basic Notification',
   body: 'Short message part'
@@ -29,15 +27,3 @@ basicNotificationButton.addEventListener('click', () => {
     console.log('Notification clicked')
   }
 })
-
-const links = document.querySelectorAll('a[href]')
-
-for (const link of links) {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-}

docs/fiddles/quick-start/main.js

@@ -1,5 +1,5 @@
 const { app, BrowserWindow } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 function createWindow () {
   const win = new BrowserWindow({

docs/fiddles/system/clipboard/copy/main.js

@@ -1,5 +1,5 @@
 const { app, BrowserWindow, ipcMain, clipboard } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 let mainWindow = null
 

docs/fiddles/system/clipboard/paste/main.js

@@ -1,5 +1,5 @@
 const { app, BrowserWindow, ipcMain, clipboard } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 let mainWindow = null
 

docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js

@@ -1,6 +1,6 @@
 // Modules to control application life and create native browser window
 const { app, BrowserWindow, ipcMain, shell, dialog } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 let mainWindow
 

docs/fiddles/system/system-information/get-version-information/main.js

@@ -8,7 +8,6 @@ function createWindow () {
     height: 400,
     title: 'Get version information',
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   }

docs/fiddles/system/system-information/get-version-information/renderer.js

@@ -1,5 +1,3 @@
-const { shell } = require('electron')
-
 const versionInfoBtn = document.getElementById('version-info')
 
 const electronVersion = process.versions.electron
@@ -8,15 +6,3 @@ versionInfoBtn.addEventListener('click', () => {
   const message = `This app is using Electron version: ${electronVersion}`
   document.getElementById('got-version-info').innerHTML = message
 })
-
-const links = document.querySelectorAll('a[href]')
-
-for (const link of links) {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-}

docs/fiddles/tutorial-preload/main.js

@@ -1,5 +1,5 @@
 const { app, BrowserWindow } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 const createWindow = () => {
   const win = new BrowserWindow({

docs/fiddles/windows/manage-windows/create-frameless-window/index.html

@@ -7,7 +7,7 @@
     <div>
       <div>
         <h1>Create a frameless window</h1>
-        <em>Supports: Win, macOS, Linux <span>|</span> Process: Main</em>
+        <i>Supports: Win, macOS, Linux <span>|</span> Process: Main</i>
         <div>
           <p>A frameless window is a window that has no <i>"chrome"</i>,
             such as toolbars, title bars, status bars, borders, etc. You can make
@@ -23,4 +23,4 @@
   <script>
     require('./renderer.js')
   </script>
-</html>
+</html>

docs/fiddles/windows/manage-windows/create-frameless-window/main.js

@@ -11,7 +11,6 @@ function createWindow () {
     height: 400,
     title: 'Create a frameless window',
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/windows/manage-windows/frameless-window/main.js

@@ -12,7 +12,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/windows/manage-windows/frameless-window/renderer.js

@@ -1,4 +1,4 @@
-const { ipcRenderer, shell } = require('electron')
+const { ipcRenderer } = require('electron')
 
 const newWindowBtn = document.getElementById('frameless-window')
 
@@ -6,15 +6,3 @@ newWindowBtn.addEventListener('click', () => {
   const url = 'data:text/html,<h2>Hello World!</h2><a id="close" href="javascript:window.close()">Close this Window</a>'
   ipcRenderer.send('create-frameless-window', { url })
 })
-
-const links = document.querySelectorAll('a[href]')
-
-for (const link of links) {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-}

docs/fiddles/windows/manage-windows/manage-window-state/main.js

@@ -22,7 +22,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/windows/manage-windows/manage-window-state/renderer.js

@@ -14,7 +14,7 @@ manageWindowBtn.addEventListener('click', (event) => {
   ipcRenderer.send('create-demo-window')
 })
 
-for (const link of links) {
+Array.prototype.forEach.call(links, (link) => {
   const url = link.getAttribute('href')
   if (url.indexOf('http') === 0) {
     link.addEventListener('click', (e) => {
@@ -22,4 +22,4 @@ for (const link of links) {
       shell.openExternal(url)
     })
   }
-}
+})

docs/fiddles/windows/manage-windows/new-window/main.js

@@ -12,7 +12,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/windows/manage-windows/window-events/main.js

@@ -7,7 +7,6 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      contextIsolation: false,
       nodeIntegration: true
     }
   })

docs/fiddles/windows/manage-windows/window-events/renderer.js

@@ -28,7 +28,7 @@ listenToWindowBtn.addEventListener('click', () => {
 
 const links = document.querySelectorAll('a[href]')
 
-for (const link of links) {
+Array.prototype.forEach.call(links, (link) => {
   const url = link.getAttribute('href')
   if (url.indexOf('http') === 0) {
     link.addEventListener('click', (e) => {
@@ -36,4 +36,4 @@ for (const link of links) {
       shell.openExternal(url)
     })
   }
-}
+})

docs/tutorial/performance.md

@@ -54,7 +54,7 @@ at once, consider the [Chrome Tracing](https://www.chromium.org/developers/how-t
 
 ### Recommended Reading
 
-* [Analyze runtime performance][chrome-devtools-tutorial]
+* [Get Started With Analyzing Runtime Performance][chrome-devtools-tutorial]
 * [Talk: "Visual Studio Code - The First Second"][vscode-first-second]
 
 ## Checklist: Performance recommendations
@@ -69,7 +69,6 @@ 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
 
@@ -433,7 +432,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://developer.chrome.com/docs/devtools/performance/
+[chrome-devtools-tutorial]: https://developers.google.com/web/tools/chrome-devtools/evaluate-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/testing-on-headless-ci.md

@@ -32,7 +32,18 @@ xvfb-maybe electron-mocha ./test/*.js
 
 ### Travis CI
 
-For Travis, see its [docs on using Xvfb](https://docs.travis-ci.com/user/gui-and-headless-browsers/#using-xvfb-to-run-tests-that-require-a-gui).
+On Travis, your `.travis.yml` should look roughly like this:
+
+```yml
+addons:
+  apt:
+    packages:
+      - xvfb
+
+install:
+  - export DISPLAY=':99.0'
+  - Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
+```
 
 ### Jenkins
 

filenames.gni

@@ -116,10 +116,21 @@ filenames = {
   ]
 
   lib_sources_mac = [
+    "shell/app/electron_main_delegate_mac.h",
+    "shell/app/electron_main_delegate_mac.mm",
     "shell/browser/api/electron_api_app_mac.mm",
+    "shell/browser/api/electron_api_menu_mac.h",
+    "shell/browser/api/electron_api_menu_mac.mm",
+    "shell/browser/api/electron_api_native_theme_mac.mm",
     "shell/browser/api/electron_api_power_monitor_mac.mm",
+    "shell/browser/api/electron_api_push_notifications_mac.mm",
+    "shell/browser/api/electron_api_system_preferences_mac.mm",
     "shell/browser/api/electron_api_web_contents_mac.mm",
     "shell/browser/auto_updater_mac.mm",
+    "shell/browser/browser_mac.mm",
+    "shell/browser/electron_browser_main_parts_mac.mm",
+    "shell/browser/mac/electron_application.h",
+    "shell/browser/mac/electron_application.mm",
     "shell/browser/mac/in_app_purchase_observer.h",
     "shell/browser/mac/in_app_purchase_observer.mm",
     "shell/browser/mac/in_app_purchase_product.h",
@@ -128,25 +139,36 @@ filenames = {
     "shell/browser/mac/in_app_purchase.mm",
     "shell/browser/native_browser_view_mac.h",
     "shell/browser/native_browser_view_mac.mm",
+    "shell/browser/native_window_mac.h",
+    "shell/browser/native_window_mac.mm",
     "shell/browser/notifications/mac/cocoa_notification.h",
     "shell/browser/notifications/mac/cocoa_notification.mm",
     "shell/browser/notifications/mac/notification_center_delegate.h",
     "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",
+    "shell/browser/ui/cocoa/delayed_native_view_host.h",
     "shell/browser/ui/cocoa/electron_bundle_mover.h",
     "shell/browser/ui/cocoa/electron_bundle_mover.mm",
+    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h",
+    "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm",
     "shell/browser/ui/cocoa/electron_menu_controller.h",
+    "shell/browser/ui/cocoa/electron_menu_controller.mm",
     "shell/browser/ui/cocoa/electron_native_widget_mac.h",
     "shell/browser/ui/cocoa/electron_native_widget_mac.mm",
+    "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
+    "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
     "shell/browser/ui/cocoa/electron_ns_panel.h",
     "shell/browser/ui/cocoa/electron_ns_panel.mm",
+    "shell/browser/ui/cocoa/electron_ns_window.h",
+    "shell/browser/ui/cocoa/electron_ns_window.mm",
     "shell/browser/ui/cocoa/electron_preview_item.h",
     "shell/browser/ui/cocoa/electron_preview_item.mm",
+    "shell/browser/ui/cocoa/electron_touch_bar.h",
+    "shell/browser/ui/cocoa/electron_touch_bar.mm",
     "shell/browser/ui/cocoa/event_dispatching_window.h",
     "shell/browser/ui/cocoa/event_dispatching_window.mm",
     "shell/browser/ui/cocoa/NSString+ANSI.h",
@@ -159,7 +181,11 @@ filenames = {
     "shell/browser/ui/cocoa/window_buttons_proxy.mm",
     "shell/browser/ui/drag_util_mac.mm",
     "shell/browser/ui/file_dialog_mac.mm",
+    "shell/browser/ui/inspectable_web_contents_view_mac.h",
+    "shell/browser/ui/inspectable_web_contents_view_mac.mm",
     "shell/browser/ui/message_box_mac.mm",
+    "shell/browser/ui/tray_icon_cocoa.h",
+    "shell/browser/ui/tray_icon_cocoa.mm",
     "shell/common/api/electron_api_clipboard_mac.mm",
     "shell/common/api/electron_api_native_image_mac.mm",
     "shell/common/asar/archive_mac.mm",
@@ -211,8 +237,6 @@ 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",
@@ -425,16 +449,6 @@ 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",

filenames.libcxx.gni

@@ -25,7 +25,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/find_if_not.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each_n.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each_segment.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/generate.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/generate_n.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/half_positive.h",
@@ -72,31 +71,9 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/pop_heap.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/prev_permutation.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_any_all_none_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backend.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backend.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/any_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/backend.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/fill.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/find_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/for_each.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/merge.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/serial.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/stable_sort.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/thread.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/transform.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/transform_reduce.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_count.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_fill.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_find.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_for_each.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_frontend_dispatch.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_generate.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_is_partitioned.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_merge.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_replace.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_stable_sort.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_transform.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/push_heap.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_adjacent_find.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_all_of.h",
@@ -179,7 +156,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_sort_heap.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_stable_partition.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_stable_sort.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_starts_with.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_swap_ranges.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_transform.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_unique.h",
@@ -330,7 +306,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__coroutine/trivial_awaitables.h",
   "//buildtools/third_party/libc++/trunk/include/__debug",
   "//buildtools/third_party/libc++/trunk/include/__debug_utils/randomize_range.h",
-  "//buildtools/third_party/libc++/trunk/include/__debug_utils/strict_weak_ordering_check.h",
   "//buildtools/third_party/libc++/trunk/include/__exception/exception.h",
   "//buildtools/third_party/libc++/trunk/include/__exception/exception_ptr.h",
   "//buildtools/third_party/libc++/trunk/include/__exception/nested_exception.h",
@@ -413,6 +388,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__functional/reference_wrapper.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/unary_function.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/unary_negate.h",
+  "//buildtools/third_party/libc++/trunk/include/__functional/unwrap_ref.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/weak_result_type.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/array.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/fstream.h",
@@ -439,7 +415,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__iterator/common_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/concepts.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/counted_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/cpp17_iterator_concepts.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/data.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/default_sentinel.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/distance.h",
@@ -478,7 +453,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__locale_dir/locale_base_api/bsd_locale_fallbacks.h",
   "//buildtools/third_party/libc++/trunk/include/__locale_dir/locale_base_api/locale_guard.h",
   "//buildtools/third_party/libc++/trunk/include/__mbstate_t.h",
-  "//buildtools/third_party/libc++/trunk/include/__mdspan/extents.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/addressof.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/align.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/aligned_alloc.h",
@@ -504,7 +478,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__memory/temp_value.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/temporary_buffer.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/uninitialized_algorithms.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/uninitialized_buffer.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/unique_ptr.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/uses_allocator.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/uses_allocator_construction.h",
@@ -529,8 +502,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__numeric/iota.h",
   "//buildtools/third_party/libc++/trunk/include/__numeric/midpoint.h",
   "//buildtools/third_party/libc++/trunk/include/__numeric/partial_sum.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/pstl_reduce.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/pstl_transform_reduce.h",
   "//buildtools/third_party/libc++/trunk/include/__numeric/reduce.h",
   "//buildtools/third_party/libc++/trunk/include/__numeric/transform_exclusive_scan.h",
   "//buildtools/third_party/libc++/trunk/include/__numeric/transform_inclusive_scan.h",
@@ -564,6 +535,8 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__pstl/internal/parallel_backend_serial.h",
   "//buildtools/third_party/libc++/trunk/include/__pstl/internal/parallel_backend_tbb.h",
   "//buildtools/third_party/libc++/trunk/include/__pstl/internal/parallel_backend_utils.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/parallel_impl.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/pstl_config.h",
   "//buildtools/third_party/libc++/trunk/include/__pstl/internal/unseq_backend_simd.h",
   "//buildtools/third_party/libc++/trunk/include/__pstl/internal/utils.h",
   "//buildtools/third_party/libc++/trunk/include/__pstl_algorithm",
@@ -612,7 +585,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__ranges/as_rvalue_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/common_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/concepts.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/container_compatible_range.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/copyable_box.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/counted.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/dangling.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/data.h",
@@ -624,12 +597,10 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__ranges/enable_borrowed_range.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/enable_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/filter_view.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/from_range.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/iota_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/istream_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/join_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/lazy_split_view.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/movable_box.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/non_propagating_cache.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/owning_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/range_adaptor.h",
@@ -649,13 +620,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__ranges/zip_view.h",
   "//buildtools/third_party/libc++/trunk/include/__split_buffer",
   "//buildtools/third_party/libc++/trunk/include/__std_mbstate_t.h",
-  "//buildtools/third_party/libc++/trunk/include/__stop_token/atomic_unique_lock.h",
-  "//buildtools/third_party/libc++/trunk/include/__stop_token/intrusive_list_view.h",
-  "//buildtools/third_party/libc++/trunk/include/__stop_token/intrusive_shared_ptr.h",
-  "//buildtools/third_party/libc++/trunk/include/__stop_token/stop_callback.h",
-  "//buildtools/third_party/libc++/trunk/include/__stop_token/stop_source.h",
-  "//buildtools/third_party/libc++/trunk/include/__stop_token/stop_state.h",
-  "//buildtools/third_party/libc++/trunk/include/__stop_token/stop_token.h",
   "//buildtools/third_party/libc++/trunk/include/__string/char_traits.h",
   "//buildtools/third_party/libc++/trunk/include/__string/constexpr_c_functions.h",
   "//buildtools/third_party/libc++/trunk/include/__string/extern_template_lists.h",
@@ -668,6 +632,9 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__support/musl/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/newlib/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/openbsd/xlocale.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/solaris/floatingpoint.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/solaris/wchar.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/solaris/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/win32/locale_win32.h",
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__nop_locale_mgmt.h",
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__posix_l_fallback.h",
@@ -677,10 +644,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__system_error/error_code.h",
   "//buildtools/third_party/libc++/trunk/include/__system_error/error_condition.h",
   "//buildtools/third_party/libc++/trunk/include/__system_error/system_error.h",
-  "//buildtools/third_party/libc++/trunk/include/__thread/formatter.h",
   "//buildtools/third_party/libc++/trunk/include/__thread/poll_with_backoff.h",
-  "//buildtools/third_party/libc++/trunk/include/__thread/this_thread.h",
-  "//buildtools/third_party/libc++/trunk/include/__thread/thread.h",
   "//buildtools/third_party/libc++/trunk/include/__thread/timed_backoff_policy.h",
   "//buildtools/third_party/libc++/trunk/include/__threading_support",
   "//buildtools/third_party/libc++/trunk/include/__tree",
@@ -718,7 +682,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/has_unique_object_representation.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/has_virtual_destructor.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/integral_constant.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/invoke.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_abstract.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_aggregate.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_allocator.h",
@@ -791,7 +754,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_copyable.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_default_constructible.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_destructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_lexicographically_comparable.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_move_assignable.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_move_constructible.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_unbounded_array.h",
@@ -810,7 +772,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/nat.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/negation.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/noexcept_move_assign_container.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/operation_traits.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/predicate_traits.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/promote.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/rank.h",
@@ -828,7 +789,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/type_identity.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/type_list.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/underlying_type.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/unwrap_ref.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/void_t.h",
   "//buildtools/third_party/libc++/trunk/include/__undef_macros",
   "//buildtools/third_party/libc++/trunk/include/__utility/as_const.h",
@@ -842,7 +802,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__utility/forward_like.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/in_place.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/integer_sequence.h",
-  "//buildtools/third_party/libc++/trunk/include/__utility/is_pointer_in_range.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/move.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/pair.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/piecewise_construct.h",
@@ -947,7 +906,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/locale.h",
   "//buildtools/third_party/libc++/trunk/include/map",
   "//buildtools/third_party/libc++/trunk/include/math.h",
-  "//buildtools/third_party/libc++/trunk/include/mdspan",
   "//buildtools/third_party/libc++/trunk/include/memory",
   "//buildtools/third_party/libc++/trunk/include/memory_resource",
   "//buildtools/third_party/libc++/trunk/include/module.modulemap.in",
@@ -978,7 +936,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/stdint.h",
   "//buildtools/third_party/libc++/trunk/include/stdio.h",
   "//buildtools/third_party/libc++/trunk/include/stdlib.h",
-  "//buildtools/third_party/libc++/trunk/include/stop_token",
   "//buildtools/third_party/libc++/trunk/include/streambuf",
   "//buildtools/third_party/libc++/trunk/include/string",
   "//buildtools/third_party/libc++/trunk/include/string.h",

lib/asar/fs-wrapper.ts

@@ -838,7 +838,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
     const originalModuleLoad = Module._load;
     Module._load = (request: string, ...args: any[]) => {
       const loadResult = originalModuleLoad(request, ...args);
-      if (request === 'child_process' || request === 'node:child_process') {
+      if (request === 'child_process') {
         if (!asarReady.has(loadResult)) {
           asarReady.add(loadResult);
           // Just to make it obvious what we are dealing with here

lib/browser/api/dialog.ts

@@ -59,7 +59,7 @@ const checkAppInitialized = function () {
 const setupOpenDialogProperties = (properties: (keyof typeof OpenFileDialogProperties)[]): number => {
   let dialogProperties = 0;
   for (const property of properties) {
-    if (Object.hasOwn(OpenFileDialogProperties, property)) { dialogProperties |= OpenFileDialogProperties[property]; }
+    if (Object.prototype.hasOwnProperty.call(OpenFileDialogProperties, property)) { dialogProperties |= OpenFileDialogProperties[property]; }
   }
   return dialogProperties;
 };
@@ -67,7 +67,7 @@ const setupOpenDialogProperties = (properties: (keyof typeof OpenFileDialogPrope
 const setupSaveDialogProperties = (properties: (keyof typeof SaveFileDialogProperties)[]): number => {
   let dialogProperties = 0;
   for (const property of properties) {
-    if (Object.hasOwn(SaveFileDialogProperties, property)) { dialogProperties |= SaveFileDialogProperties[property]; }
+    if (Object.prototype.hasOwnProperty.call(SaveFileDialogProperties, property)) { dialogProperties |= SaveFileDialogProperties[property]; }
   }
   return dialogProperties;
 };

lib/browser/api/menu-item-roles.ts

@@ -311,7 +311,7 @@ export const roleList: Record<RoleId, Role> = {
 };
 
 const hasRole = (role: keyof typeof roleList) => {
-  return Object.hasOwn(roleList, role);
+  return Object.prototype.hasOwnProperty.call(roleList, role);
 };
 
 const canExecuteRole = (role: keyof typeof roleList) => {
@@ -336,7 +336,7 @@ export function getCheckStatus (role: RoleId) {
 }
 
 export function shouldOverrideCheckStatus (role: RoleId) {
-  return hasRole(role) && Object.hasOwn(roleList[role], 'checked');
+  return hasRole(role) && Object.prototype.hasOwnProperty.call(roleList[role], 'checked');
 }
 
 export function getDefaultAccelerator (role: RoleId) {

lib/browser/api/menu.ts

@@ -214,7 +214,9 @@ function areValidTemplateItems (template: (MenuItemConstructorOptions | MenuItem
   return template.every(item =>
     item != null &&
     typeof item === 'object' &&
-    (Object.hasOwn(item, 'label') || Object.hasOwn(item, 'role') || item.type === 'separator'));
+    (Object.prototype.hasOwnProperty.call(item, 'label') ||
+     Object.prototype.hasOwnProperty.call(item, 'role') ||
+     item.type === 'separator'));
 }
 
 function sortTemplate (template: (MenuItemConstructorOptions | MenuItem)[]) {

lib/browser/api/net-client-request.ts

@@ -209,7 +209,6 @@ type ExtraURLLoaderOptions = {
    allowNonHttpProtocols: boolean;
 }
 function parseOptions (optionsIn: ClientRequestConstructorOptions | string): NodeJS.CreateURLLoaderOptions & ExtraURLLoaderOptions {
-  // eslint-disable-next-line node/no-deprecated-api
   const options: any = typeof optionsIn === 'string' ? url.parse(optionsIn) : { ...optionsIn };
 
   let urlStr: string = options.url;
@@ -242,7 +241,6 @@ function parseOptions (optionsIn: ClientRequestConstructorOptions | string): Nod
       // an invalid request.
       throw new TypeError('Request path contains unescaped characters');
     }
-    // eslint-disable-next-line node/no-deprecated-api
     const pathObj = url.parse(options.path || '/');
     urlObj.pathname = pathObj.pathname;
     urlObj.search = pathObj.search;
@@ -270,7 +268,7 @@ function parseOptions (optionsIn: ClientRequestConstructorOptions | string): Nod
     origin: options.origin,
     referrerPolicy: options.referrerPolicy,
     cache: options.cache,
-    allowNonHttpProtocols: Object.hasOwn(options, kAllowNonHttpProtocols)
+    allowNonHttpProtocols: Object.prototype.hasOwnProperty.call(options, kAllowNonHttpProtocols)
   };
   const headers: Record<string, string | string[]> = options.headers || {};
   for (const [name, value] of Object.entries(headers)) {

lib/browser/api/protocol.ts

@@ -66,7 +66,7 @@ function validateResponse (res: Response) {
 
   if (res.type === 'error') return true;
 
-  const exists = (key: string) => Object.hasOwn(res, key);
+  const exists = (key: string) => Object.prototype.hasOwnProperty.call(res, key);
 
   if (exists('status') && typeof res.status !== 'number') return false;
   if (exists('statusText') && typeof res.statusText !== 'string') return false;

lib/browser/devtools.ts

@@ -1,5 +1,6 @@
 import { dialog, Menu } from 'electron/main';
 import * as fs from 'fs';
+import * as url from 'url';
 
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
@@ -48,7 +49,7 @@ const getEditMenuItems = function (): Electron.MenuItemConstructorOptions[] {
 };
 
 const isChromeDevTools = function (pageURL: string) {
-  const { protocol } = new URL(pageURL);
+  const { protocol } = url.parse(pageURL);
   return protocol === 'devtools:';
 };
 

lib/browser/guest-view-manager.ts

@@ -8,7 +8,7 @@ import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 interface GuestInstance {
   elementInstanceId: number;
-  visibilityState?: DocumentVisibilityState;
+  visibilityState?: VisibilityState;
   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: DocumentVisibilityState) {
+  const onVisibilityChange = function (visibilityState: VisibilityState) {
     for (const guestInstance of guestInstances.values()) {
       guestInstance.visibilityState = visibilityState;
       if (guestInstance.embedder === embedder) {

lib/common/deprecate.ts

@@ -110,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 extends Object, K extends (keyof T & string)>(object: T, oldName: string, newName: K): T {
+export function renameProperty<T, 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/init.ts

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

lib/renderer/security-warnings.ts

@@ -219,7 +219,7 @@ const warnAboutExperimentalFeatures = function (webPreferences?: Electron.WebPre
  */
 const warnAboutEnableBlinkFeatures = function (webPreferences?: Electron.WebPreferences) {
   if (!webPreferences ||
-    !Object.hasOwn(webPreferences, 'enableBlinkFeatures') ||
+    !Object.prototype.hasOwnProperty.call(webPreferences, 'enableBlinkFeatures') ||
     (webPreferences.enableBlinkFeatures != null && webPreferences.enableBlinkFeatures.length === 0)) {
     return;
   }

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: DocumentVisibilityState) {
+    ipcRendererInternal.on(IPC_MESSAGES.GUEST_INSTANCE_VISIBILITY_CHANGE, function (_event, visibilityState: VisibilityState) {
       if (cachedVisibilityState !== visibilityState) {
         cachedVisibilityState = visibilityState;
         document.dispatchEvent(new Event('visibilitychange'));

lib/sandboxed_renderer/init.ts

@@ -21,7 +21,7 @@ v8Util.setHiddenValue(global, 'Buffer', Buffer);
 // The process object created by webpack is not an event emitter, fix it so
 // the API is more compatible with non-sandboxed renderers.
 for (const prop of Object.keys(EventEmitter.prototype) as (keyof typeof process)[]) {
-  if (Object.hasOwn(process, prop)) {
+  if (Object.prototype.hasOwnProperty.call(process, prop)) {
     delete process[prop];
   }
 }
@@ -30,17 +30,7 @@ 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<{
-  preloadScripts: {
-    preloadPath: string;
-    preloadSrc: string | null;
-    preloadError: null | Error;
-  }[];
-  process: NodeJS.Process;
-}>(IPC_MESSAGES.BROWSER_SANDBOX_LOAD);
+const { preloadScripts, process: processProps } = ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_SANDBOX_LOAD);
 
 const electron = require('electron');
 

package.json

@@ -47,7 +47,6 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "eslint-plugin-unicorn": "^46.0.1",
     "events": "^3.2.0",
     "express": "^4.16.4",
     "folder-hash": "^2.1.1",
@@ -63,7 +62,7 @@
     "process": "^0.11.10",
     "remark-cli": "^10.0.0",
     "remark-preset-lint-markdown-style-guide": "^4.0.0",
-    "semver": "^7.5.2",
+    "semver": "^5.6.0",
     "shx": "^0.3.2",
     "stream-json": "^1.7.1",
     "tap-xunit": "^2.4.1",
@@ -71,7 +70,7 @@
     "timers-browserify": "1.4.2",
     "ts-loader": "^8.0.2",
     "ts-node": "6.2.0",
-    "typescript": "^5.1.2",
+    "typescript": "^4.5.5",
     "url": "^0.11.0",
     "webpack": "^5.76.0",
     "webpack-cli": "^4.10.0",

patches/boringssl/revert_track_ssl_error_zero_return_explicitly.patch

@@ -20,7 +20,7 @@ index 2ca14efae5ea478f43794a81883b00dfdb1a37b0..d73055fbf39334925ef4b4804bbaca57
  
      case ssl_open_record_error:
 diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
-index 26ffd5036cb9b15b741d20d83fc9143f1bb4e835..5446aecd69a7bac07f8f9d9d8c88e3ae881ac830 100644
+index d7b5be3ddeec762a3353baefc67d659c9aba68f5..82bf00311b36bdbc948ae14f808c78fd2f71ca54 100644
 --- a/ssl/ssl_lib.cc
 +++ b/ssl/ssl_lib.cc
 @@ -1333,7 +1333,7 @@ int SSL_get_error(const SSL *ssl, int ret_code) {

patches/chromium/.patches

@@ -108,6 +108,7 @@ chore_allow_chromium_to_handle_synthetic_mouse_events_for_touch.patch
 add_maximized_parameter_to_linuxui_getwindowframeprovider.patch
 add_electron_deps_to_license_credits_file.patch
 fix_crash_loading_non-standard_schemes_in_iframes.patch
+fix_return_v8_value_from_localframe_requestexecutescript.patch
 create_browser_v8_snapshot_file_name_fuse.patch
 feat_configure_launch_options_for_service_process.patch
 feat_ensure_mas_builds_of_the_same_application_can_use_safestorage.patch
@@ -127,7 +128,5 @@ 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
-fix_return_v8_value_from_localframe_requestexecutescript.patch
-fix_harden_blink_scriptstate_maybefrom.patch
-chore_add_buildflag_guard_around_new_include.patch