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

Bug 1473511 - use protocol.js pool to manage thread actor; r=ochameau

Browse Source 
MozReview-Commit-ID: 6Ifmo0GCdwe

--HG--
extra : rebase_source : 3a25cb22577c54f572a34275a1c3e8ed460cb34f
This commit is contained in:
yulia 2018-07-05 12:22:27 +02:00
parent c02cc66b8b
commit 8338f48220
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
devtools/server/actors/targets/browsing-context.js
View File

@ -290,7 +290,6 @@ const browsingContextTargetPrototype = {
},
_targetScopedActorPool: null,
_contextPool: null,
/**
* A constant prefix that will be used to form the actor ID by the server.
@ -579,7 +578,7 @@ const browsingContextTargetPrototype = {
}
// Create a pool for context-lifetime actors.
this._pushContext();
this._createThreadActor();
// on xpcshell, there is no document
if (this.window) {
@ -850,28 +849,19 @@ const browsingContextTargetPrototype = {
},
/**
* Creates a thread actor and a pool for context-lifetime actors. It then sets
* up the content window for debugging.
* Creates and manages the thread actor as part of the Browsing Context Target pool.
* This sets up the content window for being debugged
*/
_pushContext() {
assert(!this._contextPool, "Can't push multiple contexts");
this._contextPool = new ActorPool(this.conn);
this.conn.addActorPool(this._contextPool);
_createThreadActor() {
this.threadActor = new ThreadActor(this, this.window);
this._contextPool.addActor(this.threadActor);
this.manage(this.threadActor);
},
/**
* Exits the current thread actor and removes the context-lifetime actor pool.
* Exits the current thread actor and removes it from the Browsing Context Target pool.
* The content window is no longer being debugged after this call.
*/
_popContext() {
assert(!!this._contextPool, "No context to pop.");
this.conn.removeActorPool(this._contextPool);
this._contextPool = null;
_destroyThreadActor() {
this.threadActor.exit();
this.threadActor = null;
this._sources = null;
@ -905,7 +895,7 @@ const browsingContextTargetPrototype = {
Services.obs.removeObserver(this, "webnavigation-destroy");
}
this._popContext();
this._destroyThreadActor();
// Shut down actors that belong to this target's pool.
this._styleSheetActors.clear();

4
devtools/server/actors/thread.js
View File

@ -11,7 +11,7 @@ const { Cr } = require("chrome");
const { ActorPool, GeneratedLocation } = require("devtools/server/actors/common");
const { createValueGrip } = require("devtools/server/actors/object/utils");
const { longStringGrip } = require("devtools/server/actors/object/long-string");
const { ActorClassWithSpec } = require("devtools/shared/protocol");
const { ActorClassWithSpec, Actor } = require("devtools/shared/protocol");
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
const flags = require("devtools/shared/flags");
const { assert, dumpn } = DevToolsUtils;
@ -54,6 +54,7 @@ loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
*/
const ThreadActor = ActorClassWithSpec(threadSpec, {
initialize: function(parent, global) {
Actor.prototype.initialize.call(this, parent.conn);
this._state = "detached";
this._frameActors = [];
this._parent = parent;
@ -209,6 +210,7 @@ const ThreadActor = ActorClassWithSpec(threadSpec, {
destroy: function() {
dumpn("in ThreadActor.prototype.destroy");
Actor.prototype.destroy.call(this);
if (this._state == "paused") {
this.onResume();
}