Bug 1234099 - Backout 34460cc654ca due to playback failures caused by Adobe GMP. r=backout
authorChris Pearce <cpearce@mozilla.com>
Thu, 07 Jan 2016 09:57:36 +1300
changeset 278865 4993644587de8c24bc81ee1b7dd1620a51e4c8f7
parent 278864 a9b4487febc8b302a4b77412ecf7a8176adde8c1
child 278866 c4bf1656e0bfbaa0788f08c95c9565f5d80969c0
push id29860
push usercbook@mozilla.com
push dateThu, 07 Jan 2016 10:51:20 +0000
treeherdermozilla-central@e0bcd16e1d4b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1234099
milestone46.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 1234099 - Backout 34460cc654ca due to playback failures caused by Adobe GMP. r=backout
toolkit/modules/GMPUtils.jsm
toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
--- a/toolkit/modules/GMPUtils.jsm
+++ b/toolkit/modules/GMPUtils.jsm
@@ -76,16 +76,24 @@ this.GMPUtils = {
     if (Services.appinfo.OS != "WINNT") {
       // Non-Windows OSes currently unsupported.
       this.maybeReportTelemetry(aPlugin.id,
                                 "VIDEO_EME_ADOBE_UNSUPPORTED_REASON",
                                 GMPPluginUnsupportedReason.NOT_WINDOWS);
       return false;
     }
 
+    if (Services.sysinfo.getPropertyAsInt32("version") < 6) {
+      // Windows versions before Vista are unsupported.
+      this.maybeReportTelemetry(aPlugin.id,
+                                "VIDEO_EME_ADOBE_UNSUPPORTED_REASON",
+                                GMPPluginUnsupportedReason.WINDOWS_VERSION);
+      return false;
+    }
+
     return true;
   },
 
   /**
    * Checks whether or not a given plugin is forced visible. This can be used
    * to test plugins that aren't yet supported by default on a particular OS.
    * @param   aPlugin
    *          The plugin to check.
--- a/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+++ b/toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
@@ -373,17 +373,18 @@ 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 (Services.appinfo.OS == "WINNT" &&
+          Services.sysinfo.getPropertyAsInt32("version") >= 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 {
       Assert.ok(item, "Found add-on element.");
     }