| Index: Source/modules/encryptedmedia/MediaKeys.h
|
| diff --git a/Source/modules/encryptedmedia/MediaKeys.h b/Source/modules/encryptedmedia/MediaKeys.h
|
| index a7b817d0cb2783ef1de2d2f52036823afa7eacb2..ddbf5272ebf3c3a433da4ee56532ee70339748fa 100644
|
| --- a/Source/modules/encryptedmedia/MediaKeys.h
|
| +++ b/Source/modules/encryptedmedia/MediaKeys.h
|
| @@ -31,6 +31,7 @@
|
| #include "core/dom/ContextLifecycleObserver.h"
|
| #include "core/dom/DOMArrayPiece.h"
|
| #include "platform/Timer.h"
|
| +#include "public/platform/WebMediaKeySystemConfiguration.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/text/WTFString.h"
|
|
|
| @@ -48,7 +49,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::WebMediaKeySystemConfiguration&, PassOwnPtr<WebContentDecryptionModule>);
|
| virtual ~MediaKeys();
|
|
|
| // FIXME: This should be removed after crbug.com/425186 is fully
|
| @@ -72,6 +73,7 @@ private:
|
| void timerFired(Timer<MediaKeys>*);
|
|
|
| const String m_keySystem;
|
| + const blink::WebMediaKeySystemConfiguration m_configuration;
|
| OwnPtr<blink::WebContentDecryptionModule> m_cdm;
|
|
|
| HeapDeque<Member<PendingAction>> m_pendingActions;
|
|
|