Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(524)

Side by Side Diff: ppapi/cpp/private/content_decryptor_private.h

Issue 11270057: Add type argument to pepper content decryptor method GenerateKeyRequest(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments. Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_ 5 #ifndef PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
6 #define PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_ 6 #define PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
7 7
8 #include "ppapi/c/private/pp_content_decryptor.h" 8 #include "ppapi/c/private/pp_content_decryptor.h"
9 #include "ppapi/c/private/ppb_content_decryptor_private.h" 9 #include "ppapi/c/private/ppb_content_decryptor_private.h"
10 #include "ppapi/c/private/ppp_content_decryptor_private.h" 10 #include "ppapi/c/private/ppp_content_decryptor_private.h"
(...skipping 11 matching lines...) Expand all
22 public: 22 public:
23 explicit ContentDecryptor_Private(Instance* instance); 23 explicit ContentDecryptor_Private(Instance* instance);
24 virtual ~ContentDecryptor_Private(); 24 virtual ~ContentDecryptor_Private();
25 25
26 // PPP_ContentDecryptor_Private functions exposed as virtual functions 26 // PPP_ContentDecryptor_Private functions exposed as virtual functions
27 // for you to override. 27 // for you to override.
28 // TODO(tomfinegan): This could be optimized to pass pp::Var instead of 28 // TODO(tomfinegan): This could be optimized to pass pp::Var instead of
29 // strings. The change would allow the CDM wrapper to reuse vars when 29 // strings. The change would allow the CDM wrapper to reuse vars when
30 // replying to the browser. 30 // replying to the browser.
31 virtual void GenerateKeyRequest(const std::string& key_system, 31 virtual void GenerateKeyRequest(const std::string& key_system,
32 const std::string& type,
32 pp::VarArrayBuffer init_data) = 0; 33 pp::VarArrayBuffer init_data) = 0;
33 virtual void AddKey(const std::string& session_id, 34 virtual void AddKey(const std::string& session_id,
34 pp::VarArrayBuffer key, 35 pp::VarArrayBuffer key,
35 pp::VarArrayBuffer init_data) = 0; 36 pp::VarArrayBuffer init_data) = 0;
36 virtual void CancelKeyRequest(const std::string& session_id) = 0; 37 virtual void CancelKeyRequest(const std::string& session_id) = 0;
37 virtual void Decrypt(pp::Buffer_Dev encrypted_buffer, 38 virtual void Decrypt(pp::Buffer_Dev encrypted_buffer,
38 const PP_EncryptedBlockInfo& encrypted_block_info) = 0; 39 const PP_EncryptedBlockInfo& encrypted_block_info) = 0;
39 virtual void InitializeAudioDecoder( 40 virtual void InitializeAudioDecoder(
40 const PP_AudioDecoderConfig& decoder_config, 41 const PP_AudioDecoderConfig& decoder_config,
41 pp::Buffer_Dev extra_data_resource) = 0; 42 pp::Buffer_Dev extra_data_resource) = 0;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 void DeliverSamples(pp::Buffer_Dev audio_frames, 82 void DeliverSamples(pp::Buffer_Dev audio_frames,
82 const PP_DecryptedBlockInfo& decrypted_block_info); 83 const PP_DecryptedBlockInfo& decrypted_block_info);
83 84
84 private: 85 private:
85 InstanceHandle associated_instance_; 86 InstanceHandle associated_instance_;
86 }; 87 };
87 88
88 } // namespace pp 89 } // namespace pp
89 90
90 #endif // PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_ 91 #endif // PPAPI_CPP_PRIVATE_CONTENT_DECRYPTOR_PRIVATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698