Merge remote-tracking branch 'origin/custom' into custom-platform

GMP: revert GMPUtils.jsm back to state of rev 4a010b9495
This should fix GMP DLLs loading.
1 changed files with 2 additions and 2 deletions
--- a/toolkit/mozapps/extensions/GMPUtils.jsm
+++ b/toolkit/mozapps/extensions/GMPUtils.jsm
@ -79,6 +79,7 @@ this.GMPUtils = {
      // The Widevine plugin is available for Windows versions Vista and later,
      // Mac OSX, and Linux.
      return AppConstants.isPlatformAndVersionAtLeast("win", "6") ||
+             AppConstants.platform == "macosx" ||
             AppConstants.platform == "linux";
    }

@ -87,10 +88,9 @@ this.GMPUtils = {

  _is32bitModeMacOS: function() {
    if (AppConstants.platform != "macosx") {
-      return Services.appinfo.XPCOMABI.split("-")[0] == "x86";
-    } else {
      return false;
    }
+    return Services.appinfo.XPCOMABI.split("-")[0] == "x86";
  },

  /**
Author	SHA1	Message	Date
roytam1	fb75511fd5	Merge remote-tracking branch 'origin/custom' into custom-platform	1 month ago
roytam1	ed4e67920f	GMP: revert GMPUtils.jsm back to state of rev `4a010b9495` This should fix GMP DLLs loading.	1 month ago