Bug 1289623 - Assume keys marked as 'output-restricted' are usable. r=gerald
authorChris Pearce <cpearce@mozilla.com>
Wed, 27 Jul 2016 11:06:43 +1200
changeset 331808 a19ed4379b6015cfaad66894f42f6eae546fb127
parent 331807 aef31d82969314decfd0df7aa8d1a3f4a9037b1d
child 331809 c6c3985e15fadfe6997bc371cac8914c6ca315fb
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerald
bugs1289623
milestone50.0a1
Bug 1289623 - Assume keys marked as 'output-restricted' are usable. r=gerald 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