Initialize the CDM asynchronously

media/cdm/ppapi/cdm_adapter.cc

 // Copyright 2013 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.
 
 #include "media/cdm/ppapi/cdm_adapter.h"
 
 #include "media/base/limits.h"
 #include "media/cdm/ppapi/cdm_file_io_impl.h"
 #include "media/cdm/ppapi/cdm_helpers.h"
 #include "media/cdm/ppapi/cdm_logging.h"
@@ skipping 316 matching lines @@
       deferred_audio_decoder_config_id_(0),
       deferred_initialize_video_decoder_(false),
       deferred_video_decoder_config_id_(0),
       last_read_file_size_kb_(0),
       file_size_uma_reported_(false) {
   callback_factory_.Initialize(this);
 }
 
 CdmAdapter::~CdmAdapter() {}
 
 bool CdmAdapter::CreateCdmInstance(const std::string& key_system) {

[ddorwin, 2015/05/04 22:46:02]

This can probably be simplified too. We can just return a pointer that the
caller can assign to cdm_.

[jrummell, 2015/05/05 00:54:18]

Done.

   PP_DCHECK(!cdm_);
   cdm_ = make_linked_ptr(CdmWrapper::Create(
       key_system.data(), key_system.size(), GetCdmHost, this));
   bool success = cdm_ != NULL;
 
   const std::string message = "CDM instance for " + key_system +
                               (success ? "" : " could not be") + " created.";
   DLOG_TO_CONSOLE(message);
   CDM_DLOG() << message;
 
   return success;
 }
 
-// No errors should be reported in this function because the spec says:
-// "Store this new error object internally with the MediaKeys instance being
-// created. This will be used to fire an error against any session created for
-// this instance." These errors will be reported during session creation
-// (CreateSession()) or session loading (LoadSession()).
-// TODO(xhwang): If necessary, we need to store the error here if we want to
-// support more specific error reporting (other than "Unknown").
-void CdmAdapter::Initialize(const std::string& key_system,
+void CdmAdapter::Initialize(uint32_t promise_id,
+                            const std::string& key_system,
                             bool allow_distinctive_identifier,
                             bool allow_persistent_state) {
   PP_DCHECK(!key_system.empty());
-  // TODO(jrummell): Remove this check when CDM creation is asynchronous.
-  // http://crbug.com/469003
-  PP_DCHECK(key_system_.empty() || (key_system_ == key_system && cdm_));
 
 #if defined(CHECK_DOCUMENT_URL)
   PP_URLComponents_Dev url_components = {};
   const pp::URLUtil_Dev* url_util = pp::URLUtil_Dev::Get();
-  if (!url_util)
+  if (!url_util) {
+    RejectPromise(promise_id, cdm::kInvalidAccessError, 0,

[ddorwin, 2015/05/04 22:46:02]

Not sure this is correct. Probably kUnknownError.

[jrummell, 2015/05/05 00:54:17]

Done.

+                  "Unable to determine origin.");
     return;
+  }
+
   pp::Var href = url_util->GetDocumentURL(pp::InstanceHandle(pp_instance()),
                                           &url_components);
   PP_DCHECK(href.is_string());
   std::string url = href.AsString();
   PP_DCHECK(!url.empty());
   std::string url_scheme =
       url.substr(url_components.scheme.begin, url_components.scheme.len);
   if (url_scheme != "file") {
     // Skip this check for file:// URLs as they don't have a host component.
     PP_DCHECK(url_components.host.begin);
     PP_DCHECK(0 < url_components.host.len);
   }
 #endif  // defined(CHECK_DOCUMENT_URL)
 
-  if (!cdm_ && !CreateCdmInstance(key_system))
+  if (!cdm_ && !CreateCdmInstance(key_system)) {

[ddorwin, 2015/05/04 22:46:02]

I think cdm_ must be NULL. You can DCHECK at 356.

[jrummell, 2015/05/05 00:54:17]

Done.

+    RejectPromise(promise_id, cdm::kInvalidAccessError, 0,
+                  "Unable to create CDM.");
     return;
+  }
 
   PP_DCHECK(cdm_);
   key_system_ = key_system;
   allow_distinctive_identifier_ = allow_distinctive_identifier;
   allow_persistent_state_ = allow_persistent_state;
   cdm_->Initialize(allow_distinctive_identifier, allow_persistent_state);
+  OnResolvePromise(promise_id);
 }
 
 void CdmAdapter::SetServerCertificate(uint32_t promise_id,
                                       pp::VarArrayBuffer server_certificate) {
   const uint8_t* server_certificate_ptr =
       static_cast<const uint8_t*>(server_certificate.Map());
   const uint32_t server_certificate_size = server_certificate.ByteLength();
 
   if (!server_certificate_ptr ||
       server_certificate_size < media::limits::kMinCertificateLength ||
       server_certificate_size > media::limits::kMaxCertificateLength) {
     RejectPromise(
         promise_id, cdm::kInvalidAccessError, 0, "Incorrect certificate.");
     return;
   }
 
-  // Initialize() doesn't report an error, so SetServerCertificate() can be
-  // called even if Initialize() failed.
-  // TODO(jrummell): Remove this code when prefixed EME gets removed.
-  if (!cdm_) {
-    RejectPromise(promise_id,
-                  cdm::kInvalidStateError,
-                  0,
-                  "CDM has not been initialized.");
-    return;
-  }
-
   cdm_->SetServerCertificate(
       promise_id, server_certificate_ptr, server_certificate_size);
 }
 
 void CdmAdapter::CreateSessionAndGenerateRequest(uint32_t promise_id,
                                                  PP_SessionType session_type,
                                                  PP_InitDataType init_data_type,
                                                  pp::VarArrayBuffer init_data) {
-  // Initialize() doesn't report an error, so CreateSession() can be called
-  // even if Initialize() failed.
-  // TODO(jrummell): Remove this code when prefixed EME gets removed.
-  // TODO(jrummell): Verify that Initialize() failing does not resolve the
-  // MediaKeys.create() promise.
-  if (!cdm_) {
-    RejectPromise(promise_id,
-                  cdm::kInvalidStateError,
-                  0,
-                  "CDM has not been initialized.");
-    return;
-  }
-
   cdm_->CreateSessionAndGenerateRequest(
       promise_id, PpSessionTypeToCdmSessionType(session_type),
       PpInitDataTypeToCdmInitDataType(init_data_type),
       static_cast<const uint8_t*>(init_data.Map()), init_data.ByteLength());
 }
 
 void CdmAdapter::LoadSession(uint32_t promise_id,
                              PP_SessionType session_type,
                              const std::string& session_id) {
-  // Initialize() doesn't report an error, so LoadSession() can be called
-  // even if Initialize() failed.
-  // TODO(jrummell): Remove this code when prefixed EME gets removed.
-  // TODO(jrummell): Verify that Initialize() failing does not resolve the
-  // MediaKeys.create() promise.
-  if (!cdm_) {
-    RejectPromise(promise_id,
-                  cdm::kInvalidStateError,
-                  0,
-                  "CDM has not been initialized.");
-    return;
-  }
-
   cdm_->LoadSession(promise_id, PpSessionTypeToCdmSessionType(session_type),
                     session_id.data(), session_id.size());
 }
 
 void CdmAdapter::UpdateSession(uint32_t promise_id,
                                const std::string& session_id,
                                pp::VarArrayBuffer response) {
   const uint8_t* response_ptr = static_cast<const uint8_t*>(response.Map());
   const uint32_t response_size = response.ByteLength();
 
@@ skipping 899 matching lines @@
 }  // namespace media
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new media::CdmAdapterModule();
 }
 
 }  // namespace pp