Skip to content

fix(webkit): unflake Page.setContent #786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgozman merged 1 commit into from
Jan 31, 2020
Merged

fix(webkit): unflake Page.setContent #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions src/webkit/wkPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ export class WKPage implements PageDelegate {
this._workers.setSession(session);
}

async initialize(session: WKSession, pagePausedOnStart: boolean) {
async initialize(session: WKSession) {
this._setSession(session);
await Promise.all([
this._initializePageProxySession(),
this._initializeSession(this._session, ({frameTree}) => this._handleFrameTree(frameTree, pagePausedOnStart)),
this._initializeSession(this._session, ({frameTree}) => this._handleFrameTree(frameTree)),
]);
}

Expand Down Expand Up @@ -240,26 +240,14 @@ export class WKPage implements PageDelegate {
this._page._frameManager.frameLifecycleEvent(frameId, event);
}

private _handleFrameTree(frameTree: Protocol.Page.FrameResourceTree, pagePausedOnStart: boolean) {
const frame = this._onFrameAttached(frameTree.frame.id, frameTree.frame.parentId || null);
private _handleFrameTree(frameTree: Protocol.Page.FrameResourceTree) {
this._onFrameAttached(frameTree.frame.id, frameTree.frame.parentId || null);
this._onFrameNavigated(frameTree.frame, true);

if (!pagePausedOnStart) {
frame._utilityContext().then(async context => {
const readyState = await context.evaluate(() => document.readyState).catch(e => 'loading');
if (frame.isDetached())
return;
if (readyState === 'interactive' || readyState === 'complete')
this._page._frameManager.frameLifecycleEvent(frame._id, 'domcontentloaded');
if (readyState === 'complete')
this._page._frameManager.frameLifecycleEvent(frame._id, 'load');
});
}

if (!frameTree.childFrames)
return;
for (const child of frameTree.childFrames)
this._handleFrameTree(child, pagePausedOnStart);
this._handleFrameTree(child);
}

_onFrameAttached(frameId: string, parentFrameId: string | null): frames.Frame {
Expand Down
8 changes: 3 additions & 5 deletions src/webkit/wkPageProxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,8 @@ export class WKPageProxy {
}

onPopupCreated(popupPageProxy: WKPageProxy) {
const wkPage = this._wkPage;
if (!wkPage || !wkPage._page.listenerCount(Events.Page.Popup))
return;
popupPageProxy.page().then(page => wkPage._page.emit(Events.Page.Popup, page));
if (this._wkPage)
popupPageProxy.page().then(page => this._wkPage!._page.emit(Events.Page.Popup, page));
}

private async _initializeWKPage(): Promise<Page> {
Expand All @@ -114,7 +112,7 @@ export class WKPageProxy {
}
assert(session, 'One non-provisional target session must exist');
this._wkPage = new WKPage(this._browserContext, this._pageProxySession);
await this._wkPage.initialize(session!, this._pagePausedOnStart);
await this._wkPage.initialize(session!);
if (this._pagePausedOnStart) {
this._resumeTarget(session!.sessionId);
this._pagePausedOnStart = false;
Expand Down