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

Unified Diff: media/cdm/ppapi/cdm_adapter.h

Issue 26592003: Switch CdmWrapper to use uint32_t for size types per style guide. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase over audio. Created 7 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 | « DEPS ('k') | media/cdm/ppapi/cdm_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/ppapi/cdm_adapter.h
diff --git a/media/cdm/ppapi/cdm_adapter.h b/media/cdm/ppapi/cdm_adapter.h
index d2edefb96bcd0e16164dc905a707886c6e5bea77..d5cc97301248ada72e9ccb9fe454e93c48ef47b1 100644
--- a/media/cdm/ppapi/cdm_adapter.h
+++ b/media/cdm/ppapi/cdm_adapter.h
@@ -79,15 +79,15 @@ class CdmAdapter : public pp::Instance,
const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
// cdm::Host implementation.
- virtual cdm::Buffer* Allocate(int32_t capacity) OVERRIDE;
+ virtual cdm::Buffer* Allocate(uint32_t capacity) OVERRIDE;
virtual void SetTimer(int64_t delay_ms, void* context) OVERRIDE;
virtual double GetCurrentWallTimeInSeconds() OVERRIDE;
virtual void SendKeyMessage(
- const char* session_id, int32_t session_id_length,
- const char* message, int32_t message_length,
- const char* default_url, int32_t default_url_length) OVERRIDE;
+ const char* session_id, uint32_t session_id_length,
+ const char* message, uint32_t message_length,
+ const char* default_url, uint32_t default_url_length) OVERRIDE;
virtual void SendKeyError(const char* session_id,
- int32_t session_id_length,
+ uint32_t session_id_length,
cdm::MediaKeyError error_code,
uint32_t system_code) OVERRIDE;
virtual void GetPrivateData(int32_t* instance,
@@ -95,11 +95,14 @@ class CdmAdapter : public pp::Instance,
// cdm::Host_2 implementation.
virtual void SendPlatformChallenge(
- const char* service_id, int32_t service_id_length,
- const char* challenge, int32_t challenge_length) OVERRIDE;
+ const char* service_id, uint32_t service_id_length,
+ const char* challenge, uint32_t challenge_length) OVERRIDE;
virtual void EnableOutputProtection(
uint32_t desired_protection_mask) OVERRIDE;
virtual void QueryOutputProtectionStatus() OVERRIDE;
+ virtual void OnDeferredInitializationDone(
+ cdm::StreamType stream_type,
+ cdm::Status decoder_status) OVERRIDE;
private:
struct SessionInfo {
« no previous file with comments | « DEPS ('k') | media/cdm/ppapi/cdm_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698