Separate encrypted media functions out of WebMediaPlayerClient interface

public/platform/WebMediaPlayerClient.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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebMediaPlayerClient_h
 #define WebMediaPlayerClient_h
 
 #include "WebMediaPlayer.h"
-#include "public/platform/WebEncryptedMediaTypes.h"
+#include "WebMediaPlayerEncryptedMediaClient.h"
 
 namespace blink {
 
 class WebInbandTextTrack;
 class WebLayer;
 class WebMediaSource;
-class WebURL;
 
-class WebMediaPlayerClient {
+// TODO(srirama): Remove this inheritance when we get rid of the MediaPlayer
+// and MediaPlayerClient interfaces by having HTMLMediaElement implement
+// WebMediaPlayerClient interface. See crbug.com/350571.
+class WebMediaPlayerClient : public WebMediaPlayerEncryptedMediaClient {
 public:
-    enum MediaKeyErrorCode {
-        MediaKeyErrorCodeUnknown = 1,
-        MediaKeyErrorCodeClient,
-        MediaKeyErrorCodeService,
-        MediaKeyErrorCodeOutput,
-        MediaKeyErrorCodeHardwareChange,
-        MediaKeyErrorCodeDomain,
-    };
-
     enum VideoTrackKind {
         VideoTrackKindNone,
         VideoTrackKindAlternative,
         VideoTrackKindCaptions,
         VideoTrackKindMain,
         VideoTrackKindSign,
         VideoTrackKindSubtitles,
         VideoTrackKindCommentary
     };
 
     enum AudioTrackKind {
         AudioTrackKindNone,
         AudioTrackKindAlternative,
         AudioTrackKindDescriptions,
         AudioTrackKindMain,
         AudioTrackKindMainDescriptions,
         AudioTrackKindTranslation,
         AudioTrackKindCommentary
     };
 
     virtual void networkStateChanged() = 0;
     virtual void readyStateChanged() = 0;
     virtual void timeChanged() = 0;
     virtual void repaint() = 0;
     virtual void durationChanged() = 0;
     virtual void sizeChanged() = 0;
     virtual void playbackStateChanged() = 0;
-    virtual void keyAdded(const WebString& keySystem, const WebString& sessionId) = 0;
-    virtual void keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode, unsigned short systemCode) = 0;
-    virtual void keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL) = 0;
-    virtual void encrypted(WebEncryptedMediaInitDataType, const unsigned char* initData, unsigned initDataLength) = 0;
-    virtual void didBlockPlaybackWaitingForKey() = 0;
-    virtual void didResumePlaybackBlockedForKey() = 0;
     virtual void setWebLayer(WebLayer*) = 0;
     virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrackKind, const WebString& label, const WebString& language, bool enabled) = 0;
     virtual void removeAudioTrack(WebMediaPlayer::TrackId) = 0;
     virtual WebMediaPlayer::TrackId addVideoTrack(const WebString& id, VideoTrackKind, const WebString& label, const WebString& language, bool selected) = 0;
     virtual void removeVideoTrack(WebMediaPlayer::TrackId) = 0;
     virtual void addTextTrack(WebInbandTextTrack*) = 0;
     virtual void removeTextTrack(WebInbandTextTrack*) = 0;
     virtual void mediaSourceOpened(WebMediaSource*) = 0;
     virtual void requestSeek(double) = 0;
     virtual void remoteRouteAvailabilityChanged(bool) = 0;
     virtual void connectedToRemoteDevice() = 0;
     virtual void disconnectedFromRemoteDevice() = 0;
 
 protected:
     ~WebMediaPlayerClient() { }
 };
 
 } // namespace blink
 
 #endif