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

Bug 937172 - Rename ContentAppActor to ContentActor (r=ochameau,past)

Browse Source
This commit is contained in:
Bill McCloskey 2014-03-10 09:38:17 -07:00
parent 802962c8f8
commit 84d20de7a2
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/devtools/apps/app-actor-front.js
View File

@ -259,7 +259,7 @@ function reloadApp(client, webappsActor, manifestURL) {
webappsActor,
manifestURL).
then((target) => {
// Request the ContentAppActor to reload the app
// Request the ContentActor to reload the app
let request = {
to: target.form.actor,
type: "reload",

18
toolkit/devtools/server/actors/childtab.js
View File

@ -12,7 +12,7 @@
/**
* Creates a tab actor for handling requests to the single tab, like
* attaching and detaching. ContentAppActor respects the actor factories
* attaching and detaching. ContentActor respects the actor factories
* registered with DebuggerServer.addTabActor.
*
* @param connection DebuggerServerConnection
@ -20,16 +20,16 @@
* @param browser browser
* The browser instance that contains this tab.
*/
function ContentAppActor(connection, browser)
function ContentActor(connection, browser)
{
BrowserTabActor.call(this, connection, browser);
}
ContentAppActor.prototype = Object.create(BrowserTabActor.prototype);
ContentActor.prototype = Object.create(BrowserTabActor.prototype);
ContentAppActor.prototype.constructor = ContentAppActor;
ContentActor.prototype.constructor = ContentActor;
Object.defineProperty(ContentAppActor.prototype, "title", {
Object.defineProperty(ContentActor.prototype, "title", {
get: function() {
return this.browser.title;
},
@ -37,7 +37,7 @@ Object.defineProperty(ContentAppActor.prototype, "title", {
configurable: false
});
Object.defineProperty(ContentAppActor.prototype, "url", {
Object.defineProperty(ContentActor.prototype, "url", {
get: function() {
return this.browser.document.documentURI;
},
@ -45,7 +45,7 @@ Object.defineProperty(ContentAppActor.prototype, "url", {
configurable: false
});
Object.defineProperty(ContentAppActor.prototype, "window", {
Object.defineProperty(ContentActor.prototype, "window", {
get: function() {
return this.browser;
},
@ -55,9 +55,9 @@ Object.defineProperty(ContentAppActor.prototype, "window", {
// Override grip just to rename this._tabActorPool to this._tabActorPool2
// in order to prevent it to be cleaned on detach.
// We have to keep tab actors alive as we keep the ContentAppActor
// We have to keep tab actors alive as we keep the ContentActor
// alive after detach and reuse it for multiple debug sessions.
ContentAppActor.prototype.grip = function () {
ContentActor.prototype.grip = function () {
let response = {
'actor': this.actorID,
'title': this.title,

2
toolkit/devtools/server/actors/highlighter.js
View File

@ -187,7 +187,7 @@ let HighlighterActor = protocol.ActorClass({
* - On a firefox desktop content page: tabActor is a BrowserTabActor from
* which the browser property will give us a target we can use to listen to
* events, even in nested iframes.
* - On B2G: tabActor is a ContentAppActor which doesn't have a browser but
* - On B2G: tabActor is a ContentActor which doesn't have a browser but
* since it overrides BrowserTabActor, it does get a browser property
* anyway, which points to its window object.
* - When using the Browser Toolbox (to inspect firefox desktop): tabActor is

2
toolkit/devtools/server/actors/webapps.js
View File

@ -120,7 +120,7 @@ function WebappsActor(aConnection) {
promise = Cu.import("resource://gre/modules/commonjs/sdk/core/promise.js").Promise;
// Keep reference of already created app actors.
// key: app frame message manager, value: ContentTabActor's grip() value
// key: app frame message manager, value: ContentActor's grip() value
this._appActorsMap = new Map();
this.conn = aConnection;

2
toolkit/devtools/server/child.js
View File

@ -28,7 +28,7 @@
let conn = DebuggerServer.connectToParent(msg.data.prefix, mm);
let actor = new DebuggerServer.ContentAppActor(conn, content);
let actor = new DebuggerServer.ContentActor(conn, content);
let actorPool = new ActorPool(conn);
actorPool.addActor(actor);
conn.addActorPool(actorPool);

4
toolkit/devtools/server/main.js
View File

@ -376,7 +376,7 @@ var DebuggerServer = {
if (!("BrowserTabActor" in this)) {
this.addActors("resource://gre/modules/devtools/server/actors/webbrowser.js");
}
if (!("ContentAppActor" in this)) {
if (!("ContentActor" in this)) {
this.addActors("resource://gre/modules/devtools/server/actors/childtab.js");
}
},
@ -570,7 +570,7 @@ var DebuggerServer = {
deferred.resolve(null);
}
if (actor) {
// The ContentAppActor within the child process doesn't necessary
// The ContentActor within the child process doesn't necessary
// have to time to uninitialize itself when the app is closed/killed.
// So ensure telling the client that the related actor is detached.
aConnection.send({ from: actor.actor, type: "tabDetached" });