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

Unified Diff: webkit/media/crypto/ppapi/clear_key_cdm.h

Issue 11270057: Add type argument to pepper content decryptor method GenerateKeyRequest(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased and addressed TODOs related to integration of this CL. Created 8 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 | « webkit/media/crypto/ppapi/cdm_wrapper.cc ('k') | webkit/media/crypto/ppapi/clear_key_cdm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/ppapi/clear_key_cdm.h
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/media/crypto/ppapi/clear_key_cdm.h
index 2053328e0809a26a30de1234e15a4c846fd34dfc..e3056be272099d349d873e49399d28888fdf10d7 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
@@ -46,17 +46,13 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
virtual ~ClearKeyCdm();
// ContentDecryptionModule implementation.
- // TODO(tomfinegan): Update ContentDecryptionModule to pass "type" through.
virtual cdm::Status GenerateKeyRequest(
- const uint8_t* init_data,
- int init_data_size,
+ const char* type, int type_size,
+ const uint8_t* init_data, int init_data_size,
cdm::KeyMessage* key_request) OVERRIDE;
- virtual cdm::Status AddKey(const char* session_id,
- int session_id_size,
- const uint8_t* key,
- int key_size,
- const uint8_t* key_id,
- int key_id_size) OVERRIDE;
+ virtual cdm::Status AddKey(const char* session_id, int session_id_size,
+ const uint8_t* key, int key_size,
+ const uint8_t* key_id, int key_id_size) OVERRIDE;
virtual cdm::Status CancelKeyRequest(const char* session_id,
int session_id_size) OVERRIDE;
virtual void TimerExpired(cdm::KeyMessage* msg, bool* populated) OVERRIDE;
« no previous file with comments | « webkit/media/crypto/ppapi/cdm_wrapper.cc ('k') | webkit/media/crypto/ppapi/clear_key_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698