nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1602444 - Prevent attaching twice to content pages from the browser toolbox. r=jdescottes

Browse source 
We were breaking twice in the browser toolbox because we were attaching to
all the content process targets as well as all frame targets.
But as frames (i.e. web pages) are running within the content processes,
we were having two thread actor attached to the same thread.
This is a stopgap solution for the browser toolbox and we would need
to do something better for the content toolboxes.

Differential Revision: https://phabricator.services.mozilla.com/D57505

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Alexandre Poirot 2019-12-20 14:34:26 +00:00
parent 547a035358
commit 58e8c17d92
1 changed files with 18 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

27
devtools/client/framework/toolbox.js
View file

@ -649,11 +649,12 @@ Toolbox.prototype = {
targetFront.watchFronts("inspector", async inspectorFront => {
registerWalkerListeners(this.store, inspectorFront.walker);
});
}
this._threadFront = await this._attachTarget(targetFront);
await this._attachTarget({ type, targetFront, isTopLevel });
if (isTopLevel) {
this.emit("top-target-attached");
} else {
return this._attachTarget(targetFront);
}
},
@ -670,16 +671,24 @@ Toolbox.prototype = {
* And we listen for thread actor events in order to update toolbox UI when
* we hit a breakpoint.
*/
async _attachTarget(target) {
await target.attach();
async _attachTarget({ type, targetFront, isTopLevel }) {
await targetFront.attach();
// Start tracking network activity on toolbox open for targets such as tabs.
const webConsoleFront = await target.getFront("console");
const webConsoleFront = await targetFront.getFront("console");
await webConsoleFront.startListeners(["NetworkActivity"]);
const threadFront = await this._attachAndResumeThread(target);
this._startThreadFrontListeners(threadFront);
return threadFront;
// Do not attach to the thread of additional Frame targets, as they are
// already tracked by the content process targets. At least in the context
// of the Browser Toolbox.
// We would have to revisit that for the content toolboxes.
if (isTopLevel || type != TargetList.TYPES.FRAME) {
const threadFront = await this._attachAndResumeThread(targetFront);
this._startThreadFrontListeners(threadFront);
if (isTopLevel) {
this._threadFront = threadFront;
}
}
},
_startThreadFrontListeners: function(threadFront) {