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

chore: remove WKPage._sessions (#1270)

Browse source
This commit is contained in:
Dmitry Gozman 2020-03-06 16:51:45 -08:00 committed by GitHub
parent aee6324bba
commit 68b4079748
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/webkit/wkPage.ts
View file

@ -37,7 +37,6 @@ import { WKBrowserContext } from './wkBrowser';
const UTILITY_WORLD_NAME = '__playwright_utility_world__'; const UTILITY_WORLD_NAME = '__playwright_utility_world__';
const BINDING_CALL_MESSAGE = '__playwright_binding_call__'; const BINDING_CALL_MESSAGE = '__playwright_binding_call__';
const isPovisionalSymbol = Symbol('isPovisional');
export class WKPage implements PageDelegate { export class WKPage implements PageDelegate {
readonly rawMouse: RawMouseImpl; readonly rawMouse: RawMouseImpl;
@ -59,9 +58,6 @@ export class WKPage implements PageDelegate {
readonly _browserContext: WKBrowserContext; readonly _browserContext: WKBrowserContext;
private _initialized = false; private _initialized = false;
// TODO: we should be able to just use |this._session| and |this._provisionalPage|.
private readonly _sessions = new Map<string, WKSession>();
constructor(browserContext: WKBrowserContext, pageProxySession: WKSession, opener: WKPage | null) { constructor(browserContext: WKBrowserContext, pageProxySession: WKSession, opener: WKPage | null) {
this._pageProxySession = pageProxySession; this._pageProxySession = pageProxySession;
this._opener = opener; this._opener = opener;
@ -164,14 +160,11 @@ export class WKPage implements PageDelegate {
private _onDidCommitProvisionalTarget(event: Protocol.Target.didCommitProvisionalTargetPayload) { private _onDidCommitProvisionalTarget(event: Protocol.Target.didCommitProvisionalTargetPayload) {
const { oldTargetId, newTargetId } = event; const { oldTargetId, newTargetId } = event;
const newSession = this._sessions.get(newTargetId);
assert(newSession, 'Unknown new target: ' + newTargetId);
const oldSession = this._sessions.get(oldTargetId);
assert(oldSession, 'Unknown old target: ' + oldTargetId);
oldSession.errorText = 'Target was swapped out.';
(newSession as any)[isPovisionalSymbol] = undefined;
assert(this._provisionalPage); assert(this._provisionalPage);
assert(this._provisionalPage._session === newSession); assert(this._provisionalPage._session.sessionId === newTargetId, 'Unknown new target: ' + newTargetId);
assert(this._session.sessionId === oldTargetId, 'Unknown old target: ' + oldTargetId);
this._session.errorText = 'Target was swapped out.';
const newSession = this._provisionalPage._session;
this._provisionalPage.commit(); this._provisionalPage.commit();
this._provisionalPage.dispose(); this._provisionalPage.dispose();
this._provisionalPage = null; this._provisionalPage = null;
@ -180,17 +173,15 @@ export class WKPage implements PageDelegate {
private _onTargetDestroyed(event: Protocol.Target.targetDestroyedPayload) { private _onTargetDestroyed(event: Protocol.Target.targetDestroyedPayload) {
const { targetId, crashed } = event; const { targetId, crashed } = event;
const session = this._sessions.get(targetId); if (this._provisionalPage && this._provisionalPage._session.sessionId === targetId) {
assert(session, 'Unknown target destroyed: ' + targetId); this._provisionalPage._session.dispose();
session.dispose();
this._sessions.delete(targetId);
if (this._provisionalPage && this._provisionalPage._session === session) {
this._provisionalPage.dispose(); this._provisionalPage.dispose();
this._provisionalPage = null; this._provisionalPage = null;
return; } else if (this._session.sessionId === targetId) {
this._session.dispose();
if (crashed)
this.didClose(crashed);
} }
if (this._session === session && crashed)
this.didClose(crashed);
} }
didClose(crashed: boolean) { didClose(crashed: boolean) {
@ -204,10 +195,10 @@ export class WKPage implements PageDelegate {
dispose() { dispose() {
this._pageProxySession.dispose(); this._pageProxySession.dispose();
helper.removeEventListeners(this._eventListeners); helper.removeEventListeners(this._eventListeners);
for (const session of this._sessions.values()) if (this._session)
session.dispose(); this._session.dispose();
this._sessions.clear();
if (this._provisionalPage) { if (this._provisionalPage) {
this._provisionalPage._session.dispose();
this._provisionalPage.dispose(); this._provisionalPage.dispose();
this._provisionalPage = null; this._provisionalPage = null;
} }
@ -241,7 +232,6 @@ export class WKPage implements PageDelegate {
}); });
}); });
assert(targetInfo.type === 'page', 'Only page targets are expected in WebKit, received: ' + targetInfo.type); assert(targetInfo.type === 'page', 'Only page targets are expected in WebKit, received: ' + targetInfo.type);
this._sessions.set(targetInfo.targetId, session);
if (!this._initialized) { if (!this._initialized) {
assert(!targetInfo.isProvisional); assert(!targetInfo.isProvisional);
@ -262,7 +252,6 @@ export class WKPage implements PageDelegate {
this._pagePromiseCallback(pageOrError); this._pagePromiseCallback(pageOrError);
} else { } else {
assert(targetInfo.isProvisional); assert(targetInfo.isProvisional);
(session as any)[isPovisionalSymbol] = true;
assert(!this._provisionalPage); assert(!this._provisionalPage);
this._provisionalPage = new WKProvisionalPage(session, this); this._provisionalPage = new WKProvisionalPage(session, this);
if (targetInfo.isPaused) { if (targetInfo.isPaused) {
@ -275,9 +264,12 @@ export class WKPage implements PageDelegate {
private _onDispatchMessageFromTarget(event: Protocol.Target.dispatchMessageFromTargetPayload) { private _onDispatchMessageFromTarget(event: Protocol.Target.dispatchMessageFromTargetPayload) {
const { targetId, message } = event; const { targetId, message } = event;
const session = this._sessions.get(targetId); if (this._provisionalPage && this._provisionalPage._session.sessionId === targetId)
assert(session, 'Unknown target: ' + targetId); this._provisionalPage._session.dispatchMessage(JSON.parse(message));
session.dispatchMessage(JSON.parse(message)); else if (this._session.sessionId === targetId)
this._session.dispatchMessage(JSON.parse(message));
else
throw new Error('Unknown target: ' + targetId);
} }
private _addSessionListeners() { private _addSessionListeners() {