Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 01:58:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into pointer-lock-in-webview

Browse Source
This commit is contained in:
jeffrey
2025-03-11 14:25:34 -07:00
committed by GitHub
parent f6aa3bfd1f da8be437aa
commit 4038bf9da2
1903 changed files with 148220 additions and 90187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/code/electron-main/app.ts
View File

@@ -83,7 +83,7 @@ import { NativeURLService } from '../../platform/url/common/urlService.js';
import { ElectronURLListener } from '../../platform/url/electron-main/electronUrlListener.js';
import { IWebviewManagerService } from '../../platform/webview/common/webviewManagerService.js';
import { WebviewMainService } from '../../platform/webview/electron-main/webviewMainService.js';
import { isFolderToOpen, isWorkspaceToOpen, IWindowOpenable, TitlebarStyle, overrideDefaultTitlebarStyle } from '../../platform/window/common/window.js';
import { isFolderToOpen, isWorkspaceToOpen, IWindowOpenable } from '../../platform/window/common/window.js';
import { IWindowsMainService, OpenContext } from '../../platform/windows/electron-main/windows.js';
import { ICodeWindow } from '../../platform/window/electron-main/window.js';
import { WindowsMainService } from '../../platform/windows/electron-main/windowsMainService.js';
@@ -170,12 +170,18 @@ export class CodeApplication extends Disposable {
...alwaysAllowedPermissions,
'clipboard-read',
'clipboard-sanitized-write',
// TODO(deepak1556): Should be removed once migration is complete
// https://github.com/microsoft/vscode/issues/239228
'deprecated-sync-clipboard-read',
]);
const allowedPermissionsInCore = new Set([
...alwaysAllowedPermissions,
'media',
'local-fonts',
// TODO(deepak1556): Should be removed once migration is complete
// https://github.com/microsoft/vscode/issues/239228
'deprecated-sync-clipboard-read',
]);
session.defaultSession.setPermissionRequestHandler((_webContents, permission, callback, details) => {
@@ -206,7 +212,7 @@ export class CodeApplication extends Disposable {
const supportedSvgSchemes = new Set([Schemas.file, Schemas.vscodeFileResource, Schemas.vscodeRemoteResource, Schemas.vscodeManagedRemoteResource, 'devtools']);
// But allow them if they are made from inside an webview
const isSafeFrame = (requestFrame: WebFrameMain | undefined): boolean => {
const isSafeFrame = (requestFrame: WebFrameMain | null | undefined): boolean => {
for (let frame: WebFrameMain | null | undefined = requestFrame; frame; frame = frame.parent) {
if (frame.url.startsWith(`${Schemas.vscodeWebview}://`)) {
return true;
@@ -597,14 +603,6 @@ export class CodeApplication extends Disposable {
// Services
const appInstantiationService = await this.initServices(machineId, sqmId, devDeviceId, sharedProcessReady);
// Linux (stable only): custom title default style override
if (isLinux && this.productService.quality === 'stable') {
const titleBarDefaultStyleOverride = this.stateService.getItem('window.titleBarStyleOverride');
if (titleBarDefaultStyleOverride === TitlebarStyle.CUSTOM) {
overrideDefaultTitlebarStyle(titleBarDefaultStyleOverride);
}
}
// Auth Handler
appInstantiationService.invokeFunction(accessor => accessor.get(IProxyAuthService));