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

Bug 817580 - Pref off new webapps actor features until we secure remote debugger connection. r=paul.rouget

Browse Source
This commit is contained in:
Alexandre Poirot 2013-07-24 11:29:04 -04:00
parent e967ab7776
commit 5a3d2d1f5a
3 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
b2g/chrome/content/shell.js
View File

@ -977,14 +977,19 @@ let RemoteDebugger = {
// Ask for remote connections.
DebuggerServer.init(this.prompt.bind(this));
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webbrowser.js");
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/script.js");
DebuggerServer.addGlobalActor(DebuggerServer.ChromeDebuggerActor, "chromeDebugger");
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webconsole.js");
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/gcli.js");
if ("nsIProfiler" in Ci) {
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/profiler.js");
// Until we implement unix domain socket, we enable content actors
// only on development devices
if (Services.prefs.getBoolPref("devtools.debugger.enable-content-actors")) {
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/script.js");
DebuggerServer.addGlobalActor(DebuggerServer.ChromeDebuggerActor, "chromeDebugger");
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webconsole.js");
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/gcli.js");
if ("nsIProfiler" in Ci) {
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/profiler.js");
}
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/styleeditor.js");
DebuggerServer.enableWebappsContentActor = true;
}
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/styleeditor.js");
DebuggerServer.addActors('chrome://browser/content/dbg-browser-actors.js');
DebuggerServer.addActors("resource://gre/modules/devtools/server/actors/webapps.js");
}

3
modules/libpref/src/init/all.js
View File

@ -454,6 +454,9 @@ pref("devtools.debugger.remote-port", 6000);
// Force debugger server binding on the loopback interface
pref("devtools.debugger.force-local", true);
// Temporary setting to enable webapps actors
pref("devtools.debugger.enable-content-actors", false);
// view source
pref("view_source.syntax_highlight", true);
pref("view_source.wrap_long_lines", false);

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

@ -572,15 +572,21 @@ WebappsActor.prototype = {
* The request types this actor can handle.
*/
WebappsActor.prototype.requestTypes = {
"install": WebappsActor.prototype.install,
"getAll": WebappsActor.prototype.getAll,
"launch": WebappsActor.prototype.launch,
"close": WebappsActor.prototype.close,
"uninstall": WebappsActor.prototype.uninstall,
"listRunningApps": WebappsActor.prototype.listRunningApps,
"getAppActor": WebappsActor.prototype.getAppActor,
"watchApps": WebappsActor.prototype.watchApps,
"unwatchApps": WebappsActor.prototype.unwatchApps
"install": WebappsActor.prototype.install
};
// Until we implement unix domain socket, we only enable app install
// only on production devices
if (Services.prefs.getBoolPref("devtools.debugger.enable-content-actors")) {
let requestTypes = WebappsActor.prototype.requestTypes;
requestTypes.getAll = WebappsActor.prototype.getAll;
requestTypes.launch = WebappsActor.prototype.launch;
requestTypes.close = WebappsActor.prototype.close;
requestTypes.uninstall = WebappsActor.prototype.uninstall;
requestTypes.listRunningApps = WebappsActor.prototype.listRunningApps;
requestTypes.getAppActor = WebappsActor.prototype.getAppActor;
requestTypes.watchApps = WebappsActor.prototype.watchApps;
requestTypes.unwatchApps = WebappsActor.prototype.unwatchApps;
}
DebuggerServer.addGlobalActor(WebappsActor, "webappsActor");