Menu commander: use weak references to browsers.

In an attempt to not leak them? Refs greasemonkey#2067
arantius · Jul 7, 2015 · 8360d3b · 8360d3b
1 parent 50e8dd4
commit 8360d3b
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/content/menucommander.js b/content/menucommander.js
@@ -1,4 +1,6 @@
-Components.utils.import('chrome://greasemonkey-modules/content/util.js');
+var Cu = Components.utils;
+
+Cu.import('chrome://greasemonkey-modules/content/util.js');
 
 var GM_MenuCommander = {
   menuCommands: {}
@@ -24,7 +26,7 @@ GM_MenuCommander.menuCommandRegistered = function(aMessage) {
   }
 
   var command = aMessage.data;
-  command.browser = aMessage.target;
+  command.browser = Cu.getWeakReference(aMessage.target);
   GM_MenuCommander.menuCommands[windowId].push(command);
 };
 
@@ -45,10 +47,11 @@ GM_MenuCommander.toggleMenuCommands = function(aMessage) {
 };
 
 GM_MenuCommander.commandClicked = function(aCommand) {
-  aCommand.browser.messageManager.sendAsyncMessage("greasemonkey:menu-command-clicked", {
-    index: aCommand.index,
-    windowId: aCommand.windowId
-  });
+  aCommand.browser.get().messageManager.sendAsyncMessage(
+    "greasemonkey:menu-command-clicked", {
+      index: aCommand.index,
+      windowId: aCommand.windowId
+    });
 };
 
 GM_MenuCommander.createMenuItem = function(command) {