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

browser(firefox): do not double-attach session to the same target (#4027)

Browse Source 
We currently might double-attach to the target in `BrowserHandler` since we iterate over all targets, and then subscribe to the additional event when target is getting initialized.

This patch fixes this race condition and should unblock the roll to r1177.

References #3995
This commit is contained in:
Andrey Lushnikov 2020-09-30 23:50:02 -07:00 committed by GitHub
parent f885d07cb9
commit b74a6b78ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser_patches/firefox/BUILD_NUMBER
View File

@ -1,2 +1,2 @@
1177
Changed: lushnikov@chromium.org Wed Sep 30 03:11:29 MDT 2020
1178
Changed: lushnikov@chromium.org Wed Sep 30 23:36:27 PDT 2020

9
browser_patches/firefox/juggler/TargetRegistry.js
View File

@ -147,8 +147,8 @@ class TargetRegistry {
const sessions = [];
const readyData = { sessions, target };
this.emit(TargetRegistry.Events.TargetCreated, readyData);
target.markAsReported();
this.emit(TargetRegistry.Events.TargetCreated, readyData);
return {
scriptsToEvaluateOnNewDocument: target.browserContext().scriptsToEvaluateOnNewDocument,
bindings: target.browserContext().bindings,
@ -321,8 +321,8 @@ class TargetRegistry {
return target.id();
}
targets() {
return Array.from(this._browserToTarget.values());
reportedTargets() {
return Array.from(this._browserToTarget.values()).filter(pageTarget => pageTarget._isReported);
}
targetForBrowser(browser) {
@ -364,6 +364,7 @@ class PageTarget {
helper.addProgressListener(tab.linkedBrowser, navigationListener, Ci.nsIWebProgress.NOTIFY_LOCATION),
];
this._isReported = false;
this._reportedPromise = new Promise(resolve => {
this._reportedCallback = resolve;
});
@ -379,6 +380,7 @@ class PageTarget {
}
markAsReported() {
this._isReported = true;
this._reportedCallback();
}
@ -491,6 +493,7 @@ class PageTarget {
this._registry._browserToTarget.delete(this._linkedBrowser);
this._registry._browserBrowsingContextToTarget.delete(this._linkedBrowser.browsingContext);
helper.removeListeners(this._eventListeners);
if (this._isReported)
this._registry.emit(TargetRegistry.Events.TargetDestroyed, this);
}
}

9
browser_patches/firefox/juggler/content/main.js
View File

@ -90,10 +90,11 @@ const applySetting = {
};
function initialize() {
const loadContext = docShell.QueryInterface(Ci.nsILoadContext);
const userContextId = loadContext.originAttributes.userContextId;
const response = sendSyncMessage('juggler:content-ready', { userContextId })[0];
const response = sendSyncMessage('juggler:content-ready')[0];
// If we didn't get a response, then we don't want to do anything
// as a part of this frame script.
if (!response)
return;
const {
sessionIds = [],
scriptsToEvaluateOnNewDocument = [],

2
browser_patches/firefox/juggler/protocol/BrowserHandler.js
View File

@ -29,7 +29,7 @@ class BrowserHandler {
this._enabled = true;
this._attachToDefaultContext = attachToDefaultContext;
for (const target of this._targetRegistry.targets()) {
for (const target of this._targetRegistry.reportedTargets()) {
if (!this._shouldAttachToTarget(target))
continue;
const session = this._dispatcher.createSession();