Support LoadSession() in MediaKeys and PPP_ContentDecryptor_Private interface.

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/cdm/ppapi/cdm_file_io_impl.h"
 #include "media/cdm/ppapi/cdm_helpers.h"
 #include "media/cdm/ppapi/cdm_logging.h"
 #include "media/cdm/ppapi/supported_cdm_versions.h"
@@ skipping 232 matching lines @@
   const std::string message = "CDM instance for " + key_system +
                               (success ? "" : " could not be") + " created.";
   DLOG_TO_CONSOLE(message);
   CDM_DLOG() << message;
 
   return success;
 }
 
 // No KeyErrors should be reported in this function because they cannot be
 // bubbled up in the WD EME API. Those errors will be reported during session
-// creation (CreateSession).
+// creation (CreateSession()) or session loading (LoadSession()).

[ddorwin, 2014/02/10 19:05:25]

Technically, the spec says errors are to be saved then reported when those
functions are called. This implementation may be sufficient, but maybe not if we
need to be more specific than "Unknown". Maybe we should add a TODO or bug to
check this later.

[xhwang, 2014/02/10 22:30:55]

Done.

 void CdmAdapter::Initialize(const std::string& key_system) {
   PP_DCHECK(!key_system.empty());
   PP_DCHECK(key_system_.empty() || (key_system_ == key_system && cdm_));
 
   if (!cdm_ && !CreateCdmInstance(key_system))
     return;
 
   PP_DCHECK(cdm_);
   key_system_ = key_system;
 }
 
 void CdmAdapter::CreateSession(uint32_t session_id,
-                               const std::string& type,
+                               const std::string& content_type,
                                pp::VarArrayBuffer init_data) {
   // Initialize() doesn't report an error, so CreateSession() can be called
   // even if Initialize() failed.
   if (!cdm_) {
     OnSessionError(session_id, cdm::kUnknownError, 0);
     return;
   }
 
 #if defined(CHECK_DOCUMENT_URL)
   PP_URLComponents_Dev url_components = {};
   const pp::URLUtil_Dev* url_util = pp::URLUtil_Dev::Get();
   if (!url_util) {
     OnSessionError(session_id, cdm::kUnknownError, 0);
     return;
   }
   pp::Var href = url_util->GetDocumentURL(
       pp::InstanceHandle(pp_instance()), &url_components);
   PP_DCHECK(href.is_string());
   PP_DCHECK(!href.AsString().empty());
   PP_DCHECK(url_components.host.begin);
   PP_DCHECK(0 < url_components.host.len);
 #endif  // defined(CHECK_DOCUMENT_URL)
 
   cdm_->CreateSession(session_id,
-                      type.data(),
-                      type.size(),
+                      content_type.data(),
+                      content_type.size(),
                       static_cast<const uint8_t*>(init_data.Map()),
                       init_data.ByteLength());
 }
 
+void CdmAdapter::LoadSession(uint32_t session_id,
+                             const std::string& web_session_id) {
+  // Initialize() doesn't report an error, so LoadSession() can be called
+  // even if Initialize() failed.
+  if (!cdm_ ||

[ddorwin, 2014/02/10 19:05:25]

These two reasons for returning an error are distinctly different (and this one
may need to change - see above), so I think it's worth separating the checks and
returns. WDYT?

[xhwang, 2014/02/10 22:30:55]

Done.

+      cdm_->GetCdmVersion() < cdm::ContentDecryptionModule_4::kVersion) {

[xhwang, 2014/02/08 01:05:25]

Currently CdmWrapper doesn't have access to SendSessionError(), so we check the
version here so that if the CDM doesn't support LoadSession, we can fire
SessionError.

[ddorwin, 2014/02/10 19:05:25]

Would it be better to temporarily add a bool return to CdmWrapper::LoadSession()
and let the wrapper decide whether it's supported?

[xhwang, 2014/02/10 22:30:55]

Done.

+    OnSessionError(session_id, cdm::kUnknownError, 0);
+    return;
+  }
+
+  cdm_->LoadSession(session_id, web_session_id.data(), web_session_id.size());
+}
+
 void CdmAdapter::UpdateSession(uint32_t session_id,
                                pp::VarArrayBuffer response) {
   // TODO(jrummell): In EME WD, AddKey() can only be called on valid sessions.
   // We should be able to DCHECK(cdm_) when addressing http://crbug.com/249976.
   if (!cdm_) {
     OnSessionError(session_id, cdm::kUnknownError, 0);
     return;
   }
 
   const uint8_t* response_ptr = static_cast<const uint8_t*>(response.Map());
@@ skipping 733 matching lines @@
 }  // namespace media
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new media::CdmAdapterModule();
 }
 
 }  // namespace pp