mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-30 05:35:31 +00:00
Backed out changeset e5c63c3fb088 (bug 1254291) for apparently causing leaks in OSX m(5)
MozReview-Commit-ID: DGymVB5Vtw5
This commit is contained in:
Wes Kocher
parent
9b52f45b30
commit
1ddc9841d6
@ -82,7 +82,6 @@ ExtensionManagement.registerSchema("chrome://extensions/content/schemas/extensio
|
||||
ExtensionManagement.registerSchema("chrome://extensions/content/schemas/extension_types.json");
|
||||
ExtensionManagement.registerSchema("chrome://extensions/content/schemas/i18n.json");
|
||||
ExtensionManagement.registerSchema("chrome://extensions/content/schemas/idle.json");
|
||||
ExtensionManagement.registerSchema("chrome://extensions/content/schemas/notifications.json");
|
||||
ExtensionManagement.registerSchema("chrome://extensions/content/schemas/runtime.json");
|
||||
ExtensionManagement.registerSchema("chrome://extensions/content/schemas/storage.json");
|
||||
ExtensionManagement.registerSchema("chrome://extensions/content/schemas/test.json");
|
||||
|
||||
@ -8,7 +8,7 @@ var {
|
||||
ignoreEvent,
|
||||
} = ExtensionUtils;
|
||||
|
||||
// WeakMap[Extension -> Map[id -> Notification]]
|
||||
// WeakMap[Extension -> Set[Notification]]
|
||||
var notificationsMap = new WeakMap();
|
||||
|
||||
// WeakMap[Extension -> Set[callback]]
|
||||
@ -47,7 +47,7 @@ Notification.prototype = {
|
||||
} catch (e) {
|
||||
// This will fail if the OS doesn't support this function.
|
||||
}
|
||||
notificationsMap.get(this.extension).delete(this.id);
|
||||
notificationsMap.get(this.extension).delete(this);
|
||||
},
|
||||
|
||||
observe(subject, topic, data) {
|
||||
@ -59,18 +59,18 @@ Notification.prototype = {
|
||||
callback(this);
|
||||
}
|
||||
|
||||
notificationsMap.get(this.extension).delete(this.id);
|
||||
notificationsMap.get(this.extension).delete(this);
|
||||
},
|
||||
};
|
||||
|
||||
/* eslint-disable mozilla/balanced-listeners */
|
||||
extensions.on("startup", (type, extension) => {
|
||||
notificationsMap.set(extension, new Map());
|
||||
notificationsMap.set(extension, new Set());
|
||||
notificationCallbacksMap.set(extension, new Set());
|
||||
});
|
||||
|
||||
extensions.on("shutdown", (type, extension) => {
|
||||
for (let notification of notificationsMap.get(extension).values()) {
|
||||
for (let notification of notificationsMap.get(extension)) {
|
||||
notification.clear();
|
||||
}
|
||||
notificationsMap.delete(extension);
|
||||
@ -80,39 +80,47 @@ extensions.on("shutdown", (type, extension) => {
|
||||
|
||||
var nextId = 0;
|
||||
|
||||
extensions.registerSchemaAPI("notifications", "notifications", (extension, context) => {
|
||||
extensions.registerPrivilegedAPI("notifications", (extension, context) => {
|
||||
return {
|
||||
notifications: {
|
||||
create: function(notificationId, options) {
|
||||
if (!notificationId) {
|
||||
notificationId = String(nextId++);
|
||||
create: function(...args) {
|
||||
let notificationId, options, callback;
|
||||
if (args.length == 1) {
|
||||
options = args[0];
|
||||
} else {
|
||||
[notificationId, options, callback] = args;
|
||||
}
|
||||
|
||||
let notifications = notificationsMap.get(extension);
|
||||
if (notifications.has(notificationId)) {
|
||||
notifications.get(notificationId).clear();
|
||||
if (!notificationId) {
|
||||
notificationId = nextId++;
|
||||
}
|
||||
|
||||
// FIXME: Lots of options still aren't supported, especially
|
||||
// buttons.
|
||||
let notification = new Notification(extension, notificationId, options);
|
||||
notificationsMap.get(extension).set(notificationId, notification);
|
||||
notificationsMap.get(extension).add(notification);
|
||||
|
||||
return Promise.resolve(notificationId);
|
||||
return context.wrapPromise(Promise.resolve(notificationId), callback);
|
||||
},
|
||||
|
||||
clear: function(notificationId) {
|
||||
clear: function(notificationId, callback) {
|
||||
let notifications = notificationsMap.get(extension);
|
||||
if (notifications.has(notificationId)) {
|
||||
notifications.get(notificationId).clear();
|
||||
return Promise.resolve(true);
|
||||
let cleared = false;
|
||||
for (let notification of notifications) {
|
||||
if (notification.id == notificationId) {
|
||||
notification.clear();
|
||||
cleared = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return Promise.resolve(false);
|
||||
|
||||
return context.wrapPromise(Promise.resolve(cleared), callback);
|
||||
},
|
||||
|
||||
getAll: function() {
|
||||
let result = Array.from(notificationsMap.get(extension).keys());
|
||||
return Promise.resolve(result);
|
||||
getAll: function(callback) {
|
||||
let notifications = notificationsMap.get(extension);
|
||||
notifications = Array.from(notifications, notification => notification.id);
|
||||
return context.wrapPromise(Promise.resolve(notifications), callback);
|
||||
},
|
||||
|
||||
onClosed: new EventManager(context, "notifications.onClosed", fire => {
|
||||
|
||||
@ -12,7 +12,6 @@ toolkit.jar:
|
||||
content/extensions/schemas/i18n.json
|
||||
content/extensions/schemas/idle.json
|
||||
content/extensions/schemas/manifest.json
|
||||
content/extensions/schemas/notifications.json
|
||||
content/extensions/schemas/runtime.json
|
||||
content/extensions/schemas/storage.json
|
||||
content/extensions/schemas/test.json
|
||||
|
||||
@ -1,380 +0,0 @@
|
||||
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style license that can be
|
||||
// found in the LICENSE file.
|
||||
|
||||
[
|
||||
{
|
||||
"namespace": "notifications",
|
||||
"types": [
|
||||
{
|
||||
"id": "TemplateType",
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"basic",
|
||||
"image",
|
||||
"list",
|
||||
"progress"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "PermissionLevel",
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"granted",
|
||||
"denied"
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "NotificationItem",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"title": {
|
||||
"description": "Title of one item of a list notification.",
|
||||
"type": "string"
|
||||
},
|
||||
"message": {
|
||||
"description": "Additional details about this item.",
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "CreateNotificationOptions",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"type": {
|
||||
"description": "Which type of notification to display.",
|
||||
"$ref": "TemplateType"
|
||||
},
|
||||
"iconUrl": {
|
||||
"description": "A URL to the sender's avatar, app icon, or a thumbnail for image notifications.",
|
||||
"type": "string"
|
||||
},
|
||||
"appIconMaskUrl": {
|
||||
"optional": true,
|
||||
"description": "A URL to the app icon mask.",
|
||||
"type": "string"
|
||||
},
|
||||
"title": {
|
||||
"description": "Title of the notification (e.g. sender name for email).",
|
||||
"type": "string"
|
||||
},
|
||||
"message": {
|
||||
"description": "Main notification content.",
|
||||
"type": "string"
|
||||
},
|
||||
"contextMessage": {
|
||||
"optional": true,
|
||||
"description": "Alternate notification content with a lower-weight font.",
|
||||
"type": "string"
|
||||
},
|
||||
"priority": {
|
||||
"optional": true,
|
||||
"description": "Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default.",
|
||||
"type": "integer",
|
||||
"minimum": -2,
|
||||
"maximum": 2
|
||||
},
|
||||
"eventTime": {
|
||||
"optional": true,
|
||||
"description": "A timestamp associated with the notification, in milliseconds past the epoch.",
|
||||
"type": "number"
|
||||
},
|
||||
"imageUrl": {
|
||||
"optional": true,
|
||||
"description": "A URL to the image thumbnail for image-type notifications.",
|
||||
"type": "string"
|
||||
},
|
||||
"items": {
|
||||
"optional": true,
|
||||
"description": "Items for multi-item notifications.",
|
||||
"type": "array",
|
||||
"items": { "$ref": "NotificationItem" }
|
||||
},
|
||||
"progress": {
|
||||
"optional": true,
|
||||
"description": "Current progress ranges from 0 to 100.",
|
||||
"type": "integer",
|
||||
"minimum": 0,
|
||||
"maximum": 100
|
||||
},
|
||||
"isClickable": {
|
||||
"optional": true,
|
||||
"description": "Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.",
|
||||
"type": "boolean"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "UpdateNotificationOptions",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"type": {
|
||||
"optional": true,
|
||||
"description": "Which type of notification to display.",
|
||||
"$ref": "TemplateType"
|
||||
},
|
||||
"iconUrl": {
|
||||
"optional": true,
|
||||
"description": "A URL to the sender's avatar, app icon, or a thumbnail for image notifications.",
|
||||
"type": "string"
|
||||
},
|
||||
"appIconMaskUrl": {
|
||||
"optional": true,
|
||||
"description": "A URL to the app icon mask.",
|
||||
"type": "string"
|
||||
},
|
||||
"title": {
|
||||
"optional": true,
|
||||
"description": "Title of the notification (e.g. sender name for email).",
|
||||
"type": "string"
|
||||
},
|
||||
"message": {
|
||||
"optional": true,
|
||||
"description": "Main notification content.",
|
||||
"type": "string"
|
||||
},
|
||||
"contextMessage": {
|
||||
"optional": true,
|
||||
"description": "Alternate notification content with a lower-weight font.",
|
||||
"type": "string"
|
||||
},
|
||||
"priority": {
|
||||
"optional": true,
|
||||
"description": "Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default.",
|
||||
"type": "integer",
|
||||
"minimum": -2,
|
||||
"maximum": 2
|
||||
},
|
||||
"eventTime": {
|
||||
"optional": true,
|
||||
"description": "A timestamp associated with the notification, in milliseconds past the epoch.",
|
||||
"type": "number"
|
||||
},
|
||||
"imageUrl": {
|
||||
"optional": true,
|
||||
"description": "A URL to the image thumbnail for image-type notifications.",
|
||||
"type": "string"
|
||||
},
|
||||
"items": {
|
||||
"optional": true,
|
||||
"description": "Items for multi-item notifications.",
|
||||
"type": "array",
|
||||
"items": { "$ref": "NotificationItem" }
|
||||
},
|
||||
"progress": {
|
||||
"optional": true,
|
||||
"description": "Current progress ranges from 0 to 100.",
|
||||
"type": "integer",
|
||||
"minimum": 0,
|
||||
"maximum": 100
|
||||
},
|
||||
"isClickable": {
|
||||
"optional": true,
|
||||
"description": "Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.",
|
||||
"type": "boolean"
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"functions": [
|
||||
{
|
||||
"name": "create",
|
||||
"type": "function",
|
||||
"description": "Creates and displays a notification.",
|
||||
"async": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"type": "string",
|
||||
"name": "notificationId",
|
||||
"description": "Identifier of the notification. If it is empty, this method generates an id. If it matches an existing notification, this method first clears that notification before proceeding with the create operation."
|
||||
},
|
||||
{
|
||||
"$ref": "CreateNotificationOptions",
|
||||
"name": "options",
|
||||
"description": "Contents of the notification."
|
||||
},
|
||||
{
|
||||
"optional": true,
|
||||
"type": "function",
|
||||
"name": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "notificationId",
|
||||
"type": "string",
|
||||
"description": "The notification id (either supplied or generated) that represents the created notification."
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "update",
|
||||
"unsupported": true,
|
||||
"type": "function",
|
||||
"description": "Updates an existing notification.",
|
||||
"async": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"type": "string",
|
||||
"name": "notificationId",
|
||||
"description": "The id of the notification to be updated."
|
||||
},
|
||||
{
|
||||
"$ref": "UpdateNotificationOptions",
|
||||
"name": "options",
|
||||
"description": "Contents of the notification to update to."
|
||||
},
|
||||
{
|
||||
"optional": true,
|
||||
"type": "function",
|
||||
"name": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "wasUpdated",
|
||||
"type": "boolean",
|
||||
"description": "Indicates whether a matching notification existed."
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "clear",
|
||||
"type": "function",
|
||||
"description": "Clears an existing notification.",
|
||||
"async": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"type": "string",
|
||||
"name": "notificationId",
|
||||
"description": "The id of the notification to be updated."
|
||||
},
|
||||
{
|
||||
"optional": true,
|
||||
"type": "function",
|
||||
"name": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "wasCleared",
|
||||
"type": "boolean",
|
||||
"description": "Indicates whether a matching notification existed."
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "getAll",
|
||||
"type": "function",
|
||||
"description": "Retrieves all the notifications.",
|
||||
"async": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"type": "function",
|
||||
"name": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "notifications",
|
||||
"type": "array",
|
||||
"description": "The set of notification_ids currently in the system.",
|
||||
"items": {
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "getPermissionLevel",
|
||||
"unsupported": true,
|
||||
"type": "function",
|
||||
"description": "Retrieves whether the user has enabled notifications from this app or extension.",
|
||||
"async": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"type": "function",
|
||||
"name": "callback",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "level",
|
||||
"$ref": "PermissionLevel",
|
||||
"description": "The current permission level."
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"events": [
|
||||
{
|
||||
"name": "onClosed",
|
||||
"type": "function",
|
||||
"description": "Fired when the notification closed, either by the system or by user action.",
|
||||
"parameters": [
|
||||
{
|
||||
"type": "string",
|
||||
"name": "notificationId",
|
||||
"description": "The notificationId of the closed notification."
|
||||
},
|
||||
{
|
||||
"type": "boolean",
|
||||
"name": "byUser",
|
||||
"description": "True if the notification was closed by the user."
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "onClicked",
|
||||
"type": "function",
|
||||
"description": "Fired when the user clicked in a non-button area of the notification.",
|
||||
"parameters": [
|
||||
{
|
||||
"type": "string",
|
||||
"name": "notificationId",
|
||||
"description": "The notificationId of the clicked notification."
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "onButtonClicked",
|
||||
"type": "function",
|
||||
"description": "Fired when the user pressed a button in the notification.",
|
||||
"parameters": [
|
||||
{
|
||||
"type": "string",
|
||||
"name": "notificationId",
|
||||
"description": "The notificationId of the clicked notification."
|
||||
},
|
||||
{
|
||||
"type": "number",
|
||||
"name": "buttonIndex",
|
||||
"description": "The index of the button clicked by the user."
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "onPermissionLevelChanged",
|
||||
"unsupported": true,
|
||||
"type": "function",
|
||||
"description": "Fired when the user changes the permission level.",
|
||||
"parameters": [
|
||||
{
|
||||
"$ref": "PermissionLevel",
|
||||
"name": "level",
|
||||
"description": "The new permission level."
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "onShowSettings",
|
||||
"unsupported": true,
|
||||
"type": "function",
|
||||
"description": "Fired when the user clicked on a link for the app's notification settings.",
|
||||
"parameters": [
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -16,17 +16,12 @@ add_task(function* test_notifications() {
|
||||
function backgroundScript() {
|
||||
browser.test.log("running background script");
|
||||
|
||||
let opts = {
|
||||
type: "basic",
|
||||
iconUrl: browser.runtime.getURL("data/a.png"),
|
||||
title: "Testing Notification",
|
||||
message: "Carry on",
|
||||
};
|
||||
let opts = {title: "Testing Notification", message: "Carry on"};
|
||||
|
||||
// Test an unimplemented listener.
|
||||
browser.notifications.onClicked.addListener(function() {});
|
||||
|
||||
browser.notifications.create("5", opts).then(id => {
|
||||
browser.notifications.create("5", opts, function(id) {
|
||||
browser.test.sendMessage("running", id);
|
||||
browser.test.notifyPass("background test passed");
|
||||
});
|
||||
@ -55,7 +50,7 @@ add_task(function* test_notifications_empty_getAll() {
|
||||
function backgroundScript() {
|
||||
browser.test.log("running background script");
|
||||
|
||||
browser.notifications.getAll().then(notifications => {
|
||||
browser.notifications.getAll(notifications => {
|
||||
browser.test.assertTrue(Array.isArray(notifications),
|
||||
"getAll() returned an array");
|
||||
browser.test.assertEq(notifications.length, 0, "the array was empty");
|
||||
@ -84,27 +79,21 @@ add_task(function* test_notifications_populated_getAll() {
|
||||
function backgroundScript() {
|
||||
browser.test.log("running background script");
|
||||
|
||||
let opts = {
|
||||
type: "basic",
|
||||
iconUrl: browser.runtime.getURL("data/a.png"),
|
||||
title: "Testing Notification",
|
||||
message: "Carry on",
|
||||
};
|
||||
|
||||
browser.notifications.create("p1", opts).then(() => {
|
||||
return browser.notifications.create("p2", opts);
|
||||
}).then(() => {
|
||||
return browser.notifications.getAll();
|
||||
}).then(notifications => {
|
||||
browser.test.assertTrue(Array.isArray(notifications),
|
||||
"getAll() returned an array");
|
||||
browser.test.assertEq(notifications.length, 2,
|
||||
"the array contained two notification ids");
|
||||
browser.test.assertTrue(notifications.includes("p1"),
|
||||
"the array contains the first notification");
|
||||
browser.test.assertTrue(notifications.includes("p2"),
|
||||
"the array contains the second notification");
|
||||
browser.test.notifyPass("getAll populated");
|
||||
let opts = {title: "Testing Notification", message: "Carry on"};
|
||||
browser.notifications.create("p1", opts, () => {
|
||||
browser.notifications.create("p2", opts, () => {
|
||||
browser.notifications.getAll(notifications => {
|
||||
browser.test.assertTrue(Array.isArray(notifications),
|
||||
"getAll() returned an array");
|
||||
browser.test.assertEq(notifications.length, 2,
|
||||
"the array contained two notification ids");
|
||||
browser.test.assertTrue(notifications.includes("p1"),
|
||||
"the array contains the first notification");
|
||||
browser.test.assertTrue(notifications.includes("p2"),
|
||||
"the array contains the second notification");
|
||||
browser.test.notifyPass("getAll populated");
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user