ppapi/proxy/ppapi_messages.h - Issue 1102363005: Initialize the CDM asynchronously

Side by Side Diff: ppapi/proxy/ppapi_messages.h

Issue 1102363005: Initialize the CDM asynchronously (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 unified diff | Download patch

« media/blink/webmediaplayer_impl.cc ('K') | « ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c ('k') | ppapi/proxy/ppp_content_decryptor_private_proxy.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 // Multiply-included message header, no traditional include guard.	5 // Multiply-included message header, no traditional include guard.

6 #include <map>	6 #include <map>

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 765 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
776	776

777 #if !defined(OS_NACL) && !defined(NACL_WIN64)	777 #if !defined(OS_NACL) && !defined(NACL_WIN64)

778 // PPB_Broker.	778 // PPB_Broker.

779 IPC_MESSAGE_ROUTED3(	779 IPC_MESSAGE_ROUTED3(

780 PpapiMsg_PPBBroker_ConnectComplete,	780 PpapiMsg_PPBBroker_ConnectComplete,

781 ppapi::HostResource /* broker */,	781 ppapi::HostResource /* broker */,

782 IPC::PlatformFileForTransit /* handle */,	782 IPC::PlatformFileForTransit /* handle */,

783 int32_t /* result */)	783 int32_t /* result */)

784	784

785 // PPP_ContentDecryptor_Dev	785 // PPP_ContentDecryptor_Dev

786 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_Initialize,	786 IPC_MESSAGE_ROUTED5(PpapiMsg_PPPContentDecryptor_Initialize,

787 PP_Instance /* instance */,	787 PP_Instance /* instance */,

	788 uint32_t /* promise_id */,

788 ppapi::proxy::SerializedVar /* key_system, String */,	789 ppapi::proxy::SerializedVar /* key_system, String */,

789 PP_Bool /* allow_distinctive_identifier */,	790 PP_Bool /* allow_distinctive_identifier */,

790 PP_Bool /* allow_persistent_state */)	791 PP_Bool /* allow_persistent_state */)

791 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_SetServerCertificate,	792 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_SetServerCertificate,

792 PP_Instance /* instance */,	793 PP_Instance /* instance */,

793 uint32_t /* promise_id */,	794 uint32_t /* promise_id */,

794 std::vector<uint8_t> /* certificate */)	795 std::vector<uint8_t> /* certificate */)

795 IPC_MESSAGE_ROUTED5(	796 IPC_MESSAGE_ROUTED5(

796 PpapiMsg_PPPContentDecryptor_CreateSessionAndGenerateRequest,	797 PpapiMsg_PPPContentDecryptor_CreateSessionAndGenerateRequest,

797 PP_Instance /* instance */,	798 PP_Instance /* instance */,

(...skipping 1549 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2347 std::vector<ppapi::HostResource> /* buffers */,	2348 std::vector<ppapi::HostResource> /* buffers */,

2348 uint32_t /* buffer_size */)	2349 uint32_t /* buffer_size */)

2349 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus,	2350 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnStatus,

2350 uint32_t /* status */)	2351 uint32_t /* status */)

2351 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError,	2352 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnError,

2352 uint32_t /* error */)	2353 uint32_t /* error */)

2353 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady,	2354 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_VideoCapture_OnBufferReady,

2354 uint32_t /* buffer */)	2355 uint32_t /* buffer */)

2355	2356

2356 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)	2357 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)

OLD	NEW