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

Unified Diff: media/blink/cdm_result_promise_helper.cc

Issue 2342953002: Update EME errors to use TypeError (Closed)
Patch Set: changes Created 4 years, 2 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/blink/webcontentdecryptionmodulesession_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/cdm_result_promise_helper.cc
diff --git a/media/blink/cdm_result_promise_helper.cc b/media/blink/cdm_result_promise_helper.cc
index c96121a0fed7aac94bb58165df4f8112e9b12b74..5d0a5e58f2a1b9b6684d1c096abbe6bd017b0c4b 100644
--- a/media/blink/cdm_result_promise_helper.cc
+++ b/media/blink/cdm_result_promise_helper.cc
@@ -38,16 +38,21 @@ blink::WebContentDecryptionModuleException ConvertCdmException(
return blink::WebContentDecryptionModuleExceptionNotSupportedError;
case MediaKeys::INVALID_STATE_ERROR:
return blink::WebContentDecryptionModuleExceptionInvalidStateError;
+
+ // TODO(jrummell): Since InvalidAccess is not returned, thus should be
+ // renamed to TYPE_ERROR. http://crbug.com/570216#c11.
case MediaKeys::INVALID_ACCESS_ERROR:
- return blink::WebContentDecryptionModuleExceptionInvalidAccessError;
+ return blink::WebContentDecryptionModuleExceptionTypeError;
case MediaKeys::QUOTA_EXCEEDED_ERROR:
return blink::WebContentDecryptionModuleExceptionQuotaExceededError;
case MediaKeys::UNKNOWN_ERROR:
return blink::WebContentDecryptionModuleExceptionUnknownError;
+
+ // These are deprecated, and should be removed.
+ // http://crbug.com/570216#c11.
case MediaKeys::CLIENT_ERROR:
- return blink::WebContentDecryptionModuleExceptionClientError;
case MediaKeys::OUTPUT_ERROR:
- return blink::WebContentDecryptionModuleExceptionOutputError;
+ break;
}
NOTREACHED();
return blink::WebContentDecryptionModuleExceptionUnknownError;
« no previous file with comments | « no previous file | media/blink/webcontentdecryptionmodulesession_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698