development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to avoid extra promise chaining for posting into a webview

Browse source 
This moves the `<webview>` based webviews to use a queue of pending messages while the webview itself is being prepared. This lets us avoid calling `.then` if the webview has already been resolved
This commit is contained in:
Matt Bierner 2021-03-09 18:09:59 -08:00
parent cbacbe647c
commit a9087e9d0a
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,11 +44,13 @@ export class ElectronWebviewBasedWebview extends BaseWebview<WebviewTag> impleme
private _findStarted: boolean = false;
private readonly _resourceRequestManager: WebviewResourceRequestManager;
private _messagePromise = Promise.resolve();
private readonly _focusDelayer = this._register(new ThrottledDelayer(10));
private _elementFocusImpl!: (options?: FocusOptions | undefined) => void;
private _isWebviewReadyForMessages = false;
private readonly _pendingMessages: Array<{ channel: string, data: any }> = [];
constructor(
id: string,
options: WebviewOptions,
@ -81,6 +83,16 @@ export class ElectronWebviewBasedWebview extends BaseWebview<WebviewTag> impleme
this._myLogService.debug(`Webview(${this.id}): init`);
this._resourceRequestManager = this._register(instantiationService.createInstance(WebviewResourceRequestManager, id, extension, this.content.options));
this._resourceRequestManager.ensureReady()
.then(() => {
this._isWebviewReadyForMessages = true;
while (this._pendingMessages.length) {
const { channel, data } = this._pendingMessages.shift()!;
this._myLogService.debug(`Webview(${this.id}): did post message on '${channel}'`);
this.element?.send(channel, data);
}
});
this._register(addDisposableListener(this.element!, 'dom-ready', once(() => {
this._register(ElectronWebviewBasedWebview.getWebviewKeyboardHandler(configurationService, mainProcessService).add(this.element!));
@ -210,13 +222,13 @@ export class ElectronWebviewBasedWebview extends BaseWebview<WebviewTag> impleme
protected async doPostMessage(channel: string, data?: any): Promise<void> {
this._myLogService.debug(`Webview(${this.id}): will post message on '${channel}'`);
if (!this._isWebviewReadyForMessages) {
this._pendingMessages.push({ channel, data });
return;
}
this._messagePromise = this._messagePromise
.then(() => this._resourceRequestManager.ensureReady())
.then(() => {
this._myLogService.debug(`Webview(${this.id}): did post message on '${channel}'`);
return this.element?.send(channel, data);
});
this._myLogService.debug(`Webview(${this.id}): did post message on '${channel}'`);
this.element?.send(channel, data);
}
public focus(): void {