netmonitor_wsactor_leak.diff

diff --git a/devtools/server/actors/network-monitor/websocket-actor.js b/devtools/server/actors/network-monitor/websocket-actor.js
--- a/devtools/server/actors/network-monitor/websocket-actor.js
+++ b/devtools/server/actors/network-monitor/websocket-actor.js
@@ -18,17 +18,17 @@ const webSocketEventService = Cc[
  *
  * @see devtools/shared/spec/websocket.js for documentation.
  */
 const WebSocketActor = ActorClassWithSpec(webSocketSpec, {
   initialize(conn, targetActor) {
     Actor.prototype.initialize.call(this, conn);
 
     this.targetActor = targetActor;
-    this.listening = false;
+    this.listenWindowID = null;
 
     // Each connection's webSocketSerialID is mapped to a httpChannelId
     this.connections = new Map();
 
     // Register for backend events.
     this.onNavigate = this.onNavigate.bind(this);
     this.onWillNavigate = this.onWillNavigate.bind(this);
     this.targetActor.on("navigate", this.onNavigate);
@@ -50,30 +50,33 @@ const WebSocketActor = ActorClassWithSpe
     this.stopListening();
     Actor.prototype.destroy.call(this);
   },
 
   // Actor API
 
   startListening: function() {
     // Register WS listener
-    if (!this.listening) {
+    if (!this.listenWindowID) {
       const innerWindowID = this.targetActor.window.windowUtils
         .currentInnerWindowID;
       webSocketEventService.addListener(innerWindowID, this);
-      this.listening = true;
+      this.listenWindowID = innerWindowID;
     }
   },
 
   stopListening() {
-    if (this.listening) {
-      const innerWindowID = this.targetActor.window.windowUtils
-        .currentInnerWindowID;
-      webSocketEventService.removeListener(innerWindowID, this);
-      this.listening = false;
+    if (this.listenWindowID) {
+      try {
+        webSocketEventService.removeListener(this.listenWindowID, this);
+      } catch (e) {
+        // XXX: this can throw apparently, probably if the debugged window is
+        // already gone? check with platform?
+      }
+      this.listenWindowID = null;
     }
   },
 
   // nsIWebSocketEventService
 
   webSocketCreated(webSocketSerialID, uri, protocols) {},
 
   webSocketOpened(