yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(chromium): lifecycle events race (#4369)

Browse Source
This commit is contained in:
Dmitry Gozman 2020-11-06 13:37:15 -08:00 committed by GitHub
parent c83ac444b4
commit 3db8b23b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/server/chromium/crPage.ts
View File

@ -384,7 +384,8 @@ class FrameSession {
const { windowId } = await this._client.send('Browser.getWindowForTarget'); const { windowId } = await this._client.send('Browser.getWindowForTarget');
this._windowId = windowId; this._windowId = windowId;
} }
let lifecycleEventsEnabled: Promise<any>;
let isInitialLifecycle = true;
if (!this._isMainFrame()) if (!this._isMainFrame())
this._addSessionListeners(); this._addSessionListeners();
const promises: Promise<any>[] = [ const promises: Promise<any>[] = [
@ -406,20 +407,22 @@ class FrameSession {
frame._evaluateExpression(binding.source, false, {}).catch(e => {}); frame._evaluateExpression(binding.source, false, {}).catch(e => {});
} }
const isInitialEmptyPage = this._isMainFrame() && this._page.mainFrame().url() === ':'; const isInitialEmptyPage = this._isMainFrame() && this._page.mainFrame().url() === ':';
if (isInitialEmptyPage) { if (!isInitialEmptyPage)
this._firstNonInitialNavigationCommittedFulfill();
this._eventListeners.push(helper.addEventListener(this._client, 'Page.lifecycleEvent', event => {
// Ignore lifecycle events for the initial empty page. It is never the final page // Ignore lifecycle events for the initial empty page. It is never the final page
// hence we are going to get more lifecycle updates after the actual navigation has // hence we are going to get more lifecycle updates after the actual navigation has
// started (even if the target url is about:blank). // started (even if the target url is about:blank).
lifecycleEventsEnabled.then(() => { // Note: isInitialLifecycle is reset after the Page.setLifecycleEventsEnabled response.
this._eventListeners.push(helper.addEventListener(this._client, 'Page.lifecycleEvent', event => this._onLifecycleEvent(event))); const ignoreLifecycle = isInitialLifecycle && isInitialEmptyPage;
}); if (!ignoreLifecycle)
} else { this._onLifecycleEvent(event);
this._firstNonInitialNavigationCommittedFulfill(); }));
this._eventListeners.push(helper.addEventListener(this._client, 'Page.lifecycleEvent', event => this._onLifecycleEvent(event)));
}
}), }),
this._client.send('Log.enable', {}), this._client.send('Log.enable', {}),
lifecycleEventsEnabled = this._client.send('Page.setLifecycleEventsEnabled', { enabled: true }), this._client.send('Page.setLifecycleEventsEnabled', { enabled: true }).then(() => {
isInitialLifecycle = true;
}),
this._client.send('Runtime.enable', {}), this._client.send('Runtime.enable', {}),
this._client.send('Page.addScriptToEvaluateOnNewDocument', { this._client.send('Page.addScriptToEvaluateOnNewDocument', {
source: sourceMap.generateSourceUrl(), source: sourceMap.generateSourceUrl(),