diff --git a/src/chromium/crBrowser.ts b/src/chromium/crBrowser.ts index 4d128ecccd..b98ff65df1 100644 --- a/src/chromium/crBrowser.ts +++ b/src/chromium/crBrowser.ts @@ -221,10 +221,6 @@ export class CRBrowser extends browser.Browser { return Array.from(this._targets.values()).filter(target => target._isInitialized); } - async _activatePage(page: Page) { - await (page._delegate as CRFrameManager)._client.send('Target.activateTarget', {targetId: CRTarget.fromPage(page)._targetId}); - } - async waitForTarget(predicate: (arg0: CRTarget) => boolean, options: { timeout?: number; } | undefined = {}): Promise { const { timeout = 30000 diff --git a/src/webkit/wkBrowser.ts b/src/webkit/wkBrowser.ts index 9def4ba524..042e9498e7 100644 --- a/src/webkit/wkBrowser.ts +++ b/src/webkit/wkBrowser.ts @@ -140,17 +140,13 @@ export class WKBrowser extends browser.Browser { target._didClose(); } - _closePage(page: Page, runBeforeUnload: boolean) { + _closePage(targetId: string, runBeforeUnload: boolean) { this._connection.send('Target.close', { - targetId: WKTarget.fromPage(page)._targetId, + targetId, runBeforeUnload }).catch(debugError); } - async _activatePage(page: Page): Promise { - await this._connection.send('Target.activate', { targetId: WKTarget.fromPage(page)._targetId }); - } - async _onProvisionalTargetCommitted({oldTargetId, newTargetId}) { const oldTarget = this._targets.get(oldTargetId); const newTarget = this._targets.get(newTargetId); diff --git a/src/webkit/wkFrameManager.ts b/src/webkit/wkFrameManager.ts index 9308ee2bc0..2bf9cb5f74 100644 --- a/src/webkit/wkFrameManager.ts +++ b/src/webkit/wkFrameManager.ts @@ -343,7 +343,7 @@ export class WKFrameManager implements PageDelegate { } async closePage(runBeforeUnload: boolean): Promise { - this._browser._closePage(this._page, runBeforeUnload); + this._browser._closePage(this._session._sessionId, runBeforeUnload); } getBoundingBoxForScreenshot(handle: dom.ElementHandle): Promise { diff --git a/src/webkit/wkTarget.ts b/src/webkit/wkTarget.ts index 776540e3b5..795f22ce94 100644 --- a/src/webkit/wkTarget.ts +++ b/src/webkit/wkTarget.ts @@ -22,8 +22,6 @@ import { WKTargetSession, WKTargetSessionEvents } from './wkConnection'; import { WKFrameManager } from './wkFrameManager'; import { WKBrowser } from './wkBrowser'; -const targetSymbol = Symbol('target'); - export class WKTarget { readonly _browserContext: BrowserContext; readonly _targetId: string; @@ -33,10 +31,6 @@ export class WKTarget { private _browser: WKBrowser; _frameManager: WKFrameManager | null = null; - static fromPage(page: Page): WKTarget { - return (page as any)[targetSymbol]; - } - constructor(browser: WKBrowser, session: WKTargetSession, targetInfo: Protocol.Target.TargetInfo, browserContext: BrowserContext) { const {targetId, type} = targetInfo; this._browser = browser; @@ -77,7 +71,6 @@ export class WKTarget { } private _adoptPage() { - (this._frameManager._page as any)[targetSymbol] = this; this._session.once(WKTargetSessionEvents.Disconnected, () => { // Once swapped out, we reset _page and won't call _didDisconnect for old session. if (this._frameManager)