wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 23:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Just about almost totally fix GMP

Browse source
This commit is contained in:
NTD 2018-02-11 04:56:28 -05:00 • committed by Roy Tam
commit 0e6e573e4e
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
toolkit/mozapps/extensions/internal/GMPProvider.jsm
View file

@ -41,7 +41,7 @@ const GMP_PLUGINS = [
{ {
id: OPEN_H264_ID, id: OPEN_H264_ID,
name: "openH264_name", name: "openH264_name",
description: "openH264_description", description: "openH264_description2",
// The following licenseURL is part of an awful hack to include the OpenH264 // The following licenseURL is part of an awful hack to include the OpenH264
// license without having bug 624602 fixed yet, and intentionally ignores // license without having bug 624602 fixed yet, and intentionally ignores
// localisation. // localisation.
@ -62,7 +62,7 @@ const GMP_PLUGINS = [
XPCOMUtils.defineLazyGetter(this, "pluginsBundle", XPCOMUtils.defineLazyGetter(this, "pluginsBundle",
() => Services.strings.createBundle("chrome://global/locale/plugins.properties")); () => Services.strings.createBundle("chrome://global/locale/plugins.properties"));
XPCOMUtils.defineLazyGetter(this, "gmpService", 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"] let messageManager = Cc["@mozilla.org/globalmessagemanager;1"]
.getService(Ci.nsIMessageListenerManager); .getService(Ci.nsIMessageListenerManager);
@ -549,8 +549,16 @@ let GMPProvider = {
return; return;
} }
let results = [p.wrapper for ([id, p] of this._plugins) // Tycho:
if (!GMPUtils.isPluginHidden(p))]; // 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); aCallback(results);
}, },

1
toolkit/mozapps/extensions/internal/moz.build
View file

@ -5,6 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
EXTRA_JS_MODULES.addons += [ EXTRA_JS_MODULES.addons += [
'../../webextensions/internal/ProductAddonChecker.jsm',
'AddonLogging.jsm', 'AddonLogging.jsm',
'AddonRepository_SQLiteMigrator.jsm', 'AddonRepository_SQLiteMigrator.jsm',
'Content.js', 'Content.js',