Merge branch '13-x-y' into cherry-pick/13-x-y/v8/04a58fedd5

ELECTRON_VERSION

@@ -1 +1 @@
-13.6.3
+13.6.5

docs/api/web-contents.md

@@ -730,6 +730,8 @@ first available device will be selected. `callback` should be called with
 `deviceId` to be selected, passing empty string to `callback` will
 cancel the request.
 
+If no event listener is added for this event, all bluetooth requests will be cancelled.
+
 ```javascript
 const { app, BrowserWindow } = require('electron')
 

lib/browser/api/web-contents.ts

@@ -681,6 +681,14 @@ WebContents.prototype._init = function () {
     }
   });
 
+  this.on('select-bluetooth-device', (event, devices, callback) => {
+    if (this.listenerCount('select-bluetooth-device') === 0) {
+      // Cancel it if there are no handlers
+      event.preventDefault();
+      callback('');
+    }
+  });
+
   const event = process._linkedBinding('electron_browser_event').createEmpty();
   app.emit('web-contents-created', event, this);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "13.6.3",
+  "version": "13.6.5",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {

patches/v8/.patches

@@ -23,3 +23,4 @@ cherry-pick-feef10137b16.patch
 cherry-pick-014e1f857c33.patch
 cherry-pick-5d2b5e7c006c.patch
 merged_allow_compiled_module_invalidation_at_wasmstreaming_finish.patch
+cherry-pick-418c276ef228.patch

patches/v8/cherry-pick-418c276ef228.patch

@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Leszek Swirski <leszeks@chromium.org>
+Date: Fri, 10 Dec 2021 15:56:05 +0100
+Subject: Merged: [compiler] Don't elide
+ ChangeTaggedToInt32->ChangeInt31ToTaggedSigned
+
+(cherry picked from commit 4fae8b16802a416fe3aab0e7792fabe96cf1ecd8)
+
+(cherry picked from commit f4f11c23ae2eaf9bb4525d0fac7ab842de9b0fe2)
+
+Bug: chromium:1278387
+No-Try: true
+No-Presubmit: true
+No-Tree-Checks: true
+Change-Id: I9b89834c094510e064988aa534ec230309996034
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3329665
+Reviewed-by: Toon Verwaest <verwaest@chromium.org>
+Cr-Original-Commit-Position: refs/branch-heads/9.6@{#40}
+Cr-Original-Branched-From: 0b7bda016178bf438f09b3c93da572ae3663a1f7-refs/heads/9.6.180@{#1}
+Cr-Original-Branched-From: 41a5a247d9430b953e38631e88d17790306f7a4c-refs/heads/main@{#77244}
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3335759
+Commit-Queue: Leszek Swirski <leszeks@chromium.org>
+Owners-Override: Leszek Swirski <leszeks@chromium.org>
+Cr-Commit-Position: refs/branch-heads/9.4@{#56}
+Cr-Branched-From: 3b51863bc25492549a8bf96ff67ce481b1a3337b-refs/heads/9.4.146@{#1}
+Cr-Branched-From: 2890419fc8fb9bdb507fdd801d76fa7dd9f022b5-refs/heads/master@{#76233}
+
+diff --git a/src/compiler/simplified-operator-reducer.cc b/src/compiler/simplified-operator-reducer.cc
+index b1d3f8b2f3a544dbff02b493f3025ac525233ef1..f31a6c9a0321dfbf3d9926961a39b977fc3be5a7 100644
+--- a/src/compiler/simplified-operator-reducer.cc
++++ b/src/compiler/simplified-operator-reducer.cc
+@@ -75,7 +75,7 @@ Reduction SimplifiedOperatorReducer::Reduce(Node* node) {
+     case IrOpcode::kChangeInt32ToTagged: {
+       Int32Matcher m(node->InputAt(0));
+       if (m.HasResolvedValue()) return ReplaceNumber(m.ResolvedValue());
+-      if (m.IsChangeTaggedToInt32() || m.IsChangeTaggedSignedToInt32()) {
++      if (m.IsChangeTaggedSignedToInt32()) {
+         return Replace(m.InputAt(0));
+       }
+       break;

shell/browser/resources/win/electron.rc

@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 13,6,3,0
- PRODUCTVERSION 13,6,3,0
+ FILEVERSION 13,6,5,0
+ PRODUCTVERSION 13,6,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub, Inc."
             VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "13.6.3"
+            VALUE "FileVersion", "13.6.5"
             VALUE "InternalName", "electron.exe"
             VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
             VALUE "OriginalFilename", "electron.exe"
             VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "13.6.3"
+            VALUE "ProductVersion", "13.6.5"
             VALUE "SquirrelAwareVersion", "1"
         END
     END