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

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: Address comments. 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
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 95c188fe051677bcf2f4aed7ae54b8f6bcd8bfa6..19a944f633996ccaab856fc2a58fdbc06ae40b68 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
@@ -46,15 +46,12 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
// ContentDecryptionModule implementation.
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;

Powered by Google App Engine
This is Rietveld 408576698