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

Side by Side Diff: ppapi/thunk/ppb_instance_api.h

Issue 10854209: Modify the PPAPI CDM interface to pass more info. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updates that resolve xhwang's comments. Created 8 years, 4 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 | Annotate | Revision Log
OLDNEW
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 #ifndef PPAPI_THUNK_INSTANCE_API_H_ 5 #ifndef PPAPI_THUNK_INSTANCE_API_H_
6 #define PPAPI_THUNK_INSTANCE_API_H_ 6 #define PPAPI_THUNK_INSTANCE_API_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "ppapi/c/dev/pp_print_settings_dev.h" 10 #include "ppapi/c/dev/pp_print_settings_dev.h"
11 #include "ppapi/c/dev/ppb_console_dev.h" 11 #include "ppapi/c/dev/ppb_console_dev.h"
12 #include "ppapi/c/dev/ppb_text_input_dev.h" 12 #include "ppapi/c/dev/ppb_text_input_dev.h"
13 #include "ppapi/c/dev/ppb_url_util_dev.h" 13 #include "ppapi/c/dev/ppb_url_util_dev.h"
14 #include "ppapi/c/pp_bool.h" 14 #include "ppapi/c/pp_bool.h"
15 #include "ppapi/c/pp_completion_callback.h" 15 #include "ppapi/c/pp_completion_callback.h"
16 #include "ppapi/c/pp_size.h" 16 #include "ppapi/c/pp_size.h"
17 #include "ppapi/c/pp_time.h" 17 #include "ppapi/c/pp_time.h"
18 #include "ppapi/c/ppb_audio_config.h" 18 #include "ppapi/c/ppb_audio_config.h"
19 #include "ppapi/c/ppb_gamepad.h" 19 #include "ppapi/c/ppb_gamepad.h"
20 #include "ppapi/c/ppb_instance.h" 20 #include "ppapi/c/ppb_instance.h"
21 #include "ppapi/c/ppb_mouse_cursor.h" 21 #include "ppapi/c/ppb_mouse_cursor.h"
22 #include "ppapi/c/private/ppb_instance_private.h" 22 #include "ppapi/c/private/ppb_instance_private.h"
23 #include "ppapi/shared_impl/api_id.h" 23 #include "ppapi/shared_impl/api_id.h"
24 24
25 // Windows headers interfere with this file. 25 // Windows headers interfere with this file.
26 #ifdef PostMessage 26 #ifdef PostMessage
27 #undef PostMessage 27 #undef PostMessage
28 #endif 28 #endif
29 29
30 struct PP_DecryptedBlockInfo;
31
30 namespace ppapi { 32 namespace ppapi {
31 33
32 class TrackedCallback; 34 class TrackedCallback;
33 struct ViewData; 35 struct ViewData;
34 36
35 namespace thunk { 37 namespace thunk {
36 38
37 class PPB_Flash_API; 39 class PPB_Flash_API;
38 40
39 class PPB_Instance_API { 41 class PPB_Instance_API {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 PP_Var session_id, 154 PP_Var session_id,
153 PP_Resource message, 155 PP_Resource message,
154 PP_Var default_url) = 0; 156 PP_Var default_url) = 0;
155 virtual void KeyError(PP_Instance instance, 157 virtual void KeyError(PP_Instance instance,
156 PP_Var key_system, 158 PP_Var key_system,
157 PP_Var session_id, 159 PP_Var session_id,
158 int32_t media_error, 160 int32_t media_error,
159 int32_t system_error) = 0; 161 int32_t system_error) = 0;
160 virtual void DeliverBlock(PP_Instance instance, 162 virtual void DeliverBlock(PP_Instance instance,
161 PP_Resource decrypted_block, 163 PP_Resource decrypted_block,
162 int32_t request_id) = 0; 164 const PP_DecryptedBlockInfo* block_info) = 0;
163 virtual void DeliverFrame(PP_Instance instance, 165 virtual void DeliverFrame(PP_Instance instance,
164 PP_Resource decrypted_frame, 166 PP_Resource decrypted_frame,
165 int32_t request_id) = 0; 167 const PP_DecryptedBlockInfo* block_info) = 0;
166 virtual void DeliverSamples(PP_Instance instance, 168 virtual void DeliverSamples(PP_Instance instance,
167 PP_Resource decrypted_samples, 169 PP_Resource decrypted_samples,
168 int32_t request_id) = 0; 170 const PP_DecryptedBlockInfo* block_info) = 0;
169 171
170 // URLUtil. 172 // URLUtil.
171 virtual PP_Var ResolveRelativeToDocument( 173 virtual PP_Var ResolveRelativeToDocument(
172 PP_Instance instance, 174 PP_Instance instance,
173 PP_Var relative, 175 PP_Var relative,
174 PP_URLComponents_Dev* components) = 0; 176 PP_URLComponents_Dev* components) = 0;
175 virtual PP_Bool DocumentCanRequest(PP_Instance instance, PP_Var url) = 0; 177 virtual PP_Bool DocumentCanRequest(PP_Instance instance, PP_Var url) = 0;
176 virtual PP_Bool DocumentCanAccessDocument(PP_Instance instance, 178 virtual PP_Bool DocumentCanAccessDocument(PP_Instance instance,
177 PP_Instance target) = 0; 179 PP_Instance target) = 0;
178 virtual PP_Var GetDocumentURL(PP_Instance instance, 180 virtual PP_Var GetDocumentURL(PP_Instance instance,
179 PP_URLComponents_Dev* components) = 0; 181 PP_URLComponents_Dev* components) = 0;
180 virtual PP_Var GetPluginInstanceURL(PP_Instance instance, 182 virtual PP_Var GetPluginInstanceURL(PP_Instance instance,
181 PP_URLComponents_Dev* components) = 0; 183 PP_URLComponents_Dev* components) = 0;
182 #endif // !defined(OS_NACL) 184 #endif // !defined(OS_NACL)
183 185
184 static const ApiID kApiID = API_ID_PPB_INSTANCE; 186 static const ApiID kApiID = API_ID_PPB_INSTANCE;
185 }; 187 };
186 188
187 } // namespace thunk 189 } // namespace thunk
188 } // namespace ppapi 190 } // namespace ppapi
189 191
190 #endif // PPAPI_THUNK_INSTANCE_API_H_ 192 #endif // PPAPI_THUNK_INSTANCE_API_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698