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

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

Issue 1132773003: Revert of Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « content/browser/media/cdm/browser_cdm_manager.cc ('k') | content/renderer/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/media/cdm_messages.h
diff --git a/content/common/media/cdm_messages.h b/content/common/media/cdm_messages.h
index 1efe0aec040a34f0ca05ff8b44d0aac56ca91d99..e9d1958edc65524b33868e284f40b194b9f12def 100644
--- a/content/common/media/cdm_messages.h
+++ b/content/common/media/cdm_messages.h
@@ -29,12 +29,6 @@
IPC_ENUM_TRAITS_MAX_VALUE(CdmHostMsg_CreateSession_InitDataType,
INIT_DATA_TYPE_MAX)
-IPC_STRUCT_BEGIN(CdmHostMsg_InitializeCdm_Params)
- IPC_STRUCT_MEMBER(std::string, key_system)
- IPC_STRUCT_MEMBER(GURL, security_origin)
- IPC_STRUCT_MEMBER(bool, use_hw_secure_codecs)
-IPC_STRUCT_END()
-
IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation)
IPC_STRUCT_TRAITS_MEMBER(key_id)
IPC_STRUCT_TRAITS_MEMBER(status)
@@ -43,11 +37,12 @@
// Messages from render to browser.
-IPC_MESSAGE_CONTROL4(CdmHostMsg_InitializeCdm,
+IPC_MESSAGE_CONTROL5(CdmHostMsg_InitializeCdm,
int /* render_frame_id */,
int /* cdm_id */,
uint32_t /* promise_id */,
- CdmHostMsg_InitializeCdm_Params /* params */)
+ std::string /* key_system */,
+ GURL /* security_origin */)
IPC_MESSAGE_CONTROL4(CdmHostMsg_SetServerCertificate,
int /* render_frame_id */,
« no previous file with comments | « content/browser/media/cdm/browser_cdm_manager.cc ('k') | content/renderer/media/crypto/ppapi_decryptor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698