# HG changeset patch # User Till Schneidereit # Date 1451909215 -3600 # Mon Jan 04 13:06:55 2016 +0100 # Node ID 5f95feb0d56d6f0d26ea9d33447ab443f4002d5f # Parent f21b9347d2f58942a3ff33532251a6030639f0c6 Bug 1101817 - Part 3: Remove WeakMap.prototype.clear usages from Addons SDK diff --git a/addon-sdk/source/lib/sdk/lang/weak-set.js b/addon-sdk/source/lib/sdk/lang/weak-set.js --- a/addon-sdk/source/lib/sdk/lang/weak-set.js +++ b/addon-sdk/source/lib/sdk/lang/weak-set.js @@ -8,26 +8,31 @@ module.metadata = { "use strict"; const { Cu } = require("chrome"); function makeGetterFor(Type) { let cache = new WeakMap(); - return function getFor(target) { - if (!cache.has(target)) - cache.set(target, new Type()); + return { + getFor(target) { + if (!cache.has(target)) + cache.set(target, new Type()); - return cache.get(target); + return cache.get(target); + }, + clearFor(target) { + return cache.delete(target) + } } } -var getLookupFor = makeGetterFor(WeakMap); -var getRefsFor = makeGetterFor(Set); +var {getFor: getLookupFor, clearFor: clearLookupFor} = makeGetterFor(WeakMap); +var {getFor: getRefsFor, clearFor: clearRefsFor} = makeGetterFor(Set); function add(target, value) { if (has(target, value)) return; getLookupFor(target).set(value, true); getRefsFor(target).add(Cu.getWeakReference(value)); } @@ -39,18 +44,18 @@ function remove(target, value) { exports.remove = remove; function has(target, value) { return getLookupFor(target).has(value); } exports.has = has; function clear(target) { - getLookupFor(target).clear(); - getRefsFor(target).clear(); + clearLookupFor(target); + clearRefsFor(target); } exports.clear = clear; function iterator(target) { let refs = getRefsFor(target); for (let ref of refs) { let value = ref.get();