summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-11 04:56:28 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-11 04:56:28 -0500
commita900dcd7f5796eb28923d5fa787a6f76a358df69 (patch)
tree2270239484354b7d42b7780345a25571d0efde23 /toolkit
parent93028809651c1290d871ec74af62ba86e0156161 (diff)
downloadUXP-a900dcd7f5796eb28923d5fa787a6f76a358df69.tar
UXP-a900dcd7f5796eb28923d5fa787a6f76a358df69.tar.gz
UXP-a900dcd7f5796eb28923d5fa787a6f76a358df69.tar.lz
UXP-a900dcd7f5796eb28923d5fa787a6f76a358df69.tar.xz
UXP-a900dcd7f5796eb28923d5fa787a6f76a358df69.zip
Just about almost totally fix GMP
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/mozapps/extensions/internal/GMPProvider.jsm16
-rw-r--r--toolkit/mozapps/extensions/internal/moz.build1
2 files changed, 13 insertions, 4 deletions
diff --git a/toolkit/mozapps/extensions/internal/GMPProvider.jsm b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
index 1c9468992..a55457f6e 100644
--- a/toolkit/mozapps/extensions/internal/GMPProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/GMPProvider.jsm
@@ -41,7 +41,7 @@ const GMP_PLUGINS = [
{
id: OPEN_H264_ID,
name: "openH264_name",
- description: "openH264_description",
+ description: "openH264_description2",
// The following licenseURL is part of an awful hack to include the OpenH264
// license without having bug 624602 fixed yet, and intentionally ignores
// localisation.
@@ -62,7 +62,7 @@ const GMP_PLUGINS = [
XPCOMUtils.defineLazyGetter(this, "pluginsBundle",
() => Services.strings.createBundle("chrome://global/locale/plugins.properties"));
XPCOMUtils.defineLazyGetter(this, "gmpService",
- () => Cc["@mozilla.org/goanna-media-plugin-service;1"].getService(Ci.mozIGoannaMediaPluginService));
+ () => Cc["@mozilla.org/gecko-media-plugin-service;1"].getService(Ci.mozIGeckoMediaPluginChromeService));
let messageManager = Cc["@mozilla.org/globalmessagemanager;1"]
.getService(Ci.nsIMessageListenerManager);
@@ -549,8 +549,16 @@ let GMPProvider = {
return;
}
- let results = [p.wrapper for ([id, p] of this._plugins)
- if (!GMPUtils.isPluginHidden(p))];
+ // Tycho:
+ // let results = [p.wrapper for ([id, p] of this._plugins)
+ // if (!GMPUtils.isPluginHidden(p))];
+ let results = [];
+ for (let [id, p] of this._plugins) {
+ if (!GMPUtils.isPluginHidden(p)) {
+ results.push(p.wrapper);
+ }
+ }
+
aCallback(results);
},
diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build
index 96ee985d7..efcd2af21 100644
--- a/toolkit/mozapps/extensions/internal/moz.build
+++ b/toolkit/mozapps/extensions/internal/moz.build
@@ -5,6 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXTRA_JS_MODULES.addons += [
+ '../../webextensions/internal/ProductAddonChecker.jsm',
'AddonLogging.jsm',
'AddonRepository_SQLiteMigrator.jsm',
'Content.js',