Bug 1289623 - Assume keys marked as 'output-restricted' are usable. r=gerald,a=lizzard
authorChris Pearce <cpearce@mozilla.com>
Wed, 27 Jul 2016 11:06:43 +1200
changeset 340268 d47e7a99aa823dbd4bd4cc27c14f47413f3ff269
parent 340267 98f5bd2a3d5e53e393d2ff191c6b365451bf9ff7
child 340269 02110ecb55b9b91b4c6de46560cb35d4da8dec80
push id6283
push usercpearce@mozilla.com
push dateWed, 10 Aug 2016 02:15:36 +0000
treeherdermozilla-beta@b950c832d4df [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerald, lizzard
bugs1289623
milestone49.0
Bug 1289623 - Assume keys marked as 'output-restricted' are usable. r=gerald,a=lizzard Chrome appears to do this. MozReview-Commit-ID: LbSFQiB0pEO
dom/media/eme/CDMCaps.cpp
--- a/dom/media/eme/CDMCaps.cpp
+++ b/dom/media/eme/CDMCaps.cpp
@@ -48,16 +48,17 @@ CDMCaps::AutoLock::IsKeyUsable(const Cen
 {
   mData.mMonitor.AssertCurrentThreadOwns();
   const auto& keys = mData.mKeyStatuses;
   for (size_t i = 0; i < keys.Length(); i++) {
     if (keys[i].mId != aKeyId) {
       continue;
     }
     if (keys[i].mStatus == kGMPUsable ||
+        keys[i].mStatus == kGMPOutputRestricted ||
         keys[i].mStatus == kGMPOutputDownscaled) {
       return true;
     }
   }
   return false;
 }
 
 bool