cdd8043b2d
---
dom/ipc/manifestMessages.js | 166 +++++++++-----------
...ObjectProcessor.js => ImageObjectProcessor.jsm} | 0
dom/manifest/ManifestFinder.jsm | 58 +++++++
dom/manifest/ManifestObtainer.js | 92 -----------
dom/manifest/ManifestObtainer.jsm | 170 +++++++++++++++++++++
...{ManifestProcessor.js => ManifestProcessor.jsm} | 18 +--
.../{ValueExtractor.js => ValueExtractor.jsm} | 4 +-
dom/manifest/WebManifest.jsm | 19 ---
dom/manifest/moz.build | 10 +-
dom/manifest/test/browser.ini | 3 +-
.../test/browser_ManifestObtainer_obtain.js | 2 +-
dom/manifest/test/browser_hasManifestLink.js | 109 +++++++++++++
dom/manifest/test/common.js | 4 +-
dom/security/test/csp/browser_test_web_manifest.js | 12 +-
.../csp/browser_test_web_manifest_mixed_content.js | 10 +-
toolkit/modules/PromiseMessage.jsm | 36 +++++
toolkit/modules/moz.build | 1 +
17 files changed, 467 insertions(+), 247 deletions(-)
rename dom/manifest/{ImageObjectProcessor.js => ImageObjectProcessor.jsm} (100%)
create mode 100644 dom/manifest/ManifestFinder.jsm
delete mode 100644 dom/manifest/ManifestObtainer.js
create mode 100644 dom/manifest/ManifestObtainer.jsm
rename dom/manifest/{ManifestProcessor.js => ManifestProcessor.jsm} (95%)
rename dom/manifest/{ValueExtractor.js => ValueExtractor.jsm} (96%)
delete mode 100644 dom/manifest/WebManifest.jsm
create mode 100644 dom/manifest/test/browser_hasManifestLink.js
create mode 100644 toolkit/modules/PromiseMessage.jsm
37 lines
1014 B
JavaScript
37 lines
1014 B
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
'use strict';
|
|
|
|
this.EXPORTED_SYMBOLS = ['PromiseMessage'];
|
|
|
|
let msgId = 0;
|
|
|
|
let PromiseMessage = {
|
|
send(messageManager, name, data = {}) {
|
|
let id = msgId++;
|
|
|
|
// Make a copy of data so that the caller doesn't see us setting 'id'.
|
|
let dataCopy = {};
|
|
for (let prop in data) {
|
|
dataCopy[prop] = data[prop];
|
|
}
|
|
dataCopy.id = id;
|
|
|
|
// Send the message.
|
|
messageManager.sendAsyncMessage(name, dataCopy);
|
|
|
|
// Return a promise that resolves when we get a reply (a message of the same name).
|
|
return new Promise(resolve => {
|
|
messageManager.addMessageListener(name, function listener(reply) {
|
|
if (reply.data.id !== id) {
|
|
return;
|
|
}
|
|
messageManager.removeMessageListener(name, listener);
|
|
resolve(reply);
|
|
});
|
|
});
|
|
}
|
|
};
|