Bug 1288582 - Hide Adobe Primetime plugin on Windows < Vista. r=spohl
authorChris Pearce <cpearce@mozilla.com>
Fri, 22 Jul 2016 14:30:22 +1200
changeset 346452 6621ce9a618bf36447001b5af53ea4007d1e6ccb
parent 346451 0b88f94ed312f32e03e7a0db0707b3880f3c0a75
child 346453 e5a490ba324a16829020b75e8eeb18eeffb4e24e
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersspohl
bugs1288582
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1288582 - Hide Adobe Primetime plugin on Windows < Vista. r=spohl We're not going to get a supported Adobe GMP on WinXP, so we shouldn't download it or show it in our add-on manager. MozReview-Commit-ID: I3cNsStmzsV
toolkit/modules/GMPUtils.jsm
toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
--- a/toolkit/modules/GMPUtils.jsm
+++ b/toolkit/modules/GMPUtils.jsm
@@ -74,18 +74,19 @@ this.GMPUtils = {
       return true;
     }
     if (aPlugin.id == EME_ADOBE_ID) {
       if (Services.appinfo.OS != "WINNT") {
         // Non-Windows OSes currently unsupported by Adobe EME
         this.maybeReportTelemetry(aPlugin.id,
                                   "VIDEO_EME_ADOBE_UNSUPPORTED_REASON",
                                   GMPPluginUnsupportedReason.NOT_WINDOWS);
-        return false;
       }
+      // 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;
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -376,17 +376,17 @@ add_task(function* testEmeSupport() {
   yield GMPScope.GMPProvider.shutdown();
   GMPScope.GMPProvider.startup();
 
   for (let addon of gMockAddons) {
     yield gCategoryUtilities.openType("plugin");
     let doc = gManagerWindow.document;
     let item = get_addon_element(gManagerWindow, addon.id);
     if (addon.id == GMPScope.EME_ADOBE_ID) {
-      if (Services.appinfo.OS == "WINNT") {
+      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")) {