Changes to the EME Pepper API

media/cdm/ppapi/cdm_wrapper.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 <cstring>
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 480 matching lines @@
   virtual ~CdmWrapper();
 
   // pp::Instance implementation.
   virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]) {
     return true;
   }
 
   // PPP_ContentDecryptor_Private implementation.
   // Note: Results of calls to these methods must be reported through the
   // PPB_ContentDecryptor_Private interface.
-  virtual void GenerateKeyRequest(const std::string& key_system,
-                                  const std::string& type,
+  virtual void Initialize(const std::string& key_system) OVERRIDE;
+  virtual void GenerateKeyRequest(const std::string& type,
                                   pp::VarArrayBuffer init_data) OVERRIDE;
   virtual void AddKey(const std::string& session_id,
                       pp::VarArrayBuffer key,
                       pp::VarArrayBuffer init_data) OVERRIDE;
   virtual void CancelKeyRequest(const std::string& session_id) OVERRIDE;
   virtual void Decrypt(
       pp::Buffer_Dev encrypted_buffer,
       const PP_EncryptedBlockInfo& encrypted_block_info) OVERRIDE;
   virtual void InitializeAudioDecoder(
       const PP_AudioDecoderConfig& decoder_config,
@@ skipping 116 matching lines @@
 bool CdmWrapper::CreateCdmInstance(const std::string& key_system) {
   PP_DCHECK(!cdm_);
   cdm_ = static_cast<cdm::ContentDecryptionModule*>(
       ::CreateCdmInstance(cdm::kCdmInterfaceVersion,
                           key_system.data(), key_system.size(),
                           GetCdmHost, this));
 
   return (cdm_ != NULL);
 }
 
-void CdmWrapper::GenerateKeyRequest(const std::string& key_system,
-                                    const std::string& type,
-                                    pp::VarArrayBuffer init_data) {
+void CdmWrapper::Initialize(const std::string& key_system) {
   PP_DCHECK(!key_system.empty());
   PP_DCHECK(key_system_.empty() || key_system_ == key_system);

[ddorwin, 2013/09/17 23:15:42]

Add && cdm_ to the second clause?

[jrummell, 2013/09/18 21:01:15]

Done.

 
+  if (!cdm_) {
+    if (!CreateCdmInstance(key_system)) {
+      SendUnknownKeyError(key_system, std::string());

[ddorwin, 2013/09/17 23:15:42]

TODO: Confirm we should fire a keyerror here.

[jrummell, 2013/09/18 21:01:15]

Done.

+      return;
+    }
+  }
+  PP_DCHECK(cdm_);
+  key_system_ = key_system;
+}
+
+void CdmWrapper::GenerateKeyRequest(const std::string& type,
+                                    pp::VarArrayBuffer init_data) {
+

[ddorwin, 2013/09/17 23:15:42]

remove extra line

[jrummell, 2013/09/18 21:01:15]

Done.

 #if defined(CHECK_DOCUMENT_URL)
   PP_URLComponents_Dev url_components = {};
   pp::Var href = pp::URLUtil_Dev::Get()->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)
 
-  if (!cdm_) {
-    if (!CreateCdmInstance(key_system)) {
-      SendUnknownKeyError(key_system, std::string());
-      return;
-    }
-  }
   PP_DCHECK(cdm_);
 

[ddorwin, 2013/09/17 23:15:42]

remove line

[jrummell, 2013/09/18 21:01:15]

Done.

-  // Must be set here in case the CDM synchronously calls a cdm::Host method.
-  // Clear below on error.
-  // TODO(ddorwin): Set/clear key_system_ & cdm_ at same time; clear both on
-  // error below.
-  key_system_ = key_system;
   cdm::Status status = cdm_->GenerateKeyRequest(
       type.data(), type.size(),
       static_cast<const uint8_t*>(init_data.Map()),
       init_data.ByteLength());
   PP_DCHECK(status == cdm::kSuccess || status == cdm::kSessionError);
-  if (status != cdm::kSuccess) {
-    key_system_.clear();  // See comment above.
-    return;
-  }
-
-  key_system_ = key_system;
 }
 
 void CdmWrapper::AddKey(const std::string& session_id,
                         pp::VarArrayBuffer key,
                         pp::VarArrayBuffer init_data) {
   PP_DCHECK(cdm_);  // GenerateKeyRequest() should have succeeded.
   if (!cdm_) {
     SendUnknownKeyError(key_system_, session_id);
     return;
   }
@@ skipping 500 matching lines @@
 }  // namespace media
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new media::CdmWrapperModule();
 }
 
 }  // namespace pp