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

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: Refactored... quite a bit. Sorry for rebase noise on top of everything else! 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
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..0876e78c78fd0c05647349aa4a336ddb4b6fb1f8 100644
--- a/webkit/media/crypto/ppapi/clear_key_cdm.h
+++ b/webkit/media/crypto/ppapi/clear_key_cdm.h
@@ -24,7 +24,7 @@ namespace webkit_media {
// Clear key implementation of the cdm::ContentDecryptionModule interface.
class ClearKeyCdm : public cdm::ContentDecryptionModule {
public:
- ClearKeyCdm();
+ explicit ClearKeyCdm(cdm::CdmAllocator* allocator);
virtual ~ClearKeyCdm();
// ContentDecryptionModule implementation.
@@ -96,11 +96,15 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
std::string default_url_;
};
+ ClearKeyCdm();
ddorwin 2012/09/07 09:48:48 Remove
Tom Finegan 2012/09/08 01:02:47 Done.
+
Client client_;
media::AesDecryptor decryptor_;
// Protects the |client_| from being accessed by the |decryptor_|
// simultaneously.
base::Lock client_lock_;
+ // Allocates buffers using the CDM wrapper.
+ cdm::CdmAllocator* allocator_;
};
} // namespace webkit_media

Powered by Google App Engine
This is Rietveld 408576698