From c59f8736343cd0dedfb8ebed74a0bd0ab4b83149 Mon Sep 17 00:00:00 2001 From: Kris Maglione Date: Sat, 22 Feb 2014 10:23:22 -0800 Subject: [PATCH] Get rid of more deprecated Set method calls. --- common/modules/options.jsm | 4 ++-- common/modules/util.jsm | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/common/modules/options.jsm b/common/modules/options.jsm index f973a453..54bb1138 100644 --- a/common/modules/options.jsm +++ b/common/modules/options.jsm @@ -677,8 +677,8 @@ var Option = Class("Option", { values = Array.concat(values); function uniq(ary) { - let seen = {}; - return ary.filter(elem => !Set.add(seen, elem)); + let seen = RealSet(); + return ary.filter(elem => !seen.add(elem)); } switch (operator) { diff --git a/common/modules/util.jsm b/common/modules/util.jsm index 657696e5..cad4b5fc 100644 --- a/common/modules/util.jsm +++ b/common/modules/util.jsm @@ -1698,7 +1698,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), * @returns {[string]} The visible domains. */ visibleHosts: function visibleHosts(win) { - let res = [], seen = {}; + let res = [], + seen = RealSet(); (function rec(frame) { try { if (frame.location.hostname) @@ -1707,7 +1708,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), catch (e) {} Array.forEach(frame.frames, rec); })(win); - return res.filter(h => !Set.add(seen, h)); + return res.filter(h => !seen.add(h)); }, /** @@ -1718,7 +1719,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), * @returns {[nsIURI]} The visible URIs. */ visibleURIs: function visibleURIs(win) { - let res = [], seen = {}; + let res = [], + seen = RealSet(); (function rec(frame) { try { res = res.concat(util.newURI(frame.location.href)); @@ -1726,7 +1728,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), catch (e) {} Array.forEach(frame.frames, rec); })(win); - return res.filter(h => !Set.add(seen, h.spec)); + return res.filter(h => !seen.add(h.spec)); }, /**