Bug 1288580 - Mark Widevine as supported on Linux and remove Mac OSX version check. r=spohl,a=lizzard
authorChris Pearce <cpearce@mozilla.com>
Fri, 22 Jul 2016 14:21:19 +1200
changeset 340267 98f5bd2a3d5e53e393d2ff191c6b365451bf9ff7
parent 340266 5ceb958e95c78e9e3d66cfc5ece4a45c8ec4fb07
child 340268 d47e7a99aa823dbd4bd4cc27c14f47413f3ff269
push id6283
push usercpearce@mozilla.com
push dateWed, 10 Aug 2016 02:15:36 +0000
treeherdermozilla-beta@b950c832d4df [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersspohl, lizzard
bugs1288580
milestone49.0
Bug 1288580 - Mark Widevine as supported on Linux and remove Mac OSX version check. r=spohl,a=lizzard This means if Widevine is preffed visible on Linux it will show up in the plugin list. We only support Mac OSX 10.9 and later, so we don't need the >= 10.7 check any more. MozReview-Commit-ID: BjgMKeIIrrI
toolkit/modules/GMPUtils.jsm
toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
--- a/toolkit/modules/GMPUtils.jsm
+++ b/toolkit/modules/GMPUtils.jsm
@@ -78,23 +78,21 @@ this.GMPUtils = {
         // Non-Windows OSes currently unsupported by Adobe EME
         this.maybeReportTelemetry(aPlugin.id,
                                   "VIDEO_EME_ADOBE_UNSUPPORTED_REASON",
                                   GMPPluginUnsupportedReason.NOT_WINDOWS);
       }
       // Windows Vista and later only supported by Adobe EME.
       return AppConstants.isPlatformAndVersionAtLeast("win", "6");
     } else if (aPlugin.id == WIDEVINE_ID) {
-      // The Widevine plugin is available for Windows versions Vista and later
-      // and Mac OSX 10.7 and later.
-      if (AppConstants.isPlatformAndVersionAtLeast("win", "6") ||
-          AppConstants.isPlatformAndVersionAtLeast("macosx", "10.7")) {
-        return true;
-      }
-      return false;
+      // 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";
     }
 
     return true;
   },
 
   /**
    * 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
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -384,17 +384,18 @@ add_task(function* testEmeSupport() {
       if (AppConstants.isPlatformAndVersionAtLeast("win", "6")) {
         Assert.ok(item, "Adobe EME supported, found add-on element.");
       } else {
         Assert.ok(!item,
                   "Adobe EME not supported, couldn't find add-on element.");
       }
     } else if (addon.id == GMPScope.WIDEVINE_ID) {
       if (AppConstants.isPlatformAndVersionAtLeast("win", "6") ||
-          AppConstants.isPlatformAndVersionAtLeast("macosx", "10.7")) {
+          AppConstants.platform == "macosx" ||
+          AppConstants.platform == "linux") {
         Assert.ok(item, "Widevine supported, found add-on element.");
       } else {
         Assert.ok(!item,
                   "Widevine not supported, couldn't find add-on element.");
       }
     } else {
       Assert.ok(item, "Found add-on element.");
     }