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

Unified Diff: Source/modules/encryptedmedia/MediaKeySession.h

Issue 111043004: Update MediaKeySession method names to latest EME spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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: Source/modules/encryptedmedia/MediaKeySession.h
diff --git a/Source/modules/encryptedmedia/MediaKeySession.h b/Source/modules/encryptedmedia/MediaKeySession.h
index 26ad01f7e48ad90b2b40f43e70996b7fc0e44695..e21fd20ed1278378e0cb19125631103c6908a164 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.h
+++ b/Source/modules/encryptedmedia/MediaKeySession.h
@@ -64,9 +64,9 @@ public:
void setError(MediaKeyError*);
MediaKeyError* error() { return m_error.get(); }
- void generateKeyRequest(const String& mimeType, Uint8Array* initData);
+ void initialize(const String& mimeType, Uint8Array* initData);
void update(Uint8Array* key, ExceptionState&);
- void close();
+ void release();
void enqueueEvent(PassRefPtr<Event>);
@@ -79,7 +79,7 @@ public:
private:
MediaKeySession(ExecutionContext*, ContentDecryptionModule*, MediaKeys*);
- void keyRequestTimerFired(Timer<MediaKeySession>*);
+ void initializeTimerFired(Timer<MediaKeySession>*);
void addKeyTimerFired(Timer<MediaKeySession>*);
// ContentDecryptionModuleSessionClient
@@ -94,13 +94,9 @@ private:
// Used to remove the reference from the parent MediaKeys when close()'d.
MediaKeys* m_keys;
- struct PendingKeyRequest {
- PendingKeyRequest(const String& mimeType, Uint8Array* initData) : mimeType(mimeType), initData(initData) { }
- String mimeType;
- RefPtr<Uint8Array> initData;
- };
- Deque<PendingKeyRequest> m_pendingKeyRequests;
- Timer<MediaKeySession> m_keyRequestTimer;
+ String m_pendingMimeType;
+ RefPtr<Uint8Array> m_pendingInitData;
+ Timer<MediaKeySession> m_initializeTimer;
Deque<RefPtr<Uint8Array> > m_pendingKeys;
Timer<MediaKeySession> m_addKeyTimer;
« no previous file with comments | « no previous file | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698