Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h - Issue 1055503002: Eliminate MediaPlayer & MediaPlayerClient abstractions

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

Issue 1055503002: Eliminate MediaPlayer & MediaPlayerClient abstractions (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Patch cleanup and review comments fix Created 5 years, 7 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

« no previous file with comments | « Source/core/loader/FrameLoaderClient.h ('k') | Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp » ('j') | Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h

diff --git a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h

index 6cc7d2c31247f340069868e88d77599d46feb969..7c8594f0cebdce0ca55c20e6816c047757f64787 100644

--- a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h

+++ b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h

@@ -12,7 +12,7 @@

#include "platform/Supplementable.h"

#include "platform/heap/Handle.h"

#include "public/platform/WebEncryptedMediaTypes.h"

-#include "public/platform/WebMediaPlayerClient.h"

+#include "public/platform/WebMediaPlayerEncryptedMediaClient.h"

namespace blink {

@@ -21,8 +21,10 @@ class HTMLMediaElement;

class MediaKeys;

class ScriptPromise;

class ScriptState;

+class WebContentDecryptionModule;

+class WebMediaPlayer;

-class MODULES_EXPORT HTMLMediaElementEncryptedMedia final : public NoBaseWillBeGarbageCollected<HTMLMediaElementEncryptedMedia>, public WillBeHeapSupplement<HTMLMediaElement> {

+class MODULES_EXPORT HTMLMediaElementEncryptedMedia final : public NoBaseWillBeGarbageCollected<HTMLMediaElementEncryptedMedia>, public WillBeHeapSupplement<HTMLMediaElement>, public WebMediaPlayerEncryptedMediaClient {

WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElementEncryptedMedia);

public:

#if !ENABLE(OILPAN)

@@ -46,13 +48,14 @@ public:

static ScriptPromise setMediaKeys(ScriptState*, HTMLMediaElement&, MediaKeys*);

DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(encrypted);

- static void keyAdded(HTMLMediaElement&, const String& keySystem, const String& sessionId);

- static void keyError(HTMLMediaElement&, const String& keySystem, const String& sessionId, WebMediaPlayerClient::MediaKeyErrorCode, unsigned short systemCode);

- static void keyMessage(HTMLMediaElement&, const String& keySystem, const String& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL);

- static void encrypted(HTMLMediaElement&, WebEncryptedMediaInitDataType, const unsigned char* initData, unsigned initDataLength);

- static void didBlockPlaybackWaitingForKey(HTMLMediaElement&);

- static void didResumePlaybackBlockedForKey(HTMLMediaElement&);

- static WebContentDecryptionModule* contentDecryptionModule(HTMLMediaElement&);

+ // WebMediaPlayerEncryptedMediaClient methods

+ virtual void keyAdded(const WebString& keySystem, const WebString& sessionId) override final;

+ virtual void keyError(const WebString& keySystem, const WebString& sessionId, WebMediaPlayerEncryptedMediaClient::MediaKeyErrorCode, unsigned short systemCode) override final;

+ virtual void keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL) override final;

+ virtual void encrypted(WebEncryptedMediaInitDataType, const unsigned char* initData, unsigned initDataLength) override final;

+ virtual void didBlockPlaybackWaitingForKey() override final;

+ virtual void didResumePlaybackBlockedForKey() override final;

+ WebContentDecryptionModule* contentDecryptionModule(HTMLMediaElement&);

ddorwin 2015/05/19 17:01:49 The parameter is unnecessary.

static HTMLMediaElementEncryptedMedia& from(HTMLMediaElement&);

static const char* supplementName();

@@ -62,7 +65,7 @@ public:

private:

friend class SetMediaKeysHandler;

- HTMLMediaElementEncryptedMedia();

+ HTMLMediaElementEncryptedMedia(HTMLMediaElement&);

void generateKeyRequest(WebMediaPlayer*, const String& keySystem, PassRefPtr<DOMUint8Array> initData, ExceptionState&);

void addKey(WebMediaPlayer*, const String& keySystem, PassRefPtr<DOMUint8Array> key, PassRefPtr<DOMUint8Array> initData, const String& sessionId, ExceptionState&);

void cancelKeyRequest(WebMediaPlayer*, const String& keySystem, const String& sessionId, ExceptionState&);

@@ -83,6 +86,7 @@ private:

WebContentDecryptionModule* contentDecryptionModule();

+ HTMLMediaElement& m_mediaElement;

EmeMode m_emeMode;

bool m_isWaitingForKey;