Add Promises for EME (Chromium side)

content/renderer/pepper/content_decryptor_delegate.cc

Index: content/renderer/pepper/content_decryptor_delegate.cc
diff --git a/content/renderer/pepper/content_decryptor_delegate.cc b/content/renderer/pepper/content_decryptor_delegate.cc
index a10b741864515479e92f5ed23d65eb3936066c36..4f6cdf533a1b6d17bce0f0b4b12db0356c9fa3bc 100644
--- a/content/renderer/pepper/content_decryptor_delegate.cc
+++ b/content/renderer/pepper/content_decryptor_delegate.cc
@@ -16,6 +16,7 @@
 #include "media/base/data_buffer.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
+#include "media/base/media_keys_session_promise.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
@@ -245,6 +246,19 @@ media::SampleFormat PpDecryptedSampleFormatToMediaSampleFormat(
   }
 }
 
+PP_SessionType MediaSessionTypeToPpSessionType(
+    media::MediaKeys::SessionType session_type) {
+  switch (session_type) {
+    case media::MediaKeys::SessionType::kTemporary:
+      return PP_SESSIONTYPE_TEMPORARY;
+    case media::MediaKeys::SessionType::kPersistent:
+      return PP_SESSIONTYPE_PERSISTENT;
+    default:
+      NOTREACHED();
+      return PP_SESSIONTYPE_TEMPORARY;
+  }
+}
+
 }  // namespace
 
 ContentDecryptorDelegate::ContentDecryptorDelegate(
@@ -256,6 +270,7 @@ ContentDecryptorDelegate::ContentDecryptorDelegate(
       audio_samples_per_second_(0),
       audio_channel_count_(0),
       audio_channel_layout_(media::CHANNEL_LAYOUT_NONE),
+      next_promise_id_(0),
       weak_ptr_factory_(this) {
   weak_this_ = weak_ptr_factory_.GetWeakPtr();
 }
@@ -266,7 +281,6 @@ ContentDecryptorDelegate::~ContentDecryptorDelegate() {
 
 void ContentDecryptorDelegate::Initialize(
     const std::string& key_system,
-    const media::SessionCreatedCB& session_created_cb,
     const media::SessionMessageCB& session_message_cb,
     const media::SessionReadyCB& session_ready_cb,
     const media::SessionClosedCB& session_closed_cb,
@@ -276,7 +290,6 @@ void ContentDecryptorDelegate::Initialize(
   DCHECK(key_system_.empty());
   key_system_ = key_system;
 
-  session_created_cb_ = session_created_cb;
   session_message_cb_ = session_message_cb;
   session_ready_cb_ = session_ready_cb;
   session_closed_cb_ = session_closed_cb;
@@ -292,42 +305,54 @@ void ContentDecryptorDelegate::InstanceCrashed() {
   SatisfyAllPendingCallbacksOnError();
 }
 
-bool ContentDecryptorDelegate::CreateSession(uint32 session_id,
-                                             const std::string& content_type,
-                                             const uint8* init_data,
-                                             int init_data_length) {
+void ContentDecryptorDelegate::CreateSession(
+    const std::string& init_data_type,
+    const uint8* init_data,
+    int init_data_length,
+    media::MediaKeys::SessionType session_type,
+    scoped_ptr<media::MediaKeysSessionPromise> promise) {
+  uint32_t promise_id = SavePromise(promise.Pass());
   PP_Var init_data_array =
       PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
           init_data_length, init_data);
-
   plugin_decryption_interface_->CreateSession(
       pp_instance_,
-      session_id,
-      StringVar::StringToPPVar(content_type),
-      init_data_array);
-  return true;
+      promise_id,
+      StringVar::StringToPPVar(init_data_type),
+      init_data_array,
+      MediaSessionTypeToPpSessionType(session_type));
 }
 
-void ContentDecryptorDelegate::LoadSession(uint32 session_id,
-                                           const std::string& web_session_id) {
+void ContentDecryptorDelegate::LoadSession(
+    const std::string& web_session_id,
+    scoped_ptr<media::MediaKeysSessionPromise> promise) {
+  uint32_t promise_id = SavePromise(promise.Pass());
   plugin_decryption_interface_->LoadSession(
-      pp_instance_, session_id, StringVar::StringToPPVar(web_session_id));
+      pp_instance_, promise_id, StringVar::StringToPPVar(web_session_id));
 }
 
-bool ContentDecryptorDelegate::UpdateSession(uint32 session_id,
-                                             const uint8* response,
-                                             int response_length) {
+void ContentDecryptorDelegate::UpdateSession(
+    const std::string& web_session_id,
+    const uint8* response,
+    int response_length,
+    scoped_ptr<media::MediaKeysSessionPromise> promise) {
+  uint32_t promise_id = SavePromise(promise.Pass());
   PP_Var response_array =
       PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
           response_length, response);
   plugin_decryption_interface_->UpdateSession(
-      pp_instance_, session_id, response_array);
-  return true;
+      pp_instance_,
+      promise_id,
+      StringVar::StringToPPVar(web_session_id),
+      response_array);
 }
 
-bool ContentDecryptorDelegate::ReleaseSession(uint32 session_id) {
-  plugin_decryption_interface_->ReleaseSession(pp_instance_, session_id);
-  return true;
+void ContentDecryptorDelegate::ReleaseSession(
+    const std::string& web_session_id,
+    scoped_ptr<media::MediaKeysSessionPromise> promise) {
+  uint32_t promise_id = SavePromise(promise.Pass());
+  plugin_decryption_interface_->ReleaseSession(
+      pp_instance_, promise_id, StringVar::StringToPPVar(web_session_id));
 }
 
 // TODO(xhwang): Remove duplication of code in Decrypt(),
@@ -573,68 +598,103 @@ bool ContentDecryptorDelegate::DecryptAndDecodeVideo(
   return true;
 }
 
-void ContentDecryptorDelegate::OnSessionCreated(uint32 session_id,
-                                                PP_Var web_session_id_var) {
-  if (session_created_cb_.is_null())
-    return;
+void ContentDecryptorDelegate::OnPromiseResolved(uint32 promise_id) {
+  scoped_ptr<media::MediaKeysSessionPromise> promise = FindPromise(promise_id);
+  promise->resolve();
+  promise.reset();
+}
 
-  StringVar* session_id_string = StringVar::FromPPVar(web_session_id_var);
+void ContentDecryptorDelegate::OnPromiseResolvedWithSession(
+    uint32 promise_id,
+    PP_Var web_session_id_var) {
+  scoped_ptr<media::MediaKeysSessionPromise> promise = FindPromise(promise_id);
 
-  if (!session_id_string) {
-    OnSessionError(session_id, media::MediaKeys::kUnknownError, 0);
-    return;
-  }
+  StringVar* web_session_id = StringVar::FromPPVar(web_session_id_var);
+  DCHECK(web_session_id);
 
-  session_created_cb_.Run(session_id, session_id_string->value());
+  promise->resolve(web_session_id->value());
+  promise.reset();
 }
 
-void ContentDecryptorDelegate::OnSessionMessage(uint32 session_id,
+void ContentDecryptorDelegate::OnPromiseRejected(uint32 promise_id,
+                                                 PP_Var error_name_var,
+                                                 uint32 system_code,
+                                                 PP_Var error_description_var) {
+  scoped_ptr<media::MediaKeysSessionPromise> promise = FindPromise(promise_id);
+
+  StringVar* error_name = StringVar::FromPPVar(error_name_var);
+  DCHECK(error_name);
+
+  StringVar* error_description = StringVar::FromPPVar(error_description_var);
+  DCHECK(error_description);
+
+  promise->reject(error_name->value(), system_code, error_description->value());
+  promise.reset();
+}
+
+void ContentDecryptorDelegate::OnSessionMessage(PP_Var web_session_id_var,
                                                 PP_Var message_var,
-                                                PP_Var default_url_var) {
+                                                PP_Var destination_url_var) {
   if (session_message_cb_.is_null())
     return;
 
-  ArrayBufferVar* message_array_buffer = ArrayBufferVar::FromPPVar(message_var);
+  StringVar* web_session_id = StringVar::FromPPVar(web_session_id_var);
+  DCHECK(web_session_id);
 
+  ArrayBufferVar* message_array_buffer = ArrayBufferVar::FromPPVar(message_var);
   std::vector<uint8> message;
   if (message_array_buffer) {
     const uint8* data = static_cast<const uint8*>(message_array_buffer->Map());
     message.assign(data, data + message_array_buffer->ByteLength());
   }
 
-  StringVar* default_url_string = StringVar::FromPPVar(default_url_var);
+  StringVar* destination_url_string = StringVar::FromPPVar(destination_url_var);
+  DCHECK(destination_url_string);
 
-  if (!default_url_string) {
-    OnSessionError(session_id, media::MediaKeys::kUnknownError, 0);
-    return;
-  }
-
-  session_message_cb_.Run(session_id, message, default_url_string->value());
+  session_message_cb_.Run(
+      web_session_id->value(), message, destination_url_string->value());
 }
 
-void ContentDecryptorDelegate::OnSessionReady(uint32 session_id) {
+void ContentDecryptorDelegate::OnSessionReady(PP_Var web_session_id_var) {
   if (session_ready_cb_.is_null())
     return;
 
-  session_ready_cb_.Run(session_id);
+  StringVar* web_session_id = StringVar::FromPPVar(web_session_id_var);
+  DCHECK(web_session_id);
+
+  session_ready_cb_.Run(web_session_id->value());
 }
 
-void ContentDecryptorDelegate::OnSessionClosed(uint32 session_id) {
+void ContentDecryptorDelegate::OnSessionClosed(PP_Var web_session_id_var) {
   if (session_closed_cb_.is_null())
     return;
 
-  session_closed_cb_.Run(session_id);
+  StringVar* web_session_id = StringVar::FromPPVar(web_session_id_var);
+  DCHECK(web_session_id);
+
+  session_closed_cb_.Run(web_session_id->value());
 }
 
-void ContentDecryptorDelegate::OnSessionError(uint32 session_id,
-                                              int32_t media_error,
-                                              uint32_t system_code) {
+void ContentDecryptorDelegate::OnSessionError(PP_Var web_session_id_var,
+                                              PP_Var error_name_var,
+                                              uint32 system_code,
+                                              PP_Var error_description_var) {
   if (session_error_cb_.is_null())
     return;
 
-  session_error_cb_.Run(session_id,
-                        static_cast<media::MediaKeys::KeyError>(media_error),
-                        system_code);
+  StringVar* web_session_id = StringVar::FromPPVar(web_session_id_var);
+  DCHECK(web_session_id);
+
+  StringVar* error_name = StringVar::FromPPVar(error_name_var);
+  DCHECK(error_name);
+
+  StringVar* error_description = StringVar::FromPPVar(error_description_var);
+  DCHECK(error_description);
+
+  session_error_cb_.Run(web_session_id->value(),
+                        error_name->value(),
+                        system_code,
+                        error_description->value());
 }
 
 void ContentDecryptorDelegate::DecoderInitializeDone(
@@ -1064,4 +1124,21 @@ void ContentDecryptorDelegate::SatisfyAllPendingCallbacksOnError() {
     video_decode_cb_.ResetAndReturn().Run(media::Decryptor::kError, NULL);
 }
 
+uint32_t ContentDecryptorDelegate::SavePromise(
+    scoped_ptr<media::MediaKeysSessionPromise> promise) {
+  uint32_t promise_id = ++next_promise_id_;
+  promises_.insert(std::make_pair(promise_id, promise.release()));
+  return promise_id;
+}
+
+scoped_ptr<media::MediaKeysSessionPromise>
+ContentDecryptorDelegate::FindPromise(uint32_t promise_id) {
+  std::map<uint32_t, media::MediaKeysSessionPromise*>::iterator it =
+      promises_.find(promise_id);
+  DCHECK(it != promises_.end());
+  scoped_ptr<media::MediaKeysSessionPromise> result(it->second);
+  promises_.erase(it);
+  return result.Pass();
+}
+
 }  // namespace content