Log missing csp on extension host instead of main window

src/vs/workbench/api/browser/mainThreadWebview.ts

@@ -271,6 +271,7 @@ export class MainThreadWebviews extends Disposable implements MainThreadWebviews
 			}
 			webview.webview.state = newState;
 		});
+		input.webview.onMissingCsp((extension: ExtensionIdentifier) => this._proxy.$onMissingCsp(handle, extension.value));
 	}
 
 	private updateWebviewViewStates() {

src/vs/workbench/api/common/extHost.protocol.ts

@@ -559,6 +559,7 @@ export interface WebviewPanelViewStateData {
 
 export interface ExtHostWebviewsShape {
 	$onMessage(handle: WebviewPanelHandle, message: any): void;
+	$onMissingCsp(handle: WebviewPanelHandle, extensionId: string): void;
 	$onDidChangeWebviewPanelViewStates(newState: WebviewPanelViewStateData): void;
 	$onDidDisposeWebviewPanel(handle: WebviewPanelHandle): Promise<void>;
 	$deserializeWebviewPanel(newWebviewHandle: WebviewPanelHandle, viewType: string, title: string, state: any, position: EditorViewColumn, options: modes.IWebviewOptions & modes.IWebviewPanelOptions): Promise<void>;

src/vs/workbench/api/common/extHostWebview.ts

@@ -298,6 +298,13 @@ export class ExtHostWebviews implements ExtHostWebviewsShape {
 		}
 	}
 
+	public $onMissingCsp(
+		_handle: WebviewPanelHandle,
+		extensionId: string
+	): void {
+		console.warn(`${extensionId} created a webview without a content security policy: https://aka.ms/vscode-webview-missing-csp`);
+	}
+
 	public $onDidChangeWebviewPanelViewStates(newStates: WebviewPanelViewStateData): void {
 		const handles = Object.keys(newStates);
 		// Notify webviews of state changes in the following order:

src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts

@@ -3,12 +3,13 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { memoize } from 'vs/base/common/decorators';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { URI } from 'vs/base/common/uri';
+import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { IWebviewService, Webview, WebviewContentOptions, WebviewEditorOverlay, WebviewElement, WebviewOptions } from 'vs/workbench/contrib/webview/browser/webview';
 import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';
-import { memoize } from 'vs/base/common/decorators';
 
 /**
  * Webview editor overlay that creates and destroys the underlying webview as needed.
@@ -76,6 +77,7 @@ export class DynamicWebviewEditorOverlay extends Disposable implements WebviewEd
 			webview.onDidFocus(() => { this._onDidFocus.fire(); }, undefined, this._webviewEvents);
 			webview.onDidClickLink(x => { this._onDidClickLink.fire(x); }, undefined, this._webviewEvents);
 			webview.onMessage(x => { this._onMessage.fire(x); }, undefined, this._webviewEvents);
+			webview.onMissingCsp(x => { this._onMissingCsp.fire(x); }, undefined, this._webviewEvents);
 
 			webview.onDidScroll(x => {
 				this._initialScrollProgress = x.scrollYPercentage;
@@ -132,6 +134,9 @@ export class DynamicWebviewEditorOverlay extends Disposable implements WebviewEd
 	private readonly _onMessage = this._register(new Emitter<any>());
 	public readonly onMessage: Event<any> = this._onMessage.event;
 
+	private readonly _onMissingCsp = this._register(new Emitter<ExtensionIdentifier>());
+	public readonly onMissingCsp: Event<any> = this._onMissingCsp.event;
+
 	sendMessage(data: any): void {
 		if (this._webview.value) {
 			this._webview.value.sendMessage(data);

src/vs/workbench/contrib/webview/browser/webview.ts

@@ -70,6 +70,7 @@ export interface Webview extends IDisposable {
 	readonly onDidScroll: Event<{ scrollYPercentage: number }>;
 	readonly onDidUpdateState: Event<string | undefined>;
 	readonly onMessage: Event<any>;
+	readonly onMissingCsp: Event<ExtensionIdentifier>;
 
 	sendMessage(data: any): void;
 	update(

src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts

@@ -13,14 +13,15 @@ import { URI } from 'vs/base/common/uri';
 import * as modes from 'vs/editor/common/modes';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
+import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
 import { IFileService } from 'vs/platform/files/common/files';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { ITunnelService } from 'vs/platform/remote/common/tunnel';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService';
+import { Webview, WebviewContentOptions, WebviewOptions, WebviewResourceScheme } from 'vs/workbench/contrib/webview/browser/webview';
 import { WebviewPortMappingManager } from 'vs/workbench/contrib/webview/common/portMapping';
 import { getWebviewThemeData } from 'vs/workbench/contrib/webview/common/themeing';
-import { Webview, WebviewContentOptions, WebviewOptions, WebviewResourceScheme } from 'vs/workbench/contrib/webview/browser/webview';
 import { registerFileProtocol } from 'vs/workbench/contrib/webview/electron-browser/webviewProtocols';
 import { areWebviewInputOptionsEqual } from '../browser/webviewEditorService';
 import { WebviewFindWidget } from '../browser/webviewFindWidget';
@@ -426,6 +427,9 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview {
 	private readonly _onMessage = this._register(new Emitter<any>());
 	public readonly onMessage = this._onMessage.event;
 
+	private readonly _onMissingCsp = this._register(new Emitter<ExtensionIdentifier>());
+	public readonly onMissingCsp = this._onMissingCsp.event;
+
 	private _send(channel: string, data?: any): void {
 		this._ready
 			.then(() => {
@@ -522,7 +526,7 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview {
 
 		if (this._options.extension && this._options.extension.id) {
 			if (this._environementService.isExtensionDevelopment) {
-				console.warn(`${this._options.extension.id.value} created a webview without a content security policy: https://aka.ms/vscode-webview-missing-csp`);
+				this._onMissingCsp.fire(this._options.extension.id);
 			}
 
 			type TelemetryClassification = {