From c74e21f18764e35fe8915b3644ff2a0c7fd37c0f Mon Sep 17 00:00:00 2001 From: adeshkp Date: Sat, 9 Nov 2019 21:43:24 +0530 Subject: Issue #1259 - Part 2. Remove Adobe Primetime localization strings --- toolkit/mozapps/extensions/internal/GMPProvider.jsm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'toolkit/mozapps/extensions') diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm index 131db7249..39d8f2d98 100644 --- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm +++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm @@ -49,17 +49,6 @@ const GMP_PLUGINS = [ homepageURL: "http://www.openh264.org/", optionsURL: "chrome://mozapps/content/extensions/gmpPrefs.xul" }, -/* - { - id: EME_ADOBE_ID, - name: "eme-adobe_name", - description: "eme-adobe_description", - licenseURL: "http://help.adobe.com/en_US/primetime/drm/HTML5_CDM_EULA/index.html", - homepageURL: "http://help.adobe.com/en_US/primetime/drm/HTML5_CDM", - optionsURL: "chrome://mozapps/content/extensions/gmpPrefs.xul", - isEME: true - }, -*/ { id: WIDEVINE_ID, name: "widevine_description", -- cgit v1.2.3 From 0aa805d1f556126e151d8aca276491d85847644e Mon Sep 17 00:00:00 2001 From: adeshkp Date: Sat, 9 Nov 2019 22:46:29 +0530 Subject: Issue #1259 - Part 3. Remove Adobe EME as a GMP source --- toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm | 3 --- 1 file changed, 3 deletions(-) (limited to 'toolkit/mozapps/extensions') diff --git a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm b/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm index f98dd2a94..c6324da0a 100644 --- a/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm +++ b/toolkit/mozapps/extensions/internal/ProductAddonChecker.jsm @@ -7,9 +7,6 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components; const LOCAL_EME_SOURCES = [{ - "id": "gmp-eme-adobe", - "src": "chrome://global/content/gmp-sources/eme-adobe.json" -}, { "id": "gmp-gmpopenh264", "src": "chrome://global/content/gmp-sources/openh264.json" }, { -- cgit v1.2.3 From a6441a2a844a9e2c427dab3f94e39f2625bfd2d0 Mon Sep 17 00:00:00 2001 From: adeshkp Date: Sat, 9 Nov 2019 23:00:09 +0530 Subject: Issue #1259 - Part 4. Remove Adobe EME from GMPUtils --- toolkit/mozapps/extensions/GMPUtils.jsm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'toolkit/mozapps/extensions') diff --git a/toolkit/mozapps/extensions/GMPUtils.jsm b/toolkit/mozapps/extensions/GMPUtils.jsm index a199b4d86..814ae4914 100644 --- a/toolkit/mozapps/extensions/GMPUtils.jsm +++ b/toolkit/mozapps/extensions/GMPUtils.jsm @@ -7,8 +7,7 @@ const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu, manager: Cm} = Components; -this.EXPORTED_SYMBOLS = [ "EME_ADOBE_ID", - "GMP_PLUGIN_IDS", +this.EXPORTED_SYMBOLS = [ "GMP_PLUGIN_IDS", "GMPPrefs", "GMPUtils", "OPEN_H264_ID", @@ -20,9 +19,8 @@ Cu.import("resource://gre/modules/AppConstants.jsm"); // GMP IDs const OPEN_H264_ID = "gmp-gmpopenh264"; -const EME_ADOBE_ID = "gmp-eme-adobe"; const WIDEVINE_ID = "gmp-widevinecdm"; -const GMP_PLUGIN_IDS = [ OPEN_H264_ID, EME_ADOBE_ID, WIDEVINE_ID ]; +const GMP_PLUGIN_IDS = [ OPEN_H264_ID, WIDEVINE_ID ]; var GMPPluginUnsupportedReason = { NOT_WINDOWS: 1, @@ -72,10 +70,7 @@ this.GMPUtils = { if (this._isPluginForceSupported(aPlugin)) { return true; } - if (aPlugin.id == EME_ADOBE_ID) { - // Windows Vista and later only supported by Adobe EME. - return AppConstants.isPlatformAndVersionAtLeast("win", "6"); - } else if (aPlugin.id == WIDEVINE_ID) { + if (aPlugin.id == WIDEVINE_ID) { // The Widevine plugin is available for Windows versions Vista and later, // Mac OSX, and Linux. return AppConstants.isPlatformAndVersionAtLeast("win", "6") || -- cgit v1.2.3 From d034857122f608f654b10a6ca204d35adddcde08 Mon Sep 17 00:00:00 2001 From: JustOff Date: Sat, 16 Nov 2019 16:01:44 +0200 Subject: Issue #1259 - Adjust Widewine strings after removing Adobe Primetime support --- toolkit/mozapps/extensions/internal/GMPProvider.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolkit/mozapps/extensions') diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm index 39d8f2d98..2ebde08bb 100644 --- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm +++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm @@ -51,9 +51,9 @@ const GMP_PLUGINS = [ }, { id: WIDEVINE_ID, - name: "widevine_description", + name: "widevine_name", // Describe the purpose of both CDMs in the same way. - description: "eme-adobe_description", + description: "widevine_description2", licenseURL: "https://www.google.com/policies/privacy/", homepageURL: "https://www.widevine.com/", optionsURL: "chrome://mozapps/content/extensions/gmpPrefs.xul", -- cgit v1.2.3 From f703f61eab881eb97a2c835b3803959f53d15d97 Mon Sep 17 00:00:00 2001 From: JustOff Date: Fri, 22 Nov 2019 14:05:53 +0200 Subject: Issue #1300 - Clear the message manager script cache when updating and removing add-ons --- .../mozapps/extensions/internal/XPIProvider.jsm | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'toolkit/mozapps/extensions') diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 99a121da4..600ec2ff5 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -220,6 +220,7 @@ const COMPATIBLE_BY_DEFAULT_TYPES = { }; const MSG_JAR_FLUSH = "AddonJarFlush"; +const MSG_MESSAGE_MANAGER_CACHES_FLUSH = "AddonMessageManagerCachesFlush"; var gGlobalScope = this; @@ -1199,13 +1200,16 @@ function buildJarURI(aJarfile, aPath) { */ function flushJarCache(aJarFile) { Services.obs.notifyObservers(aJarFile, "flush-cache-entry", null); - Cc["@mozilla.org/globalmessagemanager;1"].getService(Ci.nsIMessageBroadcaster) - .broadcastAsyncMessage(MSG_JAR_FLUSH, aJarFile.path); + Services.mm.broadcastAsyncMessage(MSG_JAR_FLUSH, aJarFile.path); } -function flushStartupCache() { +function flushChromeCaches() { // Init this, so it will get the notification. Services.obs.notifyObservers(null, "startupcache-invalidate", null); + // Flush message manager cached scripts + Services.obs.notifyObservers(null, "message-manager-flush-caches", null); + // Also dispatch this event to child processes + Services.mm.broadcastAsyncMessage(MSG_MESSAGE_MANAGER_CACHES_FLUSH, null); } /** @@ -2129,7 +2133,7 @@ this.XPIProvider = { } if (flushCaches) { - flushStartupCache(); + Services.obs.notifyObservers(null, "startupcache-invalidate", null); // UI displayed early in startup (like the compatibility UI) may have // caused us to cache parts of the skin or locale in memory. These must // be flushed to allow extension provided skins and locales to take full @@ -2665,7 +2669,7 @@ this.XPIProvider = { existingAddon, "uninstall", uninstallReason, { newVersion: newVersion }); this.unloadBootstrapScope(existingAddonID); - flushStartupCache(); + flushChromeCaches(); } } catch (e) { @@ -2939,7 +2943,7 @@ this.XPIProvider = { // If the new add-on is bootstrapped and active then call its install method if (newDBAddon.active && newDBAddon.bootstrap) { // Startup cache must be flushed before calling the bootstrap script - flushStartupCache(); + flushChromeCaches(); let installReason = Services.vc.compare(aOldAddon.version, newDBAddon.version) < 0 ? BOOTSTRAP_REASONS.ADDON_UPGRADE : @@ -3344,7 +3348,7 @@ this.XPIProvider = { // If the new add-on is bootstrapped then we must flush the caches // before calling the new bootstrap script if (newDBAddon.bootstrap) - flushStartupCache(); + flushChromeCaches(); } if (!newDBAddon.bootstrap) @@ -4746,7 +4750,7 @@ this.XPIProvider = { this.callBootstrapMethod(aAddon, file, "uninstall", BOOTSTRAP_REASONS.ADDON_UNINSTALL); this.unloadBootstrapScope(aAddon.id); - flushStartupCache(); + flushChromeCaches(); } aAddon._installLocation.uninstallAddon(aAddon.id); XPIDatabase.removeAddonMetadata(aAddon); @@ -5876,7 +5880,7 @@ AddonInstall.prototype = { "uninstall", reason, { newVersion: this.addon.version }); XPIProvider.unloadBootstrapScope(this.existingAddon.id); - flushStartupCache(); + flushChromeCaches(); } if (!isUpgrade && this.existingAddon.active) { -- cgit v1.2.3