Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ppapi / thunk / ppb_instance_api.h

diff --git a/src/ppapi/thunk/ppb_instance_api.h b/src/ppapi/thunk/ppb_instance_api.h
index 263b49c..997c32e 100644 (file)
--- a/src/ppapi/thunk/ppb_instance_api.h
+++ b/src/ppapi/thunk/ppb_instance_api.h
@@ -7,10 +7,12 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "ppapi/c/dev/ppb_messaging_deprecated.h"
 #include "ppapi/c/dev/ppb_url_util_dev.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_size.h"
+#include "ppapi/c/pp_time.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/ppb_console.h"
 #include "ppapi/c/ppb_gamepad.h"
@@ -30,7 +32,7 @@
 
 struct PP_DecryptedBlockInfo;
 struct PP_DecryptedFrameInfo;
-struct PPP_MessageHandler_0_1;
+struct PPP_MessageHandler_0_2;
 
 namespace ppapi {
 
@@ -117,8 +119,13 @@ class PPB_Instance_API {
   virtual void PostMessage(PP_Instance instance, PP_Var message) = 0;
   virtual int32_t RegisterMessageHandler(PP_Instance instance,
                                          void* user_data,
-                                         const PPP_MessageHandler_0_1* handler,
+                                         const PPP_MessageHandler_0_2* handler,
                                          PP_Resource message_loop) = 0;
+  virtual int32_t RegisterMessageHandler_1_1_Deprecated(
+      PP_Instance instance,
+      void* user_data,
+      const PPP_MessageHandler_0_1_Deprecated* handler,
+      PP_Resource message_loop) = 0;
   virtual void UnregisterMessageHandler(PP_Instance instance) = 0;
 
   // Mouse cursor.
@@ -159,6 +166,9 @@ class PPB_Instance_API {
   virtual void PromiseResolvedWithSession(PP_Instance instance,
                                           uint32 promise_id,
                                           PP_Var web_session_id_var) = 0;
+  virtual void PromiseResolvedWithKeyIds(PP_Instance instance,
+                                         uint32 promise_id,
+                                         PP_Var key_ids_var) = 0;
   virtual void PromiseRejected(PP_Instance instance,
                                uint32 promise_id,
                                PP_CdmExceptionCode exception_code,
@@ -168,6 +178,12 @@ class PPB_Instance_API {
                               PP_Var web_session_id_var,
                               PP_Var message_var,
                               PP_Var destination_url_var) = 0;
+  virtual void SessionKeysChange(PP_Instance instance,
+                                 PP_Var web_session_id_var,
+                                 PP_Bool has_additional_usable_key) = 0;
+  virtual void SessionExpirationChange(PP_Instance instance,
+                                       PP_Var web_session_id_var,
+                                       PP_Time new_expiry_time) = 0;
   virtual void SessionReady(PP_Instance instance,
                             PP_Var web_session_id_var) = 0;
   virtual void SessionClosed(PP_Instance instance,