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

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

Issue 950813005: Change initDataType and sessionType to be enums (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: android compile issues Created 5 years, 10 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 125f83e1500284764c04a8a8d0cb2b97e1e8f072..d777a180e44d15ca4c09ee309336c673d65aecaa 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.h
+++ b/Source/modules/encryptedmedia/MediaKeySession.h
@@ -35,6 +35,7 @@
#include "platform/Timer.h"
#include "platform/heap/Handle.h"
#include "public/platform/WebContentDecryptionModuleSession.h"
+#include "public/platform/WebEncryptedMediaTypes.h"
namespace blink {
@@ -62,8 +63,9 @@ class MediaKeySession final
DEFINE_WRAPPERTYPEINFO();
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeySession);
public:
- static MediaKeySession* create(ScriptState*, MediaKeys*, const String& sessionType);
- static bool isValidSessionType(const String& sessionType);
+ static MediaKeySession* create(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType);
+ static WebEncryptedMediaInitDataType convertInitDataType(const String& initDataType);
+ static WebEncryptedMediaSessionType convertSessionType(const String& sessionType);
virtual ~MediaKeySession();
String sessionId() const;
@@ -95,7 +97,7 @@ private:
friend class NewSessionResultPromise;
friend class LoadSessionResultPromise;
- MediaKeySession(ScriptState*, MediaKeys*, const String& sessionType);
+ MediaKeySession(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType);
void actionTimerFired(Timer<MediaKeySession>*);
@@ -119,7 +121,7 @@ private:
WeakMember<MediaKeys> m_mediaKeys;
// Session properties.
- String m_sessionType;
+ WebEncryptedMediaSessionType m_sessionType;
double m_expiration;
Member<MediaKeyStatusMap> m_keyStatusesMap;
« no previous file with comments | « Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp ('k') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698