Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Unified Diff: media/cdm/ppapi/cdm_adapter.cc

Issue 1354723003: Update MediaKeyStatus enum values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use right DEPS value Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cdm/ppapi/cdm_adapter.cc
diff --git a/media/cdm/ppapi/cdm_adapter.cc b/media/cdm/ppapi/cdm_adapter.cc
index 092ab5443eecd0ad61567a98192ee93574fa9cc0..93479e2595537cf26ae9022e97c9e7e908533f7e 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();
« no previous file with comments | « media/blink/webcontentdecryptionmodulesession_impl.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698