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

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

Issue 641433002: Implement MediaKeySession.load() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: initialize variable for Windows Created 6 years, 2 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 c6d3c81da524e0054bd91452d964d729fe86edd6..80db44c07d293c5ef8db6c9a861ec4d98fd783ed 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.h
+++ b/Source/modules/encryptedmedia/MediaKeySession.h
@@ -66,6 +66,7 @@ class MediaKeySession final
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeySession);
public:
static MediaKeySession* create(ScriptState*, MediaKeys*, const String& sessionType);
+ static bool isValidSessionType(const String& sessionType);
virtual ~MediaKeySession();
const String& keySystem() const { return m_keySystem; }
@@ -75,6 +76,7 @@ public:
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(); }
@@ -99,6 +101,7 @@ public:
private:
class PendingAction;
friend class NewSessionResult;
+ friend class LoadSessionResult;
MediaKeySession(ScriptState*, MediaKeys*, const String& sessionType);
@@ -115,9 +118,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;
« no previous file with comments | « LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html ('k') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698