Eliminate MediaPlayer & MediaPlayerClient abstractions

Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef HTMLMediaElementEncryptedMedia_h
 #define HTMLMediaElementEncryptedMedia_h
 
 #include "core/EventTypeNames.h"
 #include "core/dom/DOMTypedArray.h"
 #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 included previously from
WebMediaPlayerClient.
Fwd declaration should be enough now.

+#include "public/platform/WebMediaPlayerEncryptedMediaClient.h"
 
 namespace blink {
 
 class ExceptionState;
 class HTMLMediaElement;
 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:
     // encrypted media extensions (v0.1b)
     static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySystem, PassRefPtr<DOMUint8Array> initData, ExceptionState&);
     static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySystem, ExceptionState&);
     static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRefPtr<DOMUint8Array> key, PassRefPtr<DOMUint8Array> initData, const String& sessionId, ExceptionState&);
     static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRefPtr<DOMUint8Array> key, ExceptionState&);
     static void webkitCancelKeyRequest(HTMLMediaElement&, const String& keySystem, const String& sessionId, ExceptionState&);
 
     DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
     DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
     DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
     DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(webkitneedkey);
 
     // encrypted media extensions (WD)
     static MediaKeys* mediaKeys(HTMLMediaElement&);
     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 strangeness clearer.

[Srirama, 2015/05/19 10:39:47]

Done.

 
     static HTMLMediaElementEncryptedMedia& from(HTMLMediaElement&);
     static const char* supplementName();
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
     friend class SetMediaKeysHandler;
 
     HTMLMediaElementEncryptedMedia();
@@ skipping 20 matching lines @@
     EmeMode m_emeMode;
 
     bool m_isWaitingForKey;
 
     PersistentWillBeMember<MediaKeys> m_mediaKeys;
 };
 
 } // namespace blink
 
 #endif