Backed out 12 changesets (bug 1202482, bug 1202483, bug 1202481, bug 1202486, bug 1202479, bug 1202478, bug 1197475, bug 1203331, bug 1139860, bug 1202501, bug 1199473, bug 1190662) for Mulet mochitest-5 timeouts

CLOSED TREE

Backed out changeset 6503123e95dd (bug 1139860)
Backed out changeset b83bc163064d (bug 1203331)
Backed out changeset 2f501bd57cd2 (bug 1202481)
Backed out changeset 37e6ac7beb42 (bug 1202486)
Backed out changeset f9b6e99e620e (bug 1202483)
Backed out changeset 466af9f9baee (bug 1202482)
Backed out changeset 6be690e265a2 (bug 1202479)
Backed out changeset 57ff88bfccf4 (bug 1197475)
Backed out changeset 7e8c04ff6049 (bug 1202478)
Backed out changeset 525227997274 (bug 1202501)
Backed out changeset da317cdb79d3 (bug 1199473)
Backed out changeset 73b8ddd6dac9 (bug 1190662)
This commit is contained in:
Phil Ringnalda
2015-09-22 19:29:51 -07:00
parent 978242ee5b
commit aaf72d29b9
38 changed files with 188 additions and 1415 deletions

View File

@@ -9,7 +9,7 @@ var {
// WeakMap[Extension -> Set[Notification]]
var notificationsMap = new WeakMap();
// WeakMap[Extension -> Set[callback]]
// WeakMap[Extension -> callback]
var notificationCallbacksMap = new WeakMap();
// Manages a notification popup (notifications API) created by the extension.
@@ -54,8 +54,8 @@ Notification.prototype = {
return;
}
for (let callback in notificationCallbacksMap.get(this.extension)) {
callback(this);
if (notificationCallbacksMap.has(this.extension)) {
notificationCallbackMap.get(this.extension)(this);
}
notificationsMap.get(this.extension).delete(this);
@@ -64,7 +64,6 @@ Notification.prototype = {
extensions.on("startup", (type, extension) => {
notificationsMap.set(extension, new Set());
notificationCallbacksMap.set(extension, new Set());
});
extensions.on("shutdown", (type, extension) => {
@@ -72,7 +71,6 @@ extensions.on("shutdown", (type, extension) => {
notification.clear();
}
notificationsMap.delete(extension);
notificationCallbacksMap.delete(extension);
});
var nextId = 0;
@@ -130,9 +128,9 @@ extensions.registerPrivilegedAPI("notifications", (extension, context) => {
fire(notification.id, true);
};
notificationCallbacksMap.get(extension).add(listener);
notificationCallbackMap.set(extension, listener);
return () => {
notificationCallbacksMap.get(extension).delete(listener);
notificationCallbackMap.delete(extension);
};
}).api(),