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

Merge branch 'main' into feature/font-picker

Browse Source
This commit is contained in:
Raymond Zhao
2025-03-05 15:24:12 -08:00
committed by GitHub
parent d76d5b994d b346138cb4
commit 5d042962b3
2196 changed files with 160029 additions and 95858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,12 +167,18 @@ export class CodeApplication extends Disposable {
const allowedPermissionsInWebview = new Set([
'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([
'media',
'font-access',
'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) => {
@@ -203,7 +209,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;
@@ -606,7 +612,7 @@ export class CodeApplication extends Disposable {
// Setup Protocol URL Handlers
const initialProtocolUrls = await appInstantiationService.invokeFunction(accessor => this.setupProtocolUrlHandlers(accessor, mainProcessElectronServer));
// Setup vscode-remote-resource protocol handler.
// Setup vscode-remote-resource protocol handler
this.setupManagedRemoteResourceUrlHandler(mainProcessElectronServer);
// Signal phase: ready - before opening first window