Add Promises for EME (Chromium side)

ppapi/thunk/ppb_content_decryptor_private_thunk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // From private/ppb_content_decryptor_private.idl,
-//   modified Wed Feb 26 16:37:47 2014.
+//   modified Thu May  1 10:21:10 2014.
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_content_decryptor_private.h"
 #include "ppapi/shared_impl/tracked_callback.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
 
 namespace {
 
-void SessionCreated(PP_Instance instance,
-                    uint32_t session_id,
-                    struct PP_Var web_session_id) {
-  VLOG(4) << "PPB_ContentDecryptor_Private::SessionCreated()";
+void PromiseResolved(PP_Instance instance, uint32_t promise_id) {
+  VLOG(4) << "PPB_ContentDecryptor_Private::PromiseResolved()";
   EnterInstance enter(instance);
   if (enter.failed())
     return;
-  enter.functions()->SessionCreated(instance, session_id, web_session_id);
+  enter.functions()->PromiseResolved(instance, promise_id);
+}
+
+void PromiseResolvedWithSession(PP_Instance instance,
+                                uint32_t promise_id,
+                                struct PP_Var web_session_id) {
+  VLOG(4) << "PPB_ContentDecryptor_Private::PromiseResolvedWithSession()";
+  EnterInstance enter(instance);
+  if (enter.failed())
+    return;
+  enter.functions()->PromiseResolvedWithSession(instance,
+                                                promise_id,
+                                                web_session_id);
+}
+
+void PromiseRejected(PP_Instance instance,
+                     uint32_t promise_id,
+                     struct PP_Var error_name,
+                     uint32_t system_code,
+                     struct PP_Var error_description) {
+  VLOG(4) << "PPB_ContentDecryptor_Private::PromiseRejected()";
+  EnterInstance enter(instance);
+  if (enter.failed())
+    return;
+  enter.functions()->PromiseRejected(instance,
+                                     promise_id,
+                                     error_name,
+                                     system_code,
+                                     error_description);
 }
 
 void SessionMessage(PP_Instance instance,
-                    uint32_t session_id,
+                    struct PP_Var web_session_id,
                     struct PP_Var message,
                     struct PP_Var destination_url) {
   VLOG(4) << "PPB_ContentDecryptor_Private::SessionMessage()";
   EnterInstance enter(instance);
   if (enter.failed())
     return;
   enter.functions()->SessionMessage(instance,
-                                    session_id,
+                                    web_session_id,
                                     message,
                                     destination_url);
 }
 
-void SessionReady(PP_Instance instance, uint32_t session_id) {
+void SessionReady(PP_Instance instance, struct PP_Var web_session_id) {
   VLOG(4) << "PPB_ContentDecryptor_Private::SessionReady()";
   EnterInstance enter(instance);
   if (enter.failed())
     return;
-  enter.functions()->SessionReady(instance, session_id);
+  enter.functions()->SessionReady(instance, web_session_id);
 }
 
-void SessionClosed(PP_Instance instance, uint32_t session_id) {
+void SessionClosed(PP_Instance instance, struct PP_Var web_session_id) {
   VLOG(4) << "PPB_ContentDecryptor_Private::SessionClosed()";
   EnterInstance enter(instance);
   if (enter.failed())
     return;
-  enter.functions()->SessionClosed(instance, session_id);
+  enter.functions()->SessionClosed(instance, web_session_id);
 }
 
 void SessionError(PP_Instance instance,
-                  uint32_t session_id,
-                  int32_t media_error,
-                  uint32_t system_code) {
+                  struct PP_Var web_session_id,
+                  struct PP_Var error_name,
+                  uint32_t system_code,
+                  struct PP_Var error_description) {
   VLOG(4) << "PPB_ContentDecryptor_Private::SessionError()";
   EnterInstance enter(instance);
   if (enter.failed())
     return;
   enter.functions()->SessionError(instance,
-                                  session_id,
-                                  media_error,
-                                  system_code);
+                                  web_session_id,
+                                  error_name,
+                                  system_code,
+                                  error_description);
 }
 
 void DeliverBlock(PP_Instance instance,
                   PP_Resource decrypted_block,
                   const struct PP_DecryptedBlockInfo* decrypted_block_info) {
   VLOG(4) << "PPB_ContentDecryptor_Private::DeliverBlock()";
   EnterInstance enter(instance);
   if (enter.failed())
     return;
   enter.functions()->DeliverBlock(instance,
@@ skipping 55 matching lines @@
     const struct PP_DecryptedSampleInfo* decrypted_sample_info) {
   VLOG(4) << "PPB_ContentDecryptor_Private::DeliverSamples()";
   EnterInstance enter(instance);
   if (enter.failed())
     return;
   enter.functions()->DeliverSamples(instance,
                                     audio_frames,
                                     decrypted_sample_info);
 }
 
-const PPB_ContentDecryptor_Private_0_11
-    g_ppb_contentdecryptor_private_thunk_0_11 = {
-  &SessionCreated,
+const PPB_ContentDecryptor_Private_0_12
+    g_ppb_contentdecryptor_private_thunk_0_12 = {
+  &PromiseResolved,
+  &PromiseResolvedWithSession,
+  &PromiseRejected,
   &SessionMessage,
   &SessionReady,
   &SessionClosed,
   &SessionError,
   &DeliverBlock,
   &DecoderInitializeDone,
   &DecoderDeinitializeDone,
   &DecoderResetDone,
   &DeliverFrame,
   &DeliverSamples
 };
 
 }  // namespace
 
-PPAPI_THUNK_EXPORT const PPB_ContentDecryptor_Private_0_11*
-    GetPPB_ContentDecryptor_Private_0_11_Thunk() {
-  return &g_ppb_contentdecryptor_private_thunk_0_11;
+PPAPI_THUNK_EXPORT const PPB_ContentDecryptor_Private_0_12*
+    GetPPB_ContentDecryptor_Private_0_12_Thunk() {
+  return &g_ppb_contentdecryptor_private_thunk_0_12;
 }
 
 }  // namespace thunk
 }  // namespace ppapi