Remove the dependency on encryptedmedia from HTMLMediaElement.

Source/web/WebMediaPlayerClientImpl.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 30 matching lines @@
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/gpu/GrTexture.h"
 #endif
 #include "platform/weborigin/KURL.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/ThreadingPrimitives.h"
 
 namespace WebCore {
 class AudioSourceProviderClient;
+class HTMLMediaElement;
 }
 
 namespace blink {
 
 class WebHelperPlugin;
 class WebAudioSourceProvider;
 class WebContentDecryptionModule;
 class WebMediaPlayer;
 class WebGraphicsContext3D;
 
 // This class serves as a bridge between WebCore::MediaPlayer and
 // blink::WebMediaPlayer.
 class WebMediaPlayerClientImpl FINAL : public WebCore::MediaPlayer, public WebMediaPlayerClient {
 
 public:
     static PassOwnPtr<WebCore::MediaPlayer> create(WebCore::MediaPlayerClient*);
 
     virtual ~WebMediaPlayerClientImpl();
 
-    // Returns the encapsulated blink::WebMediaPlayer.
-    WebMediaPlayer* mediaPlayer() const;
-
     // WebMediaPlayerClient methods:
     virtual void networkStateChanged() OVERRIDE;
     virtual void readyStateChanged() OVERRIDE;
     virtual void timeChanged() OVERRIDE;
     virtual void repaint() OVERRIDE;
     virtual void durationChanged() OVERRIDE;
     virtual void sizeChanged() OVERRIDE;
     virtual void setOpaque(bool) OVERRIDE;
     virtual double volume() const OVERRIDE;
     virtual void playbackStateChanged() OVERRIDE;
     virtual WebMediaPlayer::Preload preload() const OVERRIDE;
+
+    // WebEncryptedMediaPlayerClient methods:
+    // FIXME: Remove these once the WebMediaPlayer implementation stop making these calls on the WebMediaPlayerClient object.

[ddorwin, 2014/02/27 00:37:59]

Where should it be making them?

[acolwell GONE FROM CHROMIUM, 2014/02/27 01:11:11]

This was left over from the original patch I sent him. This comment should be
removed.

[c.shu, 2014/02/27 14:49:46]

Done.

     virtual void keyAdded(const WebString& keySystem, const WebString& sessionId) OVERRIDE;
     virtual void keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode, unsigned short systemCode) OVERRIDE;
     virtual void keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL) OVERRIDE;
     virtual void keyNeeded(const WebString& contentType, const unsigned char* initData, unsigned initDataLength) OVERRIDE;
     virtual WebPlugin* createHelperPlugin(const WebString& pluginType, WebFrame*) OVERRIDE;
     virtual void closeHelperPluginSoon(WebFrame*) OVERRIDE;
+
     virtual bool needsWebLayerForVideo() const OVERRIDE;
     virtual void setWebLayer(WebLayer*) OVERRIDE;
     virtual void addTextTrack(WebInbandTextTrack*) OVERRIDE;
     virtual void removeTextTrack(WebInbandTextTrack*) OVERRIDE;
     virtual void mediaSourceOpened(WebMediaSource*) OVERRIDE;
     virtual void requestFullscreen() OVERRIDE;
     virtual void requestSeek(double) OVERRIDE;
 
     // MediaPlayer methods:
+    virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE;
     virtual void load(WebMediaPlayer::LoadType, const WTF::String& url) OVERRIDE;
-
     virtual void play() OVERRIDE;
     virtual void pause() OVERRIDE;
     virtual void prepareToPlay() OVERRIDE;
     virtual bool supportsSave() const OVERRIDE;
     virtual WebCore::IntSize naturalSize() const OVERRIDE;
     virtual bool hasVideo() const OVERRIDE;
     virtual bool hasAudio() const OVERRIDE;
     virtual double duration() const OVERRIDE;
     virtual double currentTime() const OVERRIDE;
     virtual void seek(double time) OVERRIDE;
@@ skipping 21 matching lines @@
     virtual unsigned audioDecodedByteCount() const OVERRIDE;
     virtual unsigned videoDecodedByteCount() const OVERRIDE;
     virtual void showFullscreenOverlay() OVERRIDE;
     virtual void hideFullscreenOverlay() OVERRIDE;
     virtual bool canShowFullscreenOverlay() const OVERRIDE;
 
 #if ENABLE(WEB_AUDIO)
     virtual WebCore::AudioSourceProvider* audioSourceProvider() OVERRIDE;
 #endif
 
-    virtual WebCore::MediaPlayer::MediaKeyException generateKeyRequest(const String& keySystem, const unsigned char* initData, unsigned initDataLength) OVERRIDE;
-    virtual WebCore::MediaPlayer::MediaKeyException addKey(const String& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId) OVERRIDE;
-    virtual WebCore::MediaPlayer::MediaKeyException cancelKeyRequest(const String& keySystem, const String& sessionId) OVERRIDE;
-    virtual void setContentDecryptionModule(WebContentDecryptionModule*) OVERRIDE;
-
 private:
     explicit WebMediaPlayerClientImpl(WebCore::MediaPlayerClient*);
 
     void startDelayedLoad();
     void loadInternal();
 
+    WebCore::HTMLMediaElement& mediaElement() const;
+
 #if OS(ANDROID)
     // FIXME: This path "only works" on Android. It is a workaround for the problem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES
     // texture internally. It should be removed and replaced by the normal paint path.
     // https://code.google.com/p/skia/issues/detail?id=1189
     void paintOnAndroid(WebCore::GraphicsContext*, WebGraphicsContext3D*, const WebCore::IntRect&, uint8_t alpha);
     SkBitmap m_bitmap;
 #endif
 
     WebCore::MediaPlayerClient* m_client;
     OwnPtr<WebMediaPlayer> m_webMediaPlayer;
     WebCore::KURL m_url;
     bool m_delayingLoad;
     WebCore::MediaPlayer::Preload m_preload;
     OwnPtr<WebHelperPlugin> m_helperPlugin;
     bool m_needsWebLayerForVideo;
     double m_volume;
     bool m_muted;
     double m_rate;
-    WebContentDecryptionModule* m_cdm;
 
 #if ENABLE(WEB_AUDIO)
     // AudioClientImpl wraps an AudioSourceProviderClient.
     // When the audio format is known, Chromium calls setFormat() which then dispatches into WebCore.
 
     class AudioClientImpl FINAL : public blink::WebAudioSourceProviderClient {
     public:
         AudioClientImpl(WebCore::AudioSourceProviderClient* client)
             : m_client(client)
         {
@@ skipping 35 matching lines @@
 
     AudioSourceProviderImpl m_audioSourceProvider;
 #endif
 
     WebMediaPlayer::LoadType m_loadType;
 };
 
 } // namespace blink
 
 #endif