Chromium Code Reviews| 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; |
|
xhwang
2014/01/04 01:07:53
Dropping this because we could have only one pendi
|
| - Timer<MediaKeySession> m_keyRequestTimer; |
| + String m_pendingMimeType; |
| + RefPtr<Uint8Array> m_pendingInitData; |
| + Timer<MediaKeySession> m_initializeTimer; |
| Deque<RefPtr<Uint8Array> > m_pendingKeys; |
| Timer<MediaKeySession> m_addKeyTimer; |