From ac7994680982ad96a2dac055ee8a6e1f6dd1b747 Mon Sep 17 00:00:00 2001 From: Chris Pearce Date: Fri, 13 May 2016 14:00:29 +1200 Subject: [PATCH] Bug 1272521 - Reject Widevine keysystem requests on MacOSX 10.6. r=gerald The Widevine CDM is crashing trying to determine the screen layout, and since 10.6 is being deprecated in August, we're not going to bother making it work. MozReview-Commit-ID: K1k1WZqjoyy --HG-- extra : rebase_source : 7862852195a796e6bb18ef763f1b20837801531a --- dom/media/eme/MediaKeySystemAccess.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dom/media/eme/MediaKeySystemAccess.cpp b/dom/media/eme/MediaKeySystemAccess.cpp index f5b93e7b0b9c..eea37525580d 100644 --- a/dom/media/eme/MediaKeySystemAccess.cpp +++ b/dom/media/eme/MediaKeySystemAccess.cpp @@ -287,13 +287,13 @@ MediaKeySystemAccess::GetKeySystemStatus(const nsAString& aKeySystem, #ifdef XP_WIN // Win Vista and later only. if (!IsVistaOrLater()) { - aOutMessage = NS_LITERAL_CSTRING("Minimum Windows version not met for Adobe EME"); + aOutMessage = NS_LITERAL_CSTRING("Minimum Windows version (Vista) not met for Adobe EME"); return MediaKeySystemStatus::Cdm_not_supported; } #endif #ifdef XP_MACOSX if (!nsCocoaFeatures::OnLionOrLater()) { - aOutMessage = NS_LITERAL_CSTRING("Minimum MacOSX version not met for Adobe EME"); + aOutMessage = NS_LITERAL_CSTRING("Minimum MacOSX version (10.7) not met for Adobe EME"); return MediaKeySystemStatus::Cdm_not_supported; } #endif @@ -306,7 +306,13 @@ MediaKeySystemAccess::GetKeySystemStatus(const nsAString& aKeySystem, #ifdef XP_WIN // Win Vista and later only. if (!IsVistaOrLater()) { - aOutMessage = NS_LITERAL_CSTRING("Minimum Windows version not met for Widevine EME"); + aOutMessage = NS_LITERAL_CSTRING("Minimum Windows version (Vista) not met for Widevine EME"); + return MediaKeySystemStatus::Cdm_not_supported; + } +#endif +#ifdef XP_MACOSX + if (!nsCocoaFeatures::OnLionOrLater()) { + aOutMessage = NS_LITERAL_CSTRING("Minimum MacOSX version (10.7) not met for Widevine EME"); return MediaKeySystemStatus::Cdm_not_supported; } #endif