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 306719 a19ed4379b6015cfaad66894f42f6eae546fb127
parent 306718 aef31d82969314decfd0df7aa8d1a3f4a9037b1d
child 306720 c6c3985e15fadfe6997bc371cac8914c6ca315fb
push id30838
push usercpearce@mozilla.com
push dateTue, 26 Jul 2016 23:38:47 +0000
treeherderautoland@a19ed4379b60 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerald
bugs1289623
milestone50.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 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