Chromium Code Reviews| Index: webkit/media/crypto/key_systems.h |
| diff --git a/webkit/media/key_systems.h b/webkit/media/crypto/key_systems.h |
| similarity index 63% |
| rename from webkit/media/key_systems.h |
| rename to webkit/media/crypto/key_systems.h |
| index dedd279e0184accdee5f5a08ff9c29e75be6c680..c75b6bde70c268489d35ff4a09a8558fff097553 100644 |
| --- a/webkit/media/key_systems.h |
| +++ b/webkit/media/crypto/key_systems.h |
| @@ -2,16 +2,23 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef WEBKIT_MEDIA_KEY_SYSTEMS_H_ |
| -#define WEBKIT_MEDIA_KEY_SYSTEMS_H_ |
| +#ifndef WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_ |
| +#define WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_ |
| #include <string> |
| #include <vector> |
| +#include "base/memory/scoped_ptr.h" |
| + |
| namespace WebKit { |
| class WebString; |
| } |
| +namespace media { |
| +class Decryptor; |
| +class DecryptorClient; |
| +} |
| + |
| namespace webkit_media { |
| // Returns whether |key_sytem| is supported at all. |
| @@ -25,6 +32,10 @@ bool IsSupportedKeySystemWithMediaMimeType( |
| const std::vector<std::string>& codecs, |
| const std::string& key_system); |
| +// Creates a decryptor that corresponds to the |key_system|. |
|
scherkus (not reviewing)
2012/06/28 18:32:52
"returns NULL if blah blah blah"
xhwang
2012/06/28 23:31:42
Done.
|
| +scoped_ptr<media::Decryptor> CreateDecryptor(const std::string& key_system, |
| + media::DecryptorClient* client); |
| + |
| } // namespace webkit_media |
| -#endif // WEBKIT_MEDIA_KEY_SYSTEMS_H_ |
| +#endif // WEBKIT_MEDIA_CRYPTO_KEY_SYSTEMS_H_ |