Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore(wk): get rid of targetSymbol (#332)

Browse source
This commit is contained in:
Yury Semikhatsky 2019-12-23 11:10:37 -08:00 committed by GitHub
parent 6e0bb2585e
commit c301623e9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/chromium/crBrowser.ts
View file

@ -221,10 +221,6 @@ export class CRBrowser extends browser.Browser {
return Array.from(this._targets.values()).filter(target => target._isInitialized); 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<CRTarget> { async waitForTarget(predicate: (arg0: CRTarget) => boolean, options: { timeout?: number; } | undefined = {}): Promise<CRTarget> {
const { const {
timeout = 30000 timeout = 30000

8
src/webkit/wkBrowser.ts
View file

@ -140,17 +140,13 @@ export class WKBrowser extends browser.Browser {
target._didClose(); target._didClose();
} }
_closePage(page: Page, runBeforeUnload: boolean) { _closePage(targetId: string, runBeforeUnload: boolean) {
this._connection.send('Target.close', { this._connection.send('Target.close', {
targetId: WKTarget.fromPage(page)._targetId, targetId,
runBeforeUnload runBeforeUnload
}).catch(debugError); }).catch(debugError);
} }
async _activatePage(page: Page): Promise<void> {
await this._connection.send('Target.activate', { targetId: WKTarget.fromPage(page)._targetId });
}
async _onProvisionalTargetCommitted({oldTargetId, newTargetId}) { async _onProvisionalTargetCommitted({oldTargetId, newTargetId}) {
const oldTarget = this._targets.get(oldTargetId); const oldTarget = this._targets.get(oldTargetId);
const newTarget = this._targets.get(newTargetId); const newTarget = this._targets.get(newTargetId);

2
src/webkit/wkFrameManager.ts
View file

@ -343,7 +343,7 @@ export class WKFrameManager implements PageDelegate {
} }
async closePage(runBeforeUnload: boolean): Promise<void> { async closePage(runBeforeUnload: boolean): Promise<void> {
this._browser._closePage(this._page, runBeforeUnload); this._browser._closePage(this._session._sessionId, runBeforeUnload);
} }
getBoundingBoxForScreenshot(handle: dom.ElementHandle<Node>): Promise<types.Rect | null> { getBoundingBoxForScreenshot(handle: dom.ElementHandle<Node>): Promise<types.Rect | null> {

7
src/webkit/wkTarget.ts
View file

@ -22,8 +22,6 @@ import { WKTargetSession, WKTargetSessionEvents } from './wkConnection';
import { WKFrameManager } from './wkFrameManager'; import { WKFrameManager } from './wkFrameManager';
import { WKBrowser } from './wkBrowser'; import { WKBrowser } from './wkBrowser';
const targetSymbol = Symbol('target');
export class WKTarget { export class WKTarget {
readonly _browserContext: BrowserContext; readonly _browserContext: BrowserContext;
readonly _targetId: string; readonly _targetId: string;
@ -33,10 +31,6 @@ export class WKTarget {
private _browser: WKBrowser; private _browser: WKBrowser;
_frameManager: WKFrameManager | null = null; _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) { constructor(browser: WKBrowser, session: WKTargetSession, targetInfo: Protocol.Target.TargetInfo, browserContext: BrowserContext) {
const {targetId, type} = targetInfo; const {targetId, type} = targetInfo;
this._browser = browser; this._browser = browser;
@ -77,7 +71,6 @@ export class WKTarget {
} }
private _adoptPage() { private _adoptPage() {
(this._frameManager._page as any)[targetSymbol] = this;
this._session.once(WKTargetSessionEvents.Disconnected, () => { this._session.once(WKTargetSessionEvents.Disconnected, () => {
// Once swapped out, we reset _page and won't call _didDisconnect for old session. // Once swapped out, we reset _page and won't call _didDisconnect for old session.
if (this._frameManager) if (this._frameManager)