summaryrefslogtreecommitdiffstats
path: root/media/cdm/ppapi/cdm_adapter.cc
diff options
context:
space:
mode:
Diffstat (limited to 'media/cdm/ppapi/cdm_adapter.cc')
-rw-r--r--media/cdm/ppapi/cdm_adapter.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc
index 092ab54..93479e2 100644
--- a/media/cdm/ppapi/cdm_adapter.cc
+++ b/media/cdm/ppapi/cdm_adapter.cc
@@ -289,8 +289,6 @@ PP_CdmMessageType CdmMessageTypeToPpMessageType(cdm::MessageType message) {
}
PP_CdmKeyStatus CdmKeyStatusToPpKeyStatus(cdm::KeyStatus status) {
- // TODO(jrummell): Remove kOutputNotAllowed, add kOutputRestricted to CDM
- // interface. http://crbug.com/507791.
switch (status) {
case cdm::kUsable:
return PP_CDMKEYSTATUS_USABLE;
@@ -298,12 +296,14 @@ PP_CdmKeyStatus CdmKeyStatusToPpKeyStatus(cdm::KeyStatus status) {
return PP_CDMKEYSTATUS_INVALID;
case cdm::kExpired:
return PP_CDMKEYSTATUS_EXPIRED;
- case cdm::kOutputNotAllowed:
+ case cdm::kOutputRestricted:
return PP_CDMKEYSTATUS_OUTPUTRESTRICTED;
case cdm::kOutputDownscaled:
return PP_CDMKEYSTATUS_OUTPUTDOWNSCALED;
case cdm::kStatusPending:
return PP_CDMKEYSTATUS_STATUSPENDING;
+ case cdm::kReleased:
+ return PP_CDMKEYSTATUS_RELEASED;
}
PP_NOTREACHED();