wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 854174 - Chrome debugging should use its own port to avoid interfering with remote port changes, r=past

Browse Source
This commit is contained in:
Victor Porof 2013-03-26 18:30:13 +02:00
parent 0547f46649
commit b49c68fd44
3 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/app/profile/firefox.js
View File

@ -1056,6 +1056,8 @@ pref("devtools.responsiveUI.enabled", true);
// Enable the Debugger
pref("devtools.debugger.enabled", true);
pref("devtools.debugger.chrome-enabled", true);
pref("devtools.debugger.chrome-debugging-host", "localhost");
pref("devtools.debugger.chrome-debugging-port", 6080);
pref("devtools.debugger.remote-host", "localhost");
pref("devtools.debugger.remote-autoconnect", false);
pref("devtools.debugger.remote-connection-retries", 3);

30
browser/devtools/debugger/DebuggerUI.jsm
View File

@ -11,7 +11,7 @@ const Cu = Components.utils;
const DBG_XUL = "chrome://browser/content/debugger.xul";
const DBG_STRINGS_URI = "chrome://browser/locale/devtools/debugger.properties";
const CHROME_DEBUGGER_PROFILE_NAME = "_chrome-debugger-profile";
const CHROME_DEBUGGER_PROFILE_NAME = "-chrome-debugger";
const TAB_SWITCH_NOTIFICATION = "debugger-tab-switch";
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
@ -475,7 +475,7 @@ ChromeDebuggerProcess.prototype = {
DebuggerServer.init();
DebuggerServer.addBrowserActors();
}
DebuggerServer.openListener(Prefs.remotePort);
DebuggerServer.openListener(Prefs.chromeDebuggingPort);
},
/**
@ -597,27 +597,11 @@ XPCOMUtils.defineLazyGetter(L10N, "stringBundle", function() {
let Prefs = {};
/**
* Gets the preferred default remote debugging host.
* @return string
*/
XPCOMUtils.defineLazyGetter(Prefs, "remoteHost", function() {
return Services.prefs.getCharPref("devtools.debugger.remote-host");
});
/**
* Gets the preferred default remote debugging port.
* Gets the preferred default remote browser debugging port.
* @return number
*/
XPCOMUtils.defineLazyGetter(Prefs, "remotePort", function() {
return Services.prefs.getIntPref("devtools.debugger.remote-port");
});
/**
* Gets the preferred default remote debugging port.
* @return number
*/
XPCOMUtils.defineLazyGetter(Prefs, "wantLogging", function() {
return Services.prefs.getBoolPref("devtools.debugger.log");
XPCOMUtils.defineLazyGetter(Prefs, "chromeDebuggingPort", function() {
return Services.prefs.getIntPref("devtools.debugger.chrome-debugging-port");
});
/**
@ -625,7 +609,9 @@ XPCOMUtils.defineLazyGetter(Prefs, "wantLogging", function() {
* @param string
*/
function dumpn(str) {
if (Prefs.wantLogging) {
if (wantLogging) {
dump("DBG-FRONTEND: " + str + "\n");
}
}
let wantLogging = Services.prefs.getBoolPref("devtools.debugger.log");

5
browser/devtools/debugger/debugger-controller.js
View File

@ -185,7 +185,8 @@ let DebuggerController = {
}
// Chrome debugging needs to make the connection to the debuggee.
let transport = debuggerSocketConnect(Prefs.remoteHost, Prefs.remotePort);
let transport = debuggerSocketConnect(Prefs.chromeDebuggingHost,
Prefs.chromeDebuggingPort);
let client = this.client = new DebuggerClient(transport);
client.addListener("tabNavigated", this._onTabNavigated);
@ -1731,6 +1732,8 @@ let Prefs = {
}
};
Prefs.map("Char", "chromeDebuggingHost", "devtools.debugger.chrome-debugging-host");
Prefs.map("Int", "chromeDebuggingPort", "devtools.debugger.chrome-debugging-port");
Prefs.map("Int", "windowX", "devtools.debugger.ui.win-x");
Prefs.map("Int", "windowY", "devtools.debugger.ui.win-y");
Prefs.map("Int", "windowWidth", "devtools.debugger.ui.win-width");