summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-06-26 14:17:23 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-06-26 14:17:23 -0400
commit2ec54f1e95870e95e278b66b621b30a584041d72 (patch)
treea4d99b1cc0ae2837007ec603f380e7f5af89589a /toolkit
parentcb31466907013e0c296b0550df8c7a8a23bf094b (diff)
downloadUXP-2ec54f1e95870e95e278b66b621b30a584041d72.tar
UXP-2ec54f1e95870e95e278b66b621b30a584041d72.tar.gz
UXP-2ec54f1e95870e95e278b66b621b30a584041d72.tar.lz
UXP-2ec54f1e95870e95e278b66b621b30a584041d72.tar.xz
UXP-2ec54f1e95870e95e278b66b621b30a584041d72.zip
[AllAM] De-duplicate Content.js
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/mozapps/extensions/internal/Content.js13
-rw-r--r--toolkit/mozapps/webextensions/internal/Content.js38
-rw-r--r--toolkit/mozapps/webextensions/internal/moz.build2
3 files changed, 11 insertions, 42 deletions
diff --git a/toolkit/mozapps/extensions/internal/Content.js b/toolkit/mozapps/extensions/internal/Content.js
index 9ab3b9ad6..9f366ba32 100644
--- a/toolkit/mozapps/extensions/internal/Content.js
+++ b/toolkit/mozapps/extensions/internal/Content.js
@@ -2,6 +2,8 @@
* 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/. */
+/* globals addMessageListener*/
+
"use strict";
(function() {
@@ -14,17 +16,22 @@ var nsIFile = Components.Constructor("@mozilla.org/file/local;1", "nsIFile",
"initWithPath");
const MSG_JAR_FLUSH = "AddonJarFlush";
+const MSG_MESSAGE_MANAGER_CACHES_FLUSH = "AddonMessageManagerCachesFlush";
try {
if (Services.appinfo.processType !== Services.appinfo.PROCESS_TYPE_DEFAULT) {
- // Propagate JAR cache flush notifications across process boundaries.
- addMessageListener(MSG_JAR_FLUSH, function jar_flushMessageListener(message) {
+ // Propagate JAR cache flush notifications across process boundaries.
+ addMessageListener(MSG_JAR_FLUSH, function(message) {
let file = new nsIFile(message.data);
Services.obs.notifyObservers(file, "flush-cache-entry", null);
});
+ // Propagate message manager caches flush notifications across processes.
+ addMessageListener(MSG_MESSAGE_MANAGER_CACHES_FLUSH, function() {
+ Services.obs.notifyObservers(null, "message-manager-flush-caches", null);
+ });
}
-} catch(e) {
+} catch (e) {
Cu.reportError(e);
}
diff --git a/toolkit/mozapps/webextensions/internal/Content.js b/toolkit/mozapps/webextensions/internal/Content.js
deleted file mode 100644
index 9f366ba32..000000000
--- a/toolkit/mozapps/webextensions/internal/Content.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 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/. */
-
-/* globals addMessageListener*/
-
-"use strict";
-
-(function() {
-
-var {classes: Cc, interfaces: Ci, utils: Cu} = Components;
-
-var {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
-
-var nsIFile = Components.Constructor("@mozilla.org/file/local;1", "nsIFile",
- "initWithPath");
-
-const MSG_JAR_FLUSH = "AddonJarFlush";
-const MSG_MESSAGE_MANAGER_CACHES_FLUSH = "AddonMessageManagerCachesFlush";
-
-
-try {
- if (Services.appinfo.processType !== Services.appinfo.PROCESS_TYPE_DEFAULT) {
- // Propagate JAR cache flush notifications across process boundaries.
- addMessageListener(MSG_JAR_FLUSH, function(message) {
- let file = new nsIFile(message.data);
- Services.obs.notifyObservers(file, "flush-cache-entry", null);
- });
- // Propagate message manager caches flush notifications across processes.
- addMessageListener(MSG_MESSAGE_MANAGER_CACHES_FLUSH, function() {
- Services.obs.notifyObservers(null, "message-manager-flush-caches", null);
- });
- }
-} catch (e) {
- Cu.reportError(e);
-}
-
-})();
diff --git a/toolkit/mozapps/webextensions/internal/moz.build b/toolkit/mozapps/webextensions/internal/moz.build
index 4e0b2b354..ef193ed8f 100644
--- a/toolkit/mozapps/webextensions/internal/moz.build
+++ b/toolkit/mozapps/webextensions/internal/moz.build
@@ -6,12 +6,12 @@
EXTRA_JS_MODULES.addons += [
'../../extensions/internal/AddonLogging.jsm',
+ '../../extensions/internal/Content.js',
'../../extensions/internal/ProductAddonChecker.jsm',
'../../extensions/internal/SpellCheckDictionaryBootstrap.js',
'AddonRepository.jsm',
'AddonRepository_SQLiteMigrator.jsm',
'APIExtensionBootstrap.js',
- 'Content.js',
'E10SAddonsRollout.jsm',
'GMPProvider.jsm',
'LightweightThemeImageOptimizer.jsm',