Make browser ownership mutable (#332038)

Author: kycutler

src/vs/platform/browserView/common/browserView.ts

@@ -511,6 +511,7 @@ export interface IBrowserViewService {
 	onDynamicDidKeyCommand(id: string): Event<IBrowserViewKeyDownEvent>;
 	onDynamicDidChangeTitle(id: string): Event<IBrowserViewTitleChangeEvent>;
 	onDynamicDidChangeFavicon(id: string): Event<IBrowserViewFaviconChangeEvent>;
+	onDynamicDidChangeOwner(id: string): Event<IBrowserViewOwner>;
 	onDynamicDidFindInPage(id: string): Event<IBrowserViewFindInPageResult>;
 	onDynamicDidClose(id: string): Event<void>;
 	onDynamicDidSelectElement(id: string): Event<IElementData>;
@@ -543,6 +544,11 @@ export interface IBrowserViewService {
 	 */
 	destroyBrowserView(id: string): Promise<void>;
 
+	/**
+	 * Update the owner of an existing browser view.
+	 */
+	setOwner(id: string, owner: IBrowserViewOwner): Promise<void>;
+
 	/**
 	 * Get the state of an existing browser view by ID, or throw if it doesn't exist
 	 * @param id The browser view identifier

src/vs/platform/browserView/electron-main/browserView.ts

@@ -57,6 +57,7 @@ export class BrowserView extends Disposable {
 	readonly inspector: BrowserViewInspector;
 
 	private _ownerWindow: ICodeWindow;
+	private _owner: IBrowserViewOwner;
 	private _currentWindow: ICodeWindow | IAuxiliaryWindow | undefined;
 	private _isDisposed = false;
 	private _audiences: readonly IBrowserViewAudience[] = [];
@@ -99,6 +100,9 @@ export class BrowserView extends Disposable {
 	private readonly _onDidChangeFavicon = this._register(new Emitter<IBrowserViewFaviconChangeEvent>());
 	readonly onDidChangeFavicon: Event<IBrowserViewFaviconChangeEvent> = this._onDidChangeFavicon.event;
 
+	private readonly _onDidChangeOwner = this._register(new Emitter<IBrowserViewOwner>());
+	readonly onDidChangeOwner: Event<IBrowserViewOwner> = this._onDidChangeOwner.event;
+
 	private readonly _onDidFindInPage = this._register(new Emitter<IBrowserViewFindInPageResult>());
 	readonly onDidFindInPage: Event<IBrowserViewFindInPageResult> = this._onDidFindInPage.event;
 
@@ -120,10 +124,10 @@ export class BrowserView extends Disposable {
 	constructor(
 		public readonly id: string,
 		public readonly hostWindowId: number,
-		public readonly owner: IBrowserViewOwner,
+		owner: IBrowserViewOwner,
 		public readonly associatedResource: URI | undefined,
 		public readonly session: BrowserSession,
-		private readonly _createChildView: (url: string, electronOptions: Electron.WebContentsViewConstructorOptions | undefined, editorOptions: IBrowserViewEditorOpenOptions) => BrowserView,
+		private readonly _createChildView: (owner: IBrowserViewOwner, url: string, electronOptions: Electron.WebContentsViewConstructorOptions | undefined, editorOptions: IBrowserViewEditorOpenOptions) => BrowserView,
 		openContextMenu: (view: BrowserView, params: Electron.ContextMenuParams) => void,
 		options: Electron.WebContentsViewConstructorOptions | undefined,
 		@IWindowsMainService private readonly windowsMainService: IWindowsMainService,
@@ -132,6 +136,7 @@ export class BrowserView extends Disposable {
 		@ITelemetryService private readonly telemetryService: ITelemetryService,
 	) {
 		super();
+		this._owner = owner;
 
 		const webPreferences: Electron.WebPreferences = {
 			...options?.webPreferences,
@@ -204,7 +209,7 @@ export class BrowserView extends Disposable {
 						}
 					})());
 
-					const childView = this._createChildView(details.url, options, {
+					const childView = this._createChildView(this.owner, details.url, options, {
 						pinned: true,
 						background: location === NewPageLocation.Background,
 						parentViewId: id,
@@ -591,6 +596,15 @@ export class BrowserView extends Disposable {
 		);
 	}
 
+	get owner(): IBrowserViewOwner {
+		return this._owner;
+	}
+
+	setOwner(owner: IBrowserViewOwner): void {
+		this._owner = owner;
+		this._onDidChangeOwner.fire(owner);
+	}
+
 	get webContents(): Electron.WebContents {
 		return this._view.webContents;
 	}
@@ -748,7 +762,7 @@ export class BrowserView extends Disposable {
 		}
 
 		logBrowserOpen(this.telemetryService, 'browserLinkForeground');
-		this._createChildView(url, undefined, {
+		this._createChildView(this.owner, url, undefined, {
 			pinned: true,
 			parentViewId: this.id
 		});

src/vs/platform/browserView/electron-main/browserViewMainService.ts

@@ -178,6 +178,10 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 		return this._getBrowserView(id).onDidChangeFavicon;
 	}
 
+	onDynamicDidChangeOwner(id: string) {
+		return this._getBrowserView(id).onDidChangeOwner;
+	}
+
 	onDynamicDidFindInPage(id: string) {
 		return this._getBrowserView(id).onDidFindInPage;
 	}
@@ -238,6 +242,10 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 		return this.browserViews.deleteAndDispose(id);
 	}
 
+	async setOwner(id: string, owner: IBrowserViewOwner): Promise<void> {
+		this._getBrowserView(id).setOwner(owner);
+	}
+
 	async layout(id: string, bounds: IBrowserViewBounds): Promise<void> {
 		return this._getBrowserView(id).layout(bounds);
 	}
@@ -441,10 +449,10 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa
 			associatedResource,
 			browserSession,
 			// Child views share their host, owner, and storage, but do not implicitly inherit agent access.
-			(url, electronOptions, editorOptions) => {
+			(childOwner, url, electronOptions, editorOptions) => {
 				return this._createBrowserView(generateUuid(), {
 					hostWindowId,
-					owner,
+					owner: childOwner,
 					session: browserSession.id,
 					initialUrl: url || undefined
 				}, editorOptions, electronOptions);

src/vs/workbench/contrib/browserView/common/browserView.ts

@@ -398,6 +398,7 @@ export interface IBrowserViewModel extends IDisposable {
 	readonly onDidKeyCommand: Event<IBrowserViewKeyDownEvent>;
 	readonly onDidChangeTitle: Event<IBrowserViewTitleChangeEvent>;
 	readonly onDidChangeFavicon: Event<IBrowserViewFaviconChangeEvent>;
+	readonly onDidChangeOwner: Event<IBrowserViewOwner>;
 	readonly onDidFindInPage: Event<IBrowserViewFindInPageResult>;
 	readonly onDidChangeVisibility: Event<IBrowserViewVisibilityEvent>;
 	readonly onDidClose: Event<void>;
@@ -424,6 +425,7 @@ export interface IBrowserViewModel extends IDisposable {
 	stopFindInPage(keepSelection?: boolean): Promise<void>;
 	getSelectedText(): Promise<string>;
 	clearStorage(): Promise<void>;
+	setOwner(owner: IBrowserViewOwner): Promise<void>;
 	setSharedWithAgent(shared: boolean): Promise<boolean>;
 	trustCertificate(host: string, fingerprint: string): Promise<void>;
 	untrustCertificate(host: string, fingerprint: string): Promise<void>;
@@ -442,6 +444,7 @@ export interface IBrowserViewModel extends IDisposable {
 
 export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 	private _url: string = '';
+	private _owner: IBrowserViewOwner;
 	private _title: string = '';
 	private _favicon: string | undefined = undefined;
 	private _screenshot: VSBuffer | undefined = undefined;
@@ -483,7 +486,7 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 
 	constructor(
 		readonly id: string,
-		readonly owner: IBrowserViewOwner,
+		owner: IBrowserViewOwner,
 		readonly associatedResource: URI | undefined,
 		initialState: IBrowserViewState,
 		private readonly browserViewService: IBrowserViewService,
@@ -496,6 +499,7 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 		@ILogService private readonly logService: ILogService,
 	) {
 		super();
+		this._owner = owner;
 
 		// Initialize state
 		this._url = initialState.url;
@@ -598,6 +602,10 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 			this._favicon = e.favicon;
 		}));
 
+		this._register(this.onDidChangeOwner(owner => {
+			this._owner = owner;
+		}));
+
 		this._register(this.onDidChangeFocus(({ focused }) => {
 			this._focused = focused;
 		}));
@@ -638,6 +646,7 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 	}
 
 	get url(): string { return this._url; }
+	get owner(): IBrowserViewOwner { return this._owner; }
 	get title(): string { return this._title; }
 	get favicon(): string | undefined { return this._favicon; }
 	get loading(): boolean { return this._loading; }
@@ -692,6 +701,10 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 		return this.browserViewService.onDynamicDidChangeFavicon(this.id);
 	}
 
+	get onDidChangeOwner(): Event<IBrowserViewOwner> {
+		return this.browserViewService.onDynamicDidChangeOwner(this.id);
+	}
+
 	get onDidFindInPage(): Event<IBrowserViewFindInPageResult> {
 		return this.browserViewService.onDynamicDidFindInPage(this.id);
 	}
@@ -784,6 +797,10 @@ export class BrowserViewModel extends Disposable implements IBrowserViewModel {
 		return this.browserViewService.clearStorage(this.id);
 	}
 
+	async setOwner(owner: IBrowserViewOwner): Promise<void> {
+		return this.browserViewService.setOwner(this.id, owner);
+	}
+
 	async trustCertificate(host: string, fingerprint: string): Promise<void> {
 		return this.browserViewService.trustCertificate(this.id, host, fingerprint);
 	}