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

Unified Diff: content/renderer/pepper/content_decryptor_delegate.cc

Issue 1005213002: Add missing CdmKeyInformation enum values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename enum for Windows Created 5 years, 9 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
« no previous file with comments | « no previous file | media/base/cdm_key_information.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/content_decryptor_delegate.cc
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc
index 63ab8184b73be76a3c49b4e0c9548a1a0be5086f..b3287b6682a06b925fbf02dabca7aefc8971738d 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -302,6 +302,10 @@ media::CdmKeyInformation::KeyStatus PpCdmKeyStatusToCdmKeyInformationKeyStatus(
return media::CdmKeyInformation::EXPIRED;
case PP_CDMKEYSTATUS_OUTPUTNOTALLOWED:
return media::CdmKeyInformation::OUTPUT_NOT_ALLOWED;
+ case PP_CDMKEYSTATUS_OUTPUTDOWNSCALED:
+ return media::CdmKeyInformation::OUTPUT_DOWNSCALED;
+ case PP_CDMKEYSTATUS_STATUSPENDING:
+ return media::CdmKeyInformation::KEY_STATUS_PENDING;
default:
NOTREACHED();
return media::CdmKeyInformation::INTERNAL_ERROR;
« no previous file with comments | « no previous file | media/base/cdm_key_information.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698