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

Side by Side Diff: webkit/media/crypto/proxy_decryptor.h

Issue 10896014: Add a bool return value to media::Decryptor::GenerateKeyRequest(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolve comments. Created 8 years, 3 months 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
« no previous file with comments | « webkit/media/crypto/ppapi_decryptor.cc ('k') | webkit/media/crypto/proxy_decryptor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_ 5 #ifndef WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
6 #define WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_ 6 #define WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 25 matching lines...) Expand all
36 ProxyDecryptor(media::DecryptorClient* decryptor_client, 36 ProxyDecryptor(media::DecryptorClient* decryptor_client,
37 WebKit::WebMediaPlayerClient* web_media_player_client, 37 WebKit::WebMediaPlayerClient* web_media_player_client,
38 WebKit::WebFrame* web_frame); 38 WebKit::WebFrame* web_frame);
39 virtual ~ProxyDecryptor(); 39 virtual ~ProxyDecryptor();
40 40
41 void set_decryptor_for_testing(scoped_ptr<media::Decryptor> decryptor) { 41 void set_decryptor_for_testing(scoped_ptr<media::Decryptor> decryptor) {
42 decryptor_ = decryptor.Pass(); 42 decryptor_ = decryptor.Pass();
43 } 43 }
44 44
45 // media::Decryptor implementation. 45 // media::Decryptor implementation.
46 virtual void GenerateKeyRequest(const std::string& key_system, 46 virtual bool GenerateKeyRequest(const std::string& key_system,
47 const uint8* init_data, 47 const uint8* init_data,
48 int init_data_length) OVERRIDE; 48 int init_data_length) OVERRIDE;
49 virtual void AddKey(const std::string& key_system, 49 virtual void AddKey(const std::string& key_system,
50 const uint8* key, 50 const uint8* key,
51 int key_length, 51 int key_length,
52 const uint8* init_data, 52 const uint8* init_data,
53 int init_data_length, 53 int init_data_length,
54 const std::string& session_id) OVERRIDE; 54 const std::string& session_id) OVERRIDE;
55 virtual void CancelKeyRequest(const std::string& key_system, 55 virtual void CancelKeyRequest(const std::string& key_system,
56 const std::string& session_id) OVERRIDE; 56 const std::string& session_id) OVERRIDE;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 scoped_ptr<media::Decryptor> decryptor_; 90 scoped_ptr<media::Decryptor> decryptor_;
91 std::vector<base::Closure> pending_decrypt_closures_; 91 std::vector<base::Closure> pending_decrypt_closures_;
92 bool stopped_; 92 bool stopped_;
93 93
94 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor); 94 DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
95 }; 95 };
96 96
97 } // namespace webkit_media 97 } // namespace webkit_media
98 98
99 #endif // WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_ 99 #endif // WEBKIT_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
OLDNEW
« no previous file with comments | « webkit/media/crypto/ppapi_decryptor.cc ('k') | webkit/media/crypto/proxy_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698