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

Unified Diff: content/renderer/media/crypto/proxy_media_keys.h

Issue 555223004: Update MediaKeys interface for EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase + Android changes Created 6 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: content/renderer/media/crypto/proxy_media_keys.h
diff --git a/content/renderer/media/crypto/proxy_media_keys.h b/content/renderer/media/crypto/proxy_media_keys.h
index 4ebd4c120f046ac9ac17d69581cd0682b8410047..470a274fd5fde662f71d55b3164bcd07074f34e0 100644
--- a/content/renderer/media/crypto/proxy_media_keys.h
+++ b/content/renderer/media/crypto/proxy_media_keys.h
@@ -35,6 +35,10 @@ class ProxyMediaKeys : public media::MediaKeys {
virtual ~ProxyMediaKeys();
// MediaKeys implementation.
+ virtual void SetServerCertificate(
+ const uint8* certificate_data,
+ int certificate_data_length,
+ scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE;
virtual void CreateSession(
const std::string& init_data_type,
const uint8* init_data,
@@ -49,9 +53,15 @@ class ProxyMediaKeys : public media::MediaKeys {
const uint8* response,
int response_length,
scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE;
- virtual void ReleaseSession(
+ virtual void CloseSession(
+ const std::string& web_session_id,
+ scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE;
+ virtual void RemoveSession(
const std::string& web_session_id,
scoped_ptr<media::SimpleCdmPromise> promise) OVERRIDE;
+ virtual void GetUsableKeyIds(
+ const std::string& web_session_id,
+ scoped_ptr<media::KeyIdsPromise> promise) OVERRIDE;
// Callbacks.
void OnSessionCreated(uint32 session_id, const std::string& web_session_id);

Powered by Google App Engine
This is Rietveld 408576698