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

Unified Diff: webkit/media/crypto/ppapi/clear_key_cdm.h

Issue 10914028: Add CDM allocator interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/media/crypto/ppapi/cdm_wrapper.cc ('k') | webkit/media/crypto/ppapi/clear_key_cdm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/ppapi/clear_key_cdm.h
diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/media/crypto/ppapi/clear_key_cdm.h
index 44b3110e315dcc17353d302d724d80a125238f98..3c71702dbfb098b7a195e6d55745272e95a1e2bb 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
@@ -24,13 +24,14 @@ namespace webkit_media {
// Clear key implementation of the cdm::ContentDecryptionModule interface.
class ClearKeyCdm : public cdm::ContentDecryptionModule {
public:
- ClearKeyCdm();
+ explicit ClearKeyCdm(cdm::Allocator* allocator);
virtual ~ClearKeyCdm();
// ContentDecryptionModule implementation.
- virtual cdm::Status GenerateKeyRequest(const uint8_t* init_data,
- int init_data_size,
- cdm::KeyMessage* key_request) OVERRIDE;
+ virtual cdm::Status GenerateKeyRequest(
+ const uint8_t* init_data,
+ int init_data_size,
+ cdm::KeyMessage* key_request) OVERRIDE;
virtual cdm::Status AddKey(const char* session_id,
int session_id_size,
const uint8_t* key,
@@ -98,9 +99,12 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
Client client_;
media::AesDecryptor decryptor_;
+
// Protects the |client_| from being accessed by the |decryptor_|
// simultaneously.
base::Lock client_lock_;
+
+ cdm::Allocator* const allocator_;
};
} // namespace webkit_media
« no previous file with comments | « webkit/media/crypto/ppapi/cdm_wrapper.cc ('k') | webkit/media/crypto/ppapi/clear_key_cdm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698