Index: Source/web/WebMediaPlayerClientImpl.cpp |
diff --git a/Source/web/WebMediaPlayerClientImpl.cpp b/Source/web/WebMediaPlayerClientImpl.cpp |
index 5ff8923acfccddb56ff0bbc115fb26698c5fcb69..9b896e7f9d963f53e67b13f00a353fce3020f60c 100644 |
--- a/Source/web/WebMediaPlayerClientImpl.cpp |
+++ b/Source/web/WebMediaPlayerClientImpl.cpp |
@@ -15,6 +15,8 @@ |
#include "core/html/TimeRanges.h" |
#include "core/rendering/RenderLayerCompositor.h" |
#include "core/rendering/RenderView.h" |
+#include "modules/encryptedMedia/HTMLMediaElementEncryptedMedia.h" |
+#include "modules/encryptedMedia/MediaKeyNeededEvent.h" |
#include "modules/mediastream/MediaStreamRegistry.h" |
#include "platform/audio/AudioBus.h" |
#include "platform/audio/AudioSourceProviderClient.h" |
@@ -60,7 +62,7 @@ static PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(WebMediaPlayerClient* cli |
return adoptPtr(webFrame->client()->createMediaPlayer(webFrame, url, client)); |
} |
-WebMediaPlayer* WebMediaPlayerClientImpl::mediaPlayer() const |
+WebMediaPlayer* WebMediaPlayerClientImpl::webMediaPlayer() const |
{ |
return m_webMediaPlayer.get(); |
} |
@@ -69,6 +71,8 @@ WebMediaPlayer* WebMediaPlayerClientImpl::mediaPlayer() const |
WebMediaPlayerClientImpl::~WebMediaPlayerClientImpl() |
{ |
+ playerDestroyed(); |
acolwell GONE FROM CHROMIUM
2014/02/26 17:19:19
This looks like the only call to this method so I
|
+ |
// Explicitly destroy the WebMediaPlayer to allow verification of tear down. |
m_webMediaPlayer.clear(); |
@@ -128,22 +132,22 @@ WebMediaPlayer::Preload WebMediaPlayerClientImpl::preload() const |
void WebMediaPlayerClientImpl::keyAdded(const WebString& keySystem, const WebString& sessionId) |
{ |
- m_client->mediaPlayerKeyAdded(keySystem, sessionId); |
+ HTMLMediaElementEncryptedMedia::keyAdded(*static_cast<HTMLMediaElement*>(m_client), keySystem, sessionId); |
acolwell GONE FROM CHROMIUM
2014/02/26 17:19:19
nit: Please put the static_cast into a HTMLMediaEl
|
} |
void WebMediaPlayerClientImpl::keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode errorCode, unsigned short systemCode) |
{ |
- m_client->mediaPlayerKeyError(keySystem, sessionId, static_cast<MediaPlayerClient::MediaKeyErrorCode>(errorCode), systemCode); |
+ HTMLMediaElementEncryptedMedia::keyError(*static_cast<HTMLMediaElement*>(m_client), keySystem, sessionId, errorCode, systemCode); |
} |
void WebMediaPlayerClientImpl::keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL) |
{ |
- m_client->mediaPlayerKeyMessage(keySystem, sessionId, message, messageLength, defaultURL); |
+ HTMLMediaElementEncryptedMedia::keyMessage(*static_cast<HTMLMediaElement*>(m_client), keySystem, sessionId, message, messageLength, defaultURL); |
} |
void WebMediaPlayerClientImpl::keyNeeded(const WebString& contentType, const unsigned char* initData, unsigned initDataLength) |
{ |
- m_client->mediaPlayerKeyNeeded(contentType, initData, initDataLength); |
+ HTMLMediaElementEncryptedMedia::keyNeeded(*static_cast<HTMLMediaElement*>(m_client), contentType, initData, initDataLength); |
} |
WebPlugin* WebMediaPlayerClientImpl::createHelperPlugin(const WebString& pluginType, WebFrame* frame) |
@@ -165,13 +169,17 @@ WebPlugin* WebMediaPlayerClientImpl::createHelperPlugin(const WebString& pluginT |
return plugin; |
} |
-// FIXME: |frame| no longer needed. |
-void WebMediaPlayerClientImpl::closeHelperPluginSoon(WebFrame* frame) |
+void WebMediaPlayerClientImpl::closeHelperPluginSoon(WebFrame*) |
{ |
ASSERT(m_helperPlugin); |
m_helperPlugin.clear(); |
} |
+void WebMediaPlayerClientImpl::playerDestroyed() |
+{ |
+ HTMLMediaElementEncryptedMedia::playerDestroyed(*static_cast<HTMLMediaElement*>(m_client)); |
+} |
+ |
void WebMediaPlayerClientImpl::setWebLayer(blink::WebLayer* layer) |
{ |
m_client->mediaPlayerSetWebLayer(layer); |
@@ -248,7 +256,7 @@ void WebMediaPlayerClientImpl::loadInternal() |
m_webMediaPlayer->setPoster(poster); |
// Tell WebMediaPlayer about any connected CDM (may be null). |
- m_webMediaPlayer->setContentDecryptionModule(m_cdm); |
+ m_webMediaPlayer->setContentDecryptionModule(HTMLMediaElementEncryptedMedia::contentDecryptionModule(*static_cast<HTMLMediaElement*>(m_client))); |
WebMediaPlayer::CORSMode corsMode = static_cast<WebMediaPlayer::CORSMode>(m_client->mediaPlayerCORSMode()); |
m_webMediaPlayer->load(m_loadType, m_url, corsMode); |
@@ -284,40 +292,6 @@ bool WebMediaPlayerClientImpl::canShowFullscreenOverlay() const |
return m_webMediaPlayer && m_webMediaPlayer->canEnterFullscreen(); |
} |
-MediaPlayer::MediaKeyException WebMediaPlayerClientImpl::generateKeyRequest(const String& keySystem, const unsigned char* initData, unsigned initDataLength) |
-{ |
- if (!m_webMediaPlayer) |
- return MediaPlayer::InvalidPlayerState; |
- |
- WebMediaPlayer::MediaKeyException result = m_webMediaPlayer->generateKeyRequest(keySystem, initData, initDataLength); |
- return static_cast<MediaPlayer::MediaKeyException>(result); |
-} |
- |
-MediaPlayer::MediaKeyException WebMediaPlayerClientImpl::addKey(const String& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId) |
-{ |
- if (!m_webMediaPlayer) |
- return MediaPlayer::InvalidPlayerState; |
- |
- WebMediaPlayer::MediaKeyException result = m_webMediaPlayer->addKey(keySystem, key, keyLength, initData, initDataLength, sessionId); |
- return static_cast<MediaPlayer::MediaKeyException>(result); |
-} |
- |
-MediaPlayer::MediaKeyException WebMediaPlayerClientImpl::cancelKeyRequest(const String& keySystem, const String& sessionId) |
-{ |
- if (!m_webMediaPlayer) |
- return MediaPlayer::InvalidPlayerState; |
- |
- WebMediaPlayer::MediaKeyException result = m_webMediaPlayer->cancelKeyRequest(keySystem, sessionId); |
- return static_cast<MediaPlayer::MediaKeyException>(result); |
-} |
- |
-void WebMediaPlayerClientImpl::setContentDecryptionModule(WebContentDecryptionModule* cdm) |
-{ |
- m_cdm = cdm; |
- if (m_webMediaPlayer) |
- m_webMediaPlayer->setContentDecryptionModule(cdm); |
-} |
- |
void WebMediaPlayerClientImpl::prepareToPlay() |
{ |
if (m_delayingLoad) |
@@ -621,7 +595,6 @@ WebMediaPlayerClientImpl::WebMediaPlayerClientImpl(MediaPlayerClient* client) |
, m_volume(1.0) |
, m_muted(false) |
, m_rate(1.0) |
- , m_cdm(0) |
, m_loadType(WebMediaPlayer::LoadTypeURL) |
{ |
ASSERT(m_client); |