Index: Source/modules/encryptedmedia/MediaKeySession.h |
diff --git a/Source/modules/encryptedmedia/MediaKeySession.h b/Source/modules/encryptedmedia/MediaKeySession.h |
index 31c1a202759f25c5051e316d90a397139bba4dcd..2ef610accc430c227291b3ffc1e917a490d9fba5 100644 |
--- a/Source/modules/encryptedmedia/MediaKeySession.h |
+++ b/Source/modules/encryptedmedia/MediaKeySession.h |
@@ -68,12 +68,15 @@ public: |
static MediaKeySession* create(ScriptState*, MediaKeys*, const String& sessionType); |
virtual ~MediaKeySession(); |
+ static bool isValidSessionType(const String& sessionType); |
ddorwin
2014/10/08 23:08:49
Move up with the other static method.
jrummell
2014/10/08 23:52:55
Done.
|
+ |
const String& keySystem() const { return m_keySystem; } |
String sessionId() const; |
ScriptPromise closed(ScriptState*); |
ScriptPromise generateRequest(ScriptState*, const String& initDataType, ArrayBuffer* initData); |
ScriptPromise generateRequest(ScriptState*, const String& initDataType, ArrayBufferView* initData); |
+ ScriptPromise load(ScriptState*, const String& sessionId); |
void setError(MediaKeyError*); |
MediaKeyError* error() { return m_error.get(); } |
@@ -97,6 +100,7 @@ public: |
private: |
class PendingAction; |
friend class NewSessionResult; |
+ friend class LoadSessionResult; |
MediaKeySession(ScriptState*, MediaKeys*, const String& sessionType); |
@@ -112,9 +116,12 @@ private: |
ScriptPromise generateRequestInternal(ScriptState*, const String& initDataType, PassRefPtr<ArrayBuffer> initData); |
ScriptPromise updateInternal(ScriptState*, PassRefPtr<ArrayBuffer> response); |
- // Called by NewSessionResult when the new sesison has been created. |
+ // Called by NewSessionResult when the new session has been created. |
void finishGenerateRequest(); |
+ // Called by LoadSessionResult when the session has been loaded. |
+ void finishLoad(); |
+ |
String m_keySystem; |
RefPtrWillBeMember<MediaKeyError> m_error; |
OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue; |