Changes to the EME Pepper API

ppapi/cpp/private/content_decryptor_private.h

 // 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.
 
 #ifndef PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
 #define PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
 
 #include "ppapi/c/private/pp_content_decryptor.h"
 #include "ppapi/c/private/ppb_content_decryptor_private.h"
 #include "ppapi/c/private/ppp_content_decryptor_private.h"
@@ skipping 13 matching lines @@
 class ContentDecryptor_Private {
  public:
   explicit ContentDecryptor_Private(Instance* instance);
   virtual ~ContentDecryptor_Private();
 
   // PPP_ContentDecryptor_Private functions exposed as virtual functions
   // for you to override.
   // TODO(tomfinegan): This could be optimized to pass pp::Var instead of
   // strings. The change would allow the CDM wrapper to reuse vars when
   // replying to the browser.
-  virtual void GenerateKeyRequest(const std::string& key_system,
-                                  const std::string& type,
+  virtual void Initialize(const std::string& key_system,
+                          bool can_challenge_platform) = 0;
+  virtual void GenerateKeyRequest(const std::string& type,
                                   pp::VarArrayBuffer init_data) = 0;
   virtual void AddKey(const std::string& session_id,
                       pp::VarArrayBuffer key,
                       pp::VarArrayBuffer init_data) = 0;
   virtual void CancelKeyRequest(const std::string& session_id) = 0;
   virtual void Decrypt(pp::Buffer_Dev encrypted_buffer,
                        const PP_EncryptedBlockInfo& encrypted_block_info) = 0;
   virtual void InitializeAudioDecoder(
       const PP_AudioDecoderConfig& decoder_config,
       pp::Buffer_Dev extra_data_resource) = 0;
   virtual void InitializeVideoDecoder(
       const PP_VideoDecoderConfig& decoder_config,
       pp::Buffer_Dev extra_data_resource) = 0;
   virtual void DeinitializeDecoder(PP_DecryptorStreamType decoder_type,
                                    uint32_t request_id) = 0;
   virtual void ResetDecoder(PP_DecryptorStreamType decoder_type,
                             uint32_t request_id) = 0;
   // Null |encrypted_frame| means end-of-stream buffer.
   virtual void DecryptAndDecode(
       PP_DecryptorStreamType decoder_type,
       pp::Buffer_Dev encrypted_buffer,
       const PP_EncryptedBlockInfo& encrypted_block_info) = 0;
 
   // PPB_ContentDecryptor_Private methods for passing data from the decryptor
   // to the browser.
-  void NeedKey(const std::string& key_system,
-               const std::string& session_id,
-               pp::VarArrayBuffer init_data);
   void KeyAdded(const std::string& key_system,
                 const std::string& session_id);
   void KeyMessage(const std::string& key_system,
                   const std::string& session_id,
                   pp::VarArrayBuffer message,
                   const std::string& default_url);
   void KeyError(const std::string& key_system,
                 const std::string& session_id,
                 int32_t media_error,
                 int32_t system_code);
@@ skipping 24 matching lines @@
   void DeliverSamples(pp::Buffer_Dev audio_frames,
                       const PP_DecryptedBlockInfo& decrypted_block_info);
 
  private:
   InstanceHandle associated_instance_;
 };
 
 }  // namespace pp
 
 #endif  // PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_