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

Unified Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.h

Issue 1023333002: Update External Clear Key to support CDM_8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: media/cdm/ppapi/external_clear_key/clear_key_cdm.h
diff --git a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
index 0dc00b27e304aeed344b8616cda629bb803a3889..9765035ccbba9841beda7a1e9864d12e5ce48397 100644
--- a/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
@@ -35,10 +35,11 @@ class ClearKeyCdm : public ClearKeyCdmInterface {
virtual ~ClearKeyCdm();
xhwang 2015/03/23 20:35:37 Replace "virtual" with "override".
jrummell 2015/03/23 21:47:07 Done.
// ContentDecryptionModule implementation.
+ virtual void Initialize(bool allow_distinctive_identifier,
+ bool allow_persistent_state) override;
xhwang 2015/03/23 20:35:37 Here and below, with "override", no need to use "v
jrummell 2015/03/23 21:47:07 Done.
virtual void CreateSessionAndGenerateRequest(uint32 promise_id,
cdm::SessionType session_type,
- const char* init_data_type,
- uint32 init_data_type_size,
+ cdm::InitDataType init_data_type,
const uint8* init_data,
uint32 init_data_size) override;
virtual void LoadSession(uint32 promise_id,

Powered by Google App Engine
This is Rietveld 408576698