From d17d7ca46cc166b156e91c6205465d7f01826189 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Fri, 14 May 2021 12:19:44 +0900
Subject: chore: bump electron@12.0.7

Fixes https://github.com/microsoft/vscode/issues/62177
Fixes https://github.com/microsoft/vscode/issues/122630
Fixes https://github.com/microsoft/vscode/issues/118267
---
 .yarnrc                                         |  2 +-
 cgmanifest.json                                 |  8 ++++----
 package.json                                    |  2 +-
 src/vs/platform/windows/electron-main/window.ts | 18 ------------------
 yarn.lock                                       |  8 ++++----
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/.yarnrc b/.yarnrc
index 1965e671993..0b7e2206650 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://electronjs.org/headers"
-target "12.0.4"
+target "12.0.7"
 runtime "electron"
diff --git a/cgmanifest.json b/cgmanifest.json
index aa54e3243ab..474d6191ba5 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "5342041f85833c038dcbc5632d62fc10f7592323"
+					"commitHash": "cd7a46bf02a768a1aabf9443f6ee469bc6e28e7c"
 				}
 			},
 			"licenseDetail": [
@@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "89.0.4389.114"
+			"version": "89.0.4389.128"
 		},
 		{
 			"component": {
@@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "9ce7c512475aa6aa91417a3b08e19f85a8587a30"
+					"commitHash": "8d55658bfa8b5983e1a90ad079c2e2ac91ee7af0"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "12.0.4"
+			"version": "12.0.7"
 		},
 		{
 			"component": {
diff --git a/package.json b/package.json
index 15fac4b6d29..3c16baceda8 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
     "cssnano": "^4.1.11",
     "debounce": "^1.0.0",
     "deemon": "^1.4.0",
-    "electron": "12.0.4",
+    "electron": "12.0.7",
     "eslint": "6.8.0",
     "eslint-plugin-jsdoc": "^19.1.0",
     "event-stream": "3.3.4",
diff --git a/src/vs/platform/windows/electron-main/window.ts b/src/vs/platform/windows/electron-main/window.ts
index 793ea8a934f..12c49860d48 100644
--- a/src/vs/platform/windows/electron-main/window.ts
+++ b/src/vs/platform/windows/electron-main/window.ts
@@ -34,7 +34,6 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { FileAccess, Schemas } from 'vs/base/common/network';
 import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { INativeHostMainService } from 'vs/platform/native/electron-main/nativeHostMainService';
 import { IProtocolMainService } from 'vs/platform/protocol/electron-main/protocol';
 
 export interface IWindowCreationOptions {
@@ -153,7 +152,6 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 		@IDialogMainService private readonly dialogMainService: IDialogMainService,
 		@ILifecycleMainService private readonly lifecycleMainService: ILifecycleMainService,
-		@INativeHostMainService private readonly nativeHostMainService: INativeHostMainService,
 		@IProductService private readonly productService: IProductService,
 		@IProtocolMainService private readonly protocolMainService: IProtocolMainService
 	) {
@@ -510,22 +508,6 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 			this._lastFocusTime = Date.now();
 		});
 
-		if (isMacintosh) {
-			this._register(this.nativeHostMainService.onDidChangeDisplay(() => {
-				if (!this._win) {
-					return; // disposed
-				}
-
-				// Simple fullscreen doesn't resize automatically when the resolution changes so as a workaround
-				// we need to detect when display metrics change or displays are added/removed and toggle the
-				// fullscreen manually.
-				if (!this.useNativeFullScreen() && this.isFullScreen) {
-					this.setFullScreen(false);
-					this.setFullScreen(true);
-				}
-			}));
-		}
-
 		// Window (Un)Maximize
 		this._win.on('maximize', (e: Event) => {
 			if (this.currentConfig) {
diff --git a/yarn.lock b/yarn.lock
index 556cdfd7797..61b45d50dbe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3001,10 +3001,10 @@ electron-to-chromium@^1.3.634:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.642.tgz#8b884f50296c2ae2a9997f024d0e3e57facc2b94"
   integrity sha512-cev+jOrz/Zm1i+Yh334Hed6lQVOkkemk2wRozfMF4MtTR7pxf3r3L5Rbd7uX1zMcEqVJ7alJBnJL7+JffkC6FQ==
 
-electron@12.0.4:
-  version "12.0.4"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.4.tgz#c2ca4710d0e4da7db6d31c4f55777b08bfcb08e5"
-  integrity sha512-A8Lq3YMZ1CaO1z5z5nsyFxIwkgwXLHUwL2pf9MVUHpq7fv3XUewCMD98EnLL3DdtiyCvw5KMkeT1WGsZh8qFug==
+electron@12.0.7:
+  version "12.0.7"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.7.tgz#e0fca2c8be34cb7da48c4d15cfb1d2ad666d2718"
+  integrity sha512-722TZNKDuLpEmj96AzTYFKHaJEH98xgOBH0aldStaPXI1xDFfb9SJQQuirvwFlkwG5OqQdz6Ne3OwwJ7Dbs5nQ==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^14.6.2"
-- 
cgit v1.2.3