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: Added separate interface for EncryptedMedia 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

« Source/core/html/HTMLMediaElement.cpp ('K') | « Source/core/testing/Internals.cpp ('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 4d366229889ba947516bcaca6235c91032c9a8d8..2ed6372ba05253af04ed4d0e8c309c61ff250bfa 100644

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

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

@@ -10,8 +10,10 @@

#include "core/events/EventTarget.h"

#include "platform/Supplementable.h"

#include "platform/heap/Handle.h"

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

ddorwin 2015/05/08 17:49:41 Can we fwd declare instead?

Srirama 2015/05/19 10:39:47 Done.

#include "public/platform/WebEncryptedMediaTypes.h"

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

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

ddorwin 2015/05/08 17:49:41 What is this used for?

Srirama 2015/05/19 10:39:47 WebMediaPlayer is referenced which is being includ

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

namespace blink {

@@ -21,7 +23,7 @@ class MediaKeys;

class ScriptPromise;

class ScriptState;

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

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

WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLMediaElementEncryptedMedia);

DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(HTMLMediaElementEncryptedMedia);

public:

@@ -42,12 +44,13 @@ 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&);

+ // WebMediaPlayerEncryptedMediaClient methods

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

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

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

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

+ virtual void didBlockPlaybackWaitingForKey(WebMediaPlayerClient*) override final;

+ virtual void didResumePlaybackBlockedForKey(WebMediaPlayerClient*) override final;

static WebContentDecryptionModule* contentDecryptionModule(HTMLMediaElement&);

ddorwin 2015/05/08 17:49:42 Why is this still static? The call site makes the

Srirama 2015/05/19 10:39:47 Done.

static HTMLMediaElementEncryptedMedia& from(HTMLMediaElement&);