Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1465635 - Always consider that Target.activeTab is set. r=yulia

Browse Source 
Depends on D15826

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

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Alexandre Poirot 2019-01-30 13:28:13 +00:00
parent 9ad26a5f93
commit b36f6878dd
1 changed files with 16 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
devtools/client/framework/target.js
View File

@ -448,7 +448,7 @@ class Target extends EventEmitter {
}
get isWorkerTarget() {
return this.activeTab && this.activeTab.typeName === "workerTarget";
return this.activeTab.typeName === "workerTarget";
}
get isLegacyAddon() {
@ -481,7 +481,7 @@ class Target extends EventEmitter {
}
get canRewind() {
return this.activeTab && this.activeTab.traits.canRewind;
return this.activeTab.traits.canRewind;
}
isReplayEnabled() {
@ -538,17 +538,7 @@ class Target extends EventEmitter {
// Attach the target actor
const attachBrowsingContextTarget = async () => {
// Some BrowsingContextTargetFront are already instantiated and passed as
// contructor's argument, like for ParentProcessTargetActor.
// For them, we only need to attach them.
// The call to attachTarget is to be removed once all Target are having a front
// passed as contructor's argument.
if (!this.activeTab) {
const [, targetFront] = await this._client.attachTarget(this.form);
this.activeTab = targetFront;
} else {
await this.activeTab.attach();
}
await this.activeTab.attach();
this.activeTab.on("tabNavigated", this._onTabNavigated);
this._onFrameUpdate = packet => {
@ -654,32 +644,13 @@ class Target extends EventEmitter {
_setupRemoteListeners() {
this.client.addListener("closed", this.destroy);
// For now, only browsing-context inherited actors are using a front,
// for which events have to be listened on the front itself.
// For other actors (ContentProcessTargetActor and AddonTargetActor), events should
// still be listened directly on the client. This should be ultimately cleaned up to
// only listen from a front by bug 1465635.
if (this.activeTab) {
this.activeTab.on("tabDetached", this.destroy);
this.activeTab.on("tabDetached", this.destroy);
// These events should be ultimately listened from the thread client as
// they are coming from it and no longer go through the Target Actor/Front.
this._onSourceUpdated = packet => this.emit("source-updated", packet);
this.activeTab.on("newSource", this._onSourceUpdated);
this.activeTab.on("updatedSource", this._onSourceUpdated);
} else {
this._onTabDetached = (type, packet) => {
// We have to filter message to ensure that this detach is for this tab
if (packet.from == this.form.actor) {
this.destroy();
}
};
this.client.addListener("tabDetached", this._onTabDetached);
this._onSourceUpdated = (type, packet) => this.emit("source-updated", packet);
this.client.addListener("newSource", this._onSourceUpdated);
this.client.addListener("updatedSource", this._onSourceUpdated);
}
// These events should be ultimately listened from the thread client as
// they are coming from it and no longer go through the Target Actor/Front.
this._onSourceUpdated = packet => this.emit("source-updated", packet);
this.activeTab.on("newSource", this._onSourceUpdated);
this.activeTab.on("updatedSource", this._onSourceUpdated);
}
/**
@ -688,18 +659,12 @@ class Target extends EventEmitter {
_teardownRemoteListeners() {
// Remove listeners set in _setupRemoteListeners
this.client.removeListener("closed", this.destroy);
if (this.activeTab) {
this.activeTab.off("tabDetached", this.destroy);
this.activeTab.off("newSource", this._onSourceUpdated);
this.activeTab.off("updatedSource", this._onSourceUpdated);
} else {
this.client.removeListener("tabDetached", this._onTabDetached);
this.client.removeListener("newSource", this._onSourceUpdated);
this.client.removeListener("updatedSource", this._onSourceUpdated);
}
this.activeTab.off("tabDetached", this.destroy);
this.activeTab.off("newSource", this._onSourceUpdated);
this.activeTab.off("updatedSource", this._onSourceUpdated);
// Remove listeners set in attachTarget
if (this.activeTab) {
if (this.isBrowsingContext) {
this.activeTab.off("tabNavigated", this._onTabNavigated);
this.activeTab.off("frameUpdate", this._onFrameUpdate);
}
@ -782,7 +747,7 @@ class Target extends EventEmitter {
// We started with a local tab and created the client ourselves, so we
// should close it.
await this._client.close();
} else if (this.activeTab) {
} else {
// The client was handed to us, so we are not responsible for closing
// it. We just need to detach from the tab, if already attached.
// |detach| may fail if the connection is already dead, so proceed with
@ -834,7 +799,7 @@ class Target extends EventEmitter {
* @returns {Promise}
*/
logErrorInPage(text, category) {
if (this.activeTab && this.activeTab.traits.logInPage) {
if (this.activeTab.traits.logInPage) {
const errorFlag = 0;
return this.activeTab.logInPage({ text, category, flags: errorFlag });
}
@ -851,7 +816,7 @@ class Target extends EventEmitter {
* @returns {Promise}
*/
logWarningInPage(text, category) {
if (this.activeTab && this.activeTab.traits.logInPage) {
if (this.activeTab.traits.logInPage) {
const warningFlag = 1;
return this.activeTab.logInPage({ text, category, flags: warningFlag });
}