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 1058997 - Part 4: Only one DebuggerServer per loader. r=past

Browse Source 
It was never necessary to pass a server reference to the socket listener, since
a given DevTools loader only ever contains a single server instance.
This commit is contained in:
J. Ryan Stinnett 2014-12-01 22:55:56 -08:00
parent 324515f2c2
commit 1d4e44167f
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
toolkit/devtools/security/socket.js
View File

@ -68,13 +68,11 @@ function socketConnect(host, port) {
}
/**
* Creates a new socket listener for remote connections to a given
* DebuggerServer. This helps contain and organize the parts of the server that
* may differ or are particular to one given listener mechanism vs. another.
* Creates a new socket listener for remote connections to the DebuggerServer.
* This helps contain and organize the parts of the server that may differ or
* are particular to one given listener mechanism vs. another.
*/
function SocketListener(server) {
this._server = server;
}
function SocketListener() {}
/**
* Prompt the user to accept or decline the incoming connection. This is the
@ -147,8 +145,7 @@ SocketListener.prototype = {
*/
close: function() {
this._socket.close();
this._server._removeListener(this);
this._server = null;
DebuggerServer._removeListener(this);
},
/**
@ -185,7 +182,7 @@ SocketListener.prototype = {
let input = socketTransport.openInputStream(0, 0, 0);
let output = socketTransport.openOutputStream(0, 0, 0);
let transport = new DebuggerTransport(input, output);
this._server._onConnection(transport);
DebuggerServer._onConnection(transport);
}, "SocketListener.onSocketAccepted"),
onStopListening: function(socket, status) {
@ -197,8 +194,8 @@ SocketListener.prototype = {
// TODO: These high-level entry points will branch based on TLS vs. bare TCP as
// part of bug 1059001.
exports.DebuggerSocket = {
createListener(server) {
return new SocketListener(server);
createListener() {
return new SocketListener();
},
connect(host, port) {
return socketConnect(host, port);

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

@ -560,7 +560,7 @@ var DebuggerServer = {
}
this._checkInit();
let listener = DebuggerSocket.createListener(this);
let listener = DebuggerSocket.createListener();
listener.open(portOrPath);
this._listeners.push(listener);
return listener;