|
 |
481763 |
diff -up firefox-81.0/toolkit/modules/GMPInstallManager.jsm.old firefox-81.0/toolkit/modules/GMPInstallManager.jsm
|
|
|
481763 |
--- firefox-81.0/toolkit/modules/GMPInstallManager.jsm.old 2020-09-25 10:39:04.769458703 +0200
|
|
|
481763 |
+++ firefox-81.0/toolkit/modules/GMPInstallManager.jsm 2020-09-25 10:39:22.038504747 +0200
|
|
|
481763 |
@@ -54,10 +54,6 @@ function getScopedLogger(prefix) {
|
|
|
481763 |
|
|
|
481763 |
const LOCAL_GMP_SOURCES = [
|
|
|
481763 |
{
|
|
|
481763 |
- id: "gmp-gmpopenh264",
|
|
|
481763 |
- src: "chrome://global/content/gmp-sources/openh264.json",
|
|
|
481763 |
- },
|
|
|
481763 |
- {
|
|
|
481763 |
id: "gmp-widevinecdm",
|
|
|
481763 |
src: "chrome://global/content/gmp-sources/widevinecdm.json",
|
|
|
481763 |
},
|
|
|
481763 |
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
|
|
|
481763 |
--- a/toolkit/content/jar.mn
|
|
|
481763 |
+++ b/toolkit/content/jar.mn
|
|
|
481763 |
@@ -108,7 +108,6 @@ toolkit.jar:
|
|
|
481763 |
#ifdef XP_MACOSX
|
|
|
481763 |
content/global/macWindowMenu.js
|
|
|
481763 |
#endif
|
|
|
481763 |
- content/global/gmp-sources/openh264.json (gmp-sources/openh264.json)
|
|
|
481763 |
content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
|
|
|
481763 |
|
|
|
481763 |
# Third party files
|
|
|
481763 |
diff --git a/toolkit/modules/GMPInstallManager.jsm b/toolkit/modules/GMPInstallManager.jsm
|
|
|
481763 |
--- a/toolkit/modules/GMPInstallManager.jsm
|
|
|
481763 |
+++ b/toolkit/modules/GMPInstallManager.jsm
|
|
|
481763 |
@@ -238,6 +234,9 @@ GMPInstallManager.prototype = {
|
|
|
481763 |
* downloaderr, verifyerr or previouserrorencountered
|
|
|
481763 |
*/
|
|
|
481763 |
installAddon(gmpAddon) {
|
|
|
481763 |
+ if (gmpAddon.isOpenH264) {
|
|
|
481763 |
+ return Promise.reject({ type: "disabled" });
|
|
|
481763 |
+ }
|
|
|
481763 |
if (this._deferred) {
|
|
|
481763 |
let log = getScopedLogger("GMPInstallManager.installAddon");
|
|
|
481763 |
log.error("previous error encountered");
|
|
|
481763 |
|