content/common/media/media_player_messages_android.h - Issue 100323004: Update Android IPC messages to EME WD

Unified Diff: content/common/media/media_player_messages_android.h

Issue 100323004: Update Android IPC messages to EME WD (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years 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

« content/browser/media/android/browser_media_player_manager.cc ('K') | « content/browser/media/android/browser_media_player_manager.cc ('k') | content/renderer/media/android/proxy_media_keys.cc » ('j') | content/renderer/media/android/renderer_media_player_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/media/media_player_messages_android.h

diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h

index 054fb22107c0cd3ec55da67751259b8ebbe885ca..5187cf13113f4968929a0d36673128bd434a214a 100644

--- a/content/common/media/media_player_messages_android.h

+++ b/content/common/media/media_player_messages_android.h

@@ -287,39 +287,43 @@ IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_InitializeCDM,

std::vector<uint8> /* uuid */,

GURL /* frame url */)

-IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_GenerateKeyRequest,

+IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_CreateSession,

int /* media_keys_id */,

uint32_t /* reference_id */,

std::string /* type */,

std::vector<uint8> /* init_data */)

-IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_AddKey,

+IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_UpdateSession,

int /* media_keys_id */,

uint32_t /* reference_id */,

std::vector<uint8> /* key */,

ddorwin 2013/12/03 18:11:30 ditto x2

jrummell 2013/12/03 19:33:16 Done.

std::vector<uint8> /* init_data */)

-IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_CancelKeyRequest,

+IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_ReleaseSession,

int /* media_keys_id */,

uint32_t /* reference_id */)

-IPC_MESSAGE_ROUTED2(MediaKeysMsg_KeyAdded,

- int /* media_keys_id */,

- uint32_t /* reference_id */)

-IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyError,

+IPC_MESSAGE_ROUTED3(MediaKeysMsg_SessionCreated,

int /* media_keys_id */,

uint32_t /* reference_id */,

- media::MediaKeys::KeyError /* error_code */,

- int /* system_code */)

+ std::string /* session_id */)

ddorwin 2013/12/03 18:11:30 web_session_id?

jrummell 2013/12/03 19:33:16 Done.

-IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyMessage,

+IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionMessage,

int /* media_keys_id */,

uint32_t /* reference_id */,

std::vector<uint8> /* message */,

std::string /* destination_url */)

-IPC_MESSAGE_ROUTED3(MediaKeysMsg_SetSessionId,

+IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionReady,

+ int /* media_keys_id */,

+ uint32_t /* reference_id */)

+IPC_MESSAGE_ROUTED2(MediaKeysMsg_SessionClosed,

+ int /* media_keys_id */,

+ uint32_t /* reference_id */)

+IPC_MESSAGE_ROUTED4(MediaKeysMsg_SessionError,

int /* media_keys_id */,

uint32_t /* reference_id */,

- std::string /* session_id */)

+ media::MediaKeys::KeyError /* error_code */,

+ int /* system_code */)