mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1059001 - Part 1b: Update openListener callsites. r=past
This commit is contained in:
parent
1695ec37b2
commit
b5ae422613
@ -56,8 +56,8 @@ function setupButtons() {
|
||||
function checkDebuggerPort() {
|
||||
// XXX: To be removed once bug 942756 lands.
|
||||
// We are hacking 'unix-domain-socket' pref by setting a tcp port (number).
|
||||
// DebuggerServer.openListener detects that it isn't a file path (string),
|
||||
// and starts listening on the tcp port given here as command line argument.
|
||||
// SocketListener.open detects that it isn't a file path (string), and starts
|
||||
// listening on the tcp port given here as command line argument.
|
||||
|
||||
// Get the command line arguments that were passed to the b2g client
|
||||
let args;
|
||||
|
@ -145,8 +145,10 @@ let USBRemoteDebugger = {
|
||||
|
||||
try {
|
||||
debug("Starting USB debugger on " + portOrPath);
|
||||
this._listener = DebuggerServer.openListener(portOrPath);
|
||||
this._listener = DebuggerServer.createListener();
|
||||
this._listener.portOrPath = portOrPath;
|
||||
this._listener.allowConnection = RemoteDebugger.prompt;
|
||||
this._listener.open();
|
||||
// Temporary event, until bug 942756 lands and offers a way to know
|
||||
// when the server is up and running.
|
||||
Services.obs.notifyObservers(null, "debugger-server-started", null);
|
||||
@ -181,8 +183,10 @@ let WiFiRemoteDebugger = {
|
||||
|
||||
try {
|
||||
debug("Starting WiFi debugger");
|
||||
this._listener = DebuggerServer.openListener(-1);
|
||||
this._listener = DebuggerServer.createListener();
|
||||
this._listener.portOrPath = -1 /* any available port */;
|
||||
this._listener.allowConnection = RemoteDebugger.prompt;
|
||||
this._listener.open();
|
||||
let port = this._listener.port;
|
||||
debug("Started WiFi debugger on " + port);
|
||||
discovery.addService("devtools", { port: port });
|
||||
|
@ -10,6 +10,7 @@ let gProcess;
|
||||
function test() {
|
||||
// Windows XP and 8.1 test slaves are terribly slow at this test.
|
||||
requestLongerTimeout(5);
|
||||
Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
|
||||
|
||||
initChromeDebugger(aOnClose).then(aProcess => {
|
||||
gProcess = aProcess;
|
||||
@ -56,5 +57,6 @@ function aOnClose() {
|
||||
}
|
||||
|
||||
registerCleanupFunction(function() {
|
||||
Services.prefs.clearUserPref("devtools.debugger.remote-enabled");
|
||||
gProcess = null;
|
||||
});
|
||||
|
@ -142,7 +142,9 @@ BrowserToolboxProcess.prototype = {
|
||||
|
||||
let chromeDebuggingPort =
|
||||
Services.prefs.getIntPref("devtools.debugger.chrome-debugging-port");
|
||||
this.debuggerServer.openListener(chromeDebuggingPort);
|
||||
let listener = this.debuggerServer.createListener();
|
||||
listener.portOrPath = chromeDebuggingPort;
|
||||
listener.open();
|
||||
|
||||
dumpn("Finished initializing the chrome toolbox server.");
|
||||
dumpn("Started listening on port: " + chromeDebuggingPort);
|
||||
|
@ -236,7 +236,9 @@ var BrowserUI = {
|
||||
DebuggerServer.addBrowserActors();
|
||||
DebuggerServer.addActors('chrome://browser/content/dbg-metro-actors.js');
|
||||
}
|
||||
DebuggerServer.openListener(port);
|
||||
let listener = DebuggerServer.createListener();
|
||||
listener.portOrPath = port;
|
||||
listener.open();
|
||||
},
|
||||
|
||||
stopDebugServer: function stopDebugServer() {
|
||||
|
@ -7355,8 +7355,10 @@ var RemoteDebugger = {
|
||||
let pathOrPort = this._getPath();
|
||||
if (!pathOrPort)
|
||||
pathOrPort = this._getPort();
|
||||
let listener = DebuggerServer.openListener(pathOrPort);
|
||||
let listener = DebuggerServer.createListener();
|
||||
listener.portOrPath = pathOrPort;
|
||||
listener.allowConnection = this._showConnectionPrompt.bind(this);
|
||||
listener.open();
|
||||
dump("Remote debugger listening at path " + pathOrPort);
|
||||
} catch(e) {
|
||||
dump("Remote debugger didn't start: " + e);
|
||||
|
@ -406,8 +406,10 @@ function _initDebugging(port) {
|
||||
do_print("*******************************************************************");
|
||||
do_print("")
|
||||
|
||||
let listener = DebuggerServer.openListener(port);
|
||||
let listener = DebuggerServer.createListener();
|
||||
listener.portOrPath = port;
|
||||
listener.allowConnection = () => true;
|
||||
listener.open();
|
||||
|
||||
// spin an event loop until the debugger connects.
|
||||
let thr = Components.classes["@mozilla.org/thread-manager;1"]
|
||||
|
@ -48,11 +48,14 @@ exports.items = [
|
||||
}
|
||||
],
|
||||
exec: function(args, context) {
|
||||
var reply = debuggerServer.openListener(args.port);
|
||||
if (!reply) {
|
||||
var listener = debuggerServer.createListener();
|
||||
if (!listener) {
|
||||
throw new Error(gcli.lookup("listenDisabledOutput"));
|
||||
}
|
||||
|
||||
listener.portOrPath = args.port;
|
||||
listener.open();
|
||||
|
||||
if (debuggerServer.initialized) {
|
||||
return gcli.lookupFormat("listenInitOutput", [ "" + args.port ]);
|
||||
}
|
||||
|
@ -9,7 +9,7 @@ function run_test()
|
||||
// Should get an exception if we try to interact with DebuggerServer
|
||||
// before we initialize it...
|
||||
check_except(function() {
|
||||
DebuggerServer.openListener(-1);
|
||||
DebuggerServer.createListener();
|
||||
});
|
||||
check_except(DebuggerServer.closeAllListeners);
|
||||
check_except(DebuggerServer.connectPipe);
|
||||
@ -20,7 +20,7 @@ function run_test()
|
||||
// These should still fail because we haven't added a createRootActor
|
||||
// implementation yet.
|
||||
check_except(function() {
|
||||
DebuggerServer.openListener(-1);
|
||||
DebuggerServer.createListener();
|
||||
});
|
||||
check_except(DebuggerServer.closeAllListeners);
|
||||
check_except(DebuggerServer.connectPipe);
|
||||
@ -28,7 +28,7 @@ function run_test()
|
||||
DebuggerServer.registerModule("xpcshell-test/testactors");
|
||||
|
||||
// Now they should work.
|
||||
DebuggerServer.openListener(-1);
|
||||
DebuggerServer.createListener();
|
||||
DebuggerServer.closeAllListeners();
|
||||
|
||||
// Make sure we got the test's root actor all set up.
|
||||
|
@ -260,8 +260,10 @@ function writeTestTempFile(aFileName, aContent) {
|
||||
|
||||
function socket_transport() {
|
||||
if (!DebuggerServer.listeningSockets) {
|
||||
let listener = DebuggerServer.openListener(-1);
|
||||
let listener = DebuggerServer.createListener();
|
||||
listener.portOrPath = -1 /* any available port */;
|
||||
listener.allowConnection = () => true;
|
||||
listener.open();
|
||||
}
|
||||
let port = DebuggerServer._listeners[0].port;
|
||||
do_print("Debugger server port is " + port);
|
||||
|
@ -22,15 +22,19 @@ function run_test()
|
||||
function test_socket_conn()
|
||||
{
|
||||
do_check_eq(DebuggerServer.listeningSockets, 0);
|
||||
let listener = DebuggerServer.openListener(-1);
|
||||
listener.allowConnection = () => true;
|
||||
let listener = DebuggerServer.createListener();
|
||||
do_check_true(listener);
|
||||
listener.portOrPath = -1 /* any available port */;
|
||||
listener.allowConnection = () => true;
|
||||
listener.open();
|
||||
do_check_eq(DebuggerServer.listeningSockets, 1);
|
||||
gPort = DebuggerServer._listeners[0].port;
|
||||
do_print("Debugger server port is " + gPort);
|
||||
// Open a second, separate listener
|
||||
gExtraListener = DebuggerServer.openListener(-1);
|
||||
gExtraListener = DebuggerServer.createListener();
|
||||
gExtraListener.portOrPath = -1;
|
||||
gExtraListener.allowConnection = () => true;
|
||||
gExtraListener.open();
|
||||
do_check_eq(DebuggerServer.listeningSockets, 2);
|
||||
|
||||
do_print("Starting long and unicode tests at " + new Date().toTimeString());
|
||||
|
@ -47,8 +47,10 @@ function test_socket_conn_drops_after_too_long_header() {
|
||||
}
|
||||
|
||||
function test_helper(payload) {
|
||||
let listener = DebuggerServer.openListener(-1);
|
||||
let listener = DebuggerServer.createListener();
|
||||
listener.portOrPath = -1;
|
||||
listener.allowConnection = () => true;
|
||||
listener.open();
|
||||
|
||||
let transport = DebuggerClient.socketConnect("127.0.0.1", listener.port);
|
||||
transport.hooks = {
|
||||
|
@ -21,6 +21,8 @@ this.RemoteDebugger = {
|
||||
DebuggerServer.addBrowserActors("webapprt:webapp");
|
||||
DebuggerServer.addActors("chrome://webapprt/content/dbg-webapp-actors.js");
|
||||
}
|
||||
DebuggerServer.openListener(port);
|
||||
let listener = DebuggerServer.createListener();
|
||||
listener.portOrPath = port;
|
||||
listener.open();
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user