diff options
Diffstat (limited to 'toolkit/mozapps/extensions/GMPUtils.jsm')
| -rw-r--r-- | toolkit/mozapps/extensions/GMPUtils.jsm | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/toolkit/mozapps/extensions/GMPUtils.jsm b/toolkit/mozapps/extensions/GMPUtils.jsm index 593fc3c8da..3c691610d5 100644 --- a/toolkit/mozapps/extensions/GMPUtils.jsm +++ b/toolkit/mozapps/extensions/GMPUtils.jsm @@ -39,6 +39,11 @@ this.GMPUtils = { * The plugin to check. */ isPluginHidden: function(aPlugin) { + if (this._is32bitModeMacOS()) { + // GMPs are hidden on MacOS when running in 32 bit mode. + // See bug 1291537. + return true; + } if (!aPlugin.isEME) { return false; } @@ -66,7 +71,7 @@ this.GMPUtils = { } if (aPlugin.id == WIDEVINE_ID) { -#if defined(XP_WIN) || defined(XP_LINUX) +#if defined(XP_WIN) || defined(XP_LINUX) || defined(XP_MACOSX) // The Widevine plugin is available for Windows versions Vista and later, // Mac OSX, and Linux. return true; @@ -78,6 +83,14 @@ this.GMPUtils = { return true; }, + _is32bitModeMacOS: function() { +#ifdef XP_MACOSX + return Services.appinfo.XPCOMABI.split("-")[0] == "x86"; +#else + return false; +#endif + }, + /** * Checks whether or not a given plugin is visible in the addons manager * UI and the "enable DRM" notification box. This can be used to test |