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

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

Issue 496143002: Update Pepper interface for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cdm_promise rebase Created 6 years, 3 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
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_PROXY_PPB_INSTANCE_PROXY_H_ 5 #ifndef PPAPI_PROXY_PPB_INSTANCE_PROXY_H_
6 #define PPAPI_PROXY_PPB_INSTANCE_PROXY_H_ 6 #define PPAPI_PROXY_PPB_INSTANCE_PROXY_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector>
9 10
10 #include "ppapi/c/pp_instance.h" 11 #include "ppapi/c/pp_instance.h"
11 #include "ppapi/c/pp_resource.h" 12 #include "ppapi/c/pp_resource.h"
12 #include "ppapi/c/pp_var.h" 13 #include "ppapi/c/pp_var.h"
13 #include "ppapi/proxy/interface_proxy.h" 14 #include "ppapi/proxy/interface_proxy.h"
14 #include "ppapi/proxy/proxy_completion_callback_factory.h" 15 #include "ppapi/proxy/proxy_completion_callback_factory.h"
15 #include "ppapi/shared_impl/host_resource.h" 16 #include "ppapi/shared_impl/host_resource.h"
16 #include "ppapi/shared_impl/ppb_instance_shared.h" 17 #include "ppapi/shared_impl/ppb_instance_shared.h"
17 #include "ppapi/shared_impl/singleton_resource_id.h" 18 #include "ppapi/shared_impl/singleton_resource_id.h"
18 #include "ppapi/thunk/ppb_instance_api.h" 19 #include "ppapi/thunk/ppb_instance_api.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 PP_Instance instance, 124 PP_Instance instance,
124 PP_URLComponents_Dev* components) OVERRIDE; 125 PP_URLComponents_Dev* components) OVERRIDE;
125 virtual PP_Var GetPluginReferrerURL( 126 virtual PP_Var GetPluginReferrerURL(
126 PP_Instance instance, 127 PP_Instance instance,
127 PP_URLComponents_Dev* components) OVERRIDE; 128 PP_URLComponents_Dev* components) OVERRIDE;
128 virtual void PromiseResolved(PP_Instance instance, 129 virtual void PromiseResolved(PP_Instance instance,
129 uint32 promise_id) OVERRIDE; 130 uint32 promise_id) OVERRIDE;
130 virtual void PromiseResolvedWithSession(PP_Instance instance, 131 virtual void PromiseResolvedWithSession(PP_Instance instance,
131 uint32 promise_id, 132 uint32 promise_id,
132 PP_Var web_session_id_var) OVERRIDE; 133 PP_Var web_session_id_var) OVERRIDE;
134 virtual void PromiseResolvedWithKeyIds(PP_Instance instance,
135 uint32 promise_id,
136 PP_Var key_ids_var) OVERRIDE;
133 virtual void PromiseRejected(PP_Instance instance, 137 virtual void PromiseRejected(PP_Instance instance,
134 uint32 promise_id, 138 uint32 promise_id,
135 PP_CdmExceptionCode exception_code, 139 PP_CdmExceptionCode exception_code,
136 uint32 system_code, 140 uint32 system_code,
137 PP_Var error_description_var) OVERRIDE; 141 PP_Var error_description_var) OVERRIDE;
138 virtual void SessionMessage(PP_Instance instance, 142 virtual void SessionMessage(PP_Instance instance,
139 PP_Var web_session_id_var, 143 PP_Var web_session_id_var,
140 PP_Var message_var, 144 PP_Var message_var,
141 PP_Var destination_url_var) OVERRIDE; 145 PP_Var destination_url_var) OVERRIDE;
146 virtual void SessionKeysChange(PP_Instance instance,
147 PP_Var web_session_id_var,
148 PP_Bool has_additional_usable_key) OVERRIDE;
149 virtual void SessionExpirationChange(PP_Instance instance,
150 PP_Var web_session_id_var,
151 PP_Time new_expiry_time) OVERRIDE;
142 virtual void SessionReady(PP_Instance instance, 152 virtual void SessionReady(PP_Instance instance,
143 PP_Var web_session_id_var) OVERRIDE; 153 PP_Var web_session_id_var) OVERRIDE;
144 virtual void SessionClosed(PP_Instance instance, 154 virtual void SessionClosed(PP_Instance instance,
145 PP_Var web_session_id_var) OVERRIDE; 155 PP_Var web_session_id_var) OVERRIDE;
146 virtual void SessionError(PP_Instance instance, 156 virtual void SessionError(PP_Instance instance,
147 PP_Var web_session_id_var, 157 PP_Var web_session_id_var,
148 PP_CdmExceptionCode exception_code, 158 PP_CdmExceptionCode exception_code,
149 uint32 system_code, 159 uint32 system_code,
150 PP_Var error_description_var) OVERRIDE; 160 PP_Var error_description_var) OVERRIDE;
151 virtual void DeliverBlock(PP_Instance instance, 161 virtual void DeliverBlock(PP_Instance instance,
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 SerializedVarReturnValue result); 257 SerializedVarReturnValue result);
248 void OnHostMsgGetPluginReferrerURL(PP_Instance instance, 258 void OnHostMsgGetPluginReferrerURL(PP_Instance instance,
249 SerializedVarReturnValue result); 259 SerializedVarReturnValue result);
250 260
251 virtual void OnHostMsgPromiseResolved(PP_Instance instance, 261 virtual void OnHostMsgPromiseResolved(PP_Instance instance,
252 uint32_t promise_id); 262 uint32_t promise_id);
253 virtual void OnHostMsgPromiseResolvedWithSession( 263 virtual void OnHostMsgPromiseResolvedWithSession(
254 PP_Instance instance, 264 PP_Instance instance,
255 uint32_t promise_id, 265 uint32_t promise_id,
256 SerializedVarReceiveInput web_session_id); 266 SerializedVarReceiveInput web_session_id);
267 virtual void OnHostMsgPromiseResolvedWithKeyIds(
268 PP_Instance instance,
269 uint32 promise_id,
270 const std::vector<std::vector<uint8_t> >& key_ids);
257 virtual void OnHostMsgPromiseRejected( 271 virtual void OnHostMsgPromiseRejected(
258 PP_Instance instance, 272 PP_Instance instance,
259 uint32_t promise_id, 273 uint32_t promise_id,
260 PP_CdmExceptionCode exception_code, 274 PP_CdmExceptionCode exception_code,
261 uint32_t system_code, 275 uint32_t system_code,
262 SerializedVarReceiveInput error_description); 276 SerializedVarReceiveInput error_description);
263 virtual void OnHostMsgSessionMessage( 277 virtual void OnHostMsgSessionMessage(
264 PP_Instance instance, 278 PP_Instance instance,
265 SerializedVarReceiveInput web_session_id, 279 SerializedVarReceiveInput web_session_id,
266 SerializedVarReceiveInput message, 280 SerializedVarReceiveInput message,
267 SerializedVarReceiveInput destination_url); 281 SerializedVarReceiveInput destination_url);
282 virtual void OnHostMsgSessionKeysChange(PP_Instance instance,
283 const std::string& web_session_id,
284 PP_Bool has_additional_usable_key);
285 virtual void OnHostMsgSessionExpirationChange(
286 PP_Instance instance,
287 const std::string& web_session_id,
288 PP_Time new_expiry_time);
268 virtual void OnHostMsgSessionReady(PP_Instance instance, 289 virtual void OnHostMsgSessionReady(PP_Instance instance,
269 SerializedVarReceiveInput web_session_id); 290 SerializedVarReceiveInput web_session_id);
270 virtual void OnHostMsgSessionClosed(PP_Instance instance, 291 virtual void OnHostMsgSessionClosed(PP_Instance instance,
271 SerializedVarReceiveInput web_session_id); 292 SerializedVarReceiveInput web_session_id);
272 virtual void OnHostMsgSessionError( 293 virtual void OnHostMsgSessionError(
273 PP_Instance instance, 294 PP_Instance instance,
274 SerializedVarReceiveInput web_session_id, 295 SerializedVarReceiveInput web_session_id,
275 PP_CdmExceptionCode exception_code, 296 PP_CdmExceptionCode exception_code,
276 uint32_t system_code, 297 uint32_t system_code,
277 SerializedVarReceiveInput error_description); 298 SerializedVarReceiveInput error_description);
(...skipping 29 matching lines...) Expand all
307 // Other helpers. 328 // Other helpers.
308 void CancelAnyPendingRequestSurroundingText(PP_Instance instance); 329 void CancelAnyPendingRequestSurroundingText(PP_Instance instance);
309 330
310 ProxyCompletionCallbackFactory<PPB_Instance_Proxy> callback_factory_; 331 ProxyCompletionCallbackFactory<PPB_Instance_Proxy> callback_factory_;
311 }; 332 };
312 333
313 } // namespace proxy 334 } // namespace proxy
314 } // namespace ppapi 335 } // namespace ppapi
315 336
316 #endif // PPAPI_PROXY_PPB_INSTANCE_PROXY_H_ 337 #endif // PPAPI_PROXY_PPB_INSTANCE_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698