diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts index e639718454483efe14be201969126b74a7e073d5..d871327b7cceb26b57531d965f83585a90fa3574 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts @@ -589,7 +589,6 @@ export class ExtensionEditor extends BaseEditor { this.contentDisposables.add(webviewElement.onDidFocus(() => this.fireOnDidFocus())); const removeLayoutParticipant = arrays.insert(this.layoutParticipants, { layout: () => { - webviewElement.layout(); webviewElement.layoutWebviewOverElement(template.content); } }); diff --git a/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts b/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts index 7f07e35f4fdd8b3e110a71e30de08e76bf5c27d7..49726558e1cfe71bcc62d2136d388a3255502fdd 100644 --- a/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts +++ b/src/vs/workbench/contrib/webview/browser/dynamicWebviewEditorOverlay.ts @@ -174,7 +174,6 @@ export class DynamicWebviewEditorOverlay extends Disposable implements WebviewEd } } - layout(): void { this.withWebview(webview => webview.layout()); } focus(): void { this.withWebview(webview => webview.focus()); } reload(): void { this.withWebview(webview => webview.reload()); } showFind(): void { this.withWebview(webview => webview.showFind()); } diff --git a/src/vs/workbench/contrib/webview/browser/webview.ts b/src/vs/workbench/contrib/webview/browser/webview.ts index 0cb185a5b0e52c39186de7bd64f0790ec2d64bde..cca4ac9111eff84df0bca083e9013967462fdff3 100644 --- a/src/vs/workbench/contrib/webview/browser/webview.ts +++ b/src/vs/workbench/contrib/webview/browser/webview.ts @@ -76,7 +76,6 @@ export interface Webview extends IDisposable { sendMessage(data: any): void; - layout(): void; focus(): void; reload(): void; diff --git a/src/vs/workbench/contrib/webview/browser/webviewEditor.ts b/src/vs/workbench/contrib/webview/browser/webviewEditor.ts index cb620c83d9dee1347475fcdc3b86f03fa082b37a..fdec5eecd576a8c0d1be104ab630252402039538 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewEditor.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewEditor.ts @@ -93,7 +93,6 @@ export class WebviewEditor extends BaseEditor { this._dimension = dimension; if (this.input && this.input instanceof WebviewInput) { this.synchronizeWebviewContainerDimensions(this.input.webview, dimension); - this.input.webview.layout(); } } diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts index e33c746b373fb56a1607fe4a0b681fa12dd97a77..1f95fae1e1979e77b84d1a247293cf529706f3fa 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -232,10 +232,6 @@ export class IFrameWebview extends Disposable implements Webview { this._send('message', data); } - layout(): void { - // noop - } - focus(): void { if (this.element) { this.element.focus(); diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts index 01639181a38f51c05df214a4162b24ae179ba80b..e64b9e14ff63b4d9511d8d553b41a73e4728e6cd 100644 --- a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts @@ -315,8 +315,6 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview, console.log(`[Embedded Page] ${e.message}`); })); this._register(addDisposableListener(this._webview, 'dom-ready', () => { - this.layout(); - // Workaround for https://github.com/electron/electron/issues/14474 if (this._webview && (this._focused || document.activeElement === this._webview)) { this._webview.blur(); @@ -364,7 +362,6 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview, this._webview.style.flex = ''; this._webview.style.width = '100%'; this._webview.style.height = '100%'; - this.layout(); return; case 'did-scroll': @@ -563,11 +560,6 @@ export class ElectronWebviewBasedWebview extends Disposable implements Webview, } } - public layout(): void { - // noop - - } - private readonly _hasFindResult = this._register(new Emitter()); public readonly hasFindResult: Event = this._hasFindResult.event;