Bug 1303255 - Use correct dec-doc messages on Vista - r=Gijs
authorGerald Squelart <gsquelart@mozilla.com>
Thu, 15 Sep 2016 00:15:59 -0700
changeset 357715 9f345e640bd78c21ac2bef12ca6f329e546abc85
parent 357714 1df8bde648531feb661af93efed50487e8a50c5d
child 357716 6267fc17f8c02ce375589be5e9ac7acdf6bad126
push id1324
push usermtabara@mozilla.com
push dateMon, 16 Jan 2017 13:07:44 +0000
treeherdermozilla-release@a01c49833940 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1303255
milestone51.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 1303255 - Use correct dec-doc messages on Vista - r=Gijs MozReview-Commit-ID: FeaFlvaL8t4
browser/base/content/browser-media.js
--- a/browser/base/content/browser-media.js
+++ b/browser/base/content/browser-media.js
@@ -214,21 +214,27 @@ let gDecoderDoctorHandler = {
       }
       return gNavigatorBundle.getString("decoder.noCodecs.message");
     }
     if (type == "adobe-cdm-not-activated" &&
         AppConstants.platform == "win") {
       if (AppConstants.isPlatformAndVersionAtMost("win", "5.9")) {
         return gNavigatorBundle.getString("decoder.noCodecsXP.message");
       }
+      if (!AppConstants.isPlatformAndVersionAtLeast("win", "6.1")) {
+        return gNavigatorBundle.getString("decoder.noCodecsVista.message");
+      }
       return gNavigatorBundle.getString("decoder.noCodecs.message");
     }
     if (type == "platform-decoder-not-found") {
+      if (AppConstants.isPlatformAndVersionAtLeast("win", "6.1")) {
+        return gNavigatorBundle.getString("decoder.noHWAcceleration.message");
+      }
       if (AppConstants.isPlatformAndVersionAtLeast("win", "6")) {
-        return gNavigatorBundle.getString("decoder.noHWAcceleration.message");
+        return gNavigatorBundle.getString("decoder.noHWAccelerationVista.message");
       }
       if (AppConstants.platform == "linux") {
         return gNavigatorBundle.getString("decoder.noCodecsLinux.message");
       }
     }
     return "";
   },