From 8f5ec00b73e757c7f92092e54740cf91aff8903a 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 a=ritu 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 --- 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 1b6a4146e3b..07000a23530 100644 --- a/dom/media/eme/MediaKeySystemAccess.cpp +++ b/dom/media/eme/MediaKeySystemAccess.cpp @@ -285,13 +285,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 @@ -304,7 +304,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