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

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

Issue 946503002: Filter supported session types in createSession(). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@export
Patch Set: Remove persistent-license syntax tests. 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/MediaKeys.h
diff --git a/Source/modules/encryptedmedia/MediaKeys.h b/Source/modules/encryptedmedia/MediaKeys.h
index a7b817d0cb2783ef1de2d2f52036823afa7eacb2..3d459f20e5167a45206d3f4d9965156844d88d19 100644
--- a/Source/modules/encryptedmedia/MediaKeys.h
+++ b/Source/modules/encryptedmedia/MediaKeys.h
@@ -31,6 +31,8 @@
#include "core/dom/ContextLifecycleObserver.h"
#include "core/dom/DOMArrayPiece.h"
#include "platform/Timer.h"
+#include "public/platform/WebString.h"
+#include "public/platform/WebVector.h"
#include "wtf/Forward.h"
#include "wtf/text/WTFString.h"
@@ -48,7 +50,7 @@ class MediaKeys : public GarbageCollectedFinalized<MediaKeys>, public ContextLif
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeys);
DEFINE_WRAPPERTYPEINFO();
public:
- MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<WebContentDecryptionModule>);
+ MediaKeys(ExecutionContext*, const String& keySystem, const blink::WebVector<blink::WebString>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule>);
virtual ~MediaKeys();
// FIXME: This should be removed after crbug.com/425186 is fully
@@ -72,6 +74,7 @@ private:
void timerFired(Timer<MediaKeys>*);
const String m_keySystem;
+ const blink::WebVector<blink::WebString> m_supportedSessionTypes;
OwnPtr<blink::WebContentDecryptionModule> m_cdm;
HeapDeque<Member<PendingAction>> m_pendingActions;

Powered by Google App Engine
This is Rietveld 408576698