Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1249)

Unified Diff: Source/web/WebMediaPlayerClientImpl.cpp

Issue 157423003: Remove the dependency on encryptedmedia from HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address ddorwin's review comments. Created 6 years, 10 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
Index: Source/web/WebMediaPlayerClientImpl.cpp
diff --git a/Source/web/WebMediaPlayerClientImpl.cpp b/Source/web/WebMediaPlayerClientImpl.cpp
index 5ff8923acfccddb56ff0bbc115fb26698c5fcb69..2610ff7a7725a272c3a8cc2beb20dae788256c0d 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()
{
+ HTMLMediaElementEncryptedMedia::playerDestroyed(mediaElement());
+
// 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(mediaElement(), keySystem, sessionId);
}
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(mediaElement(), 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(mediaElement(), 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(mediaElement(), contentType, initData, initDataLength);
}
WebPlugin* WebMediaPlayerClientImpl::createHelperPlugin(const WebString& pluginType, WebFrame* frame)
@@ -227,7 +231,7 @@ void WebMediaPlayerClientImpl::loadInternal()
#endif
// FIXME: Remove this cast
- Frame* frame = static_cast<HTMLMediaElement*>(m_client)->document().frame();
+ Frame* frame = mediaElement().document().frame();
WebURL poster = m_client->mediaPlayerPosterURL();
@@ -248,7 +252,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(mediaElement()));
WebMediaPlayer::CORSMode corsMode = static_cast<WebMediaPlayer::CORSMode>(m_client->mediaPlayerCORSMode());
m_webMediaPlayer->load(m_loadType, m_url, corsMode);
@@ -284,40 +288,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 +591,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);
@@ -680,6 +649,11 @@ void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannel
m_client->setFormat(numberOfChannels, sampleRate);
}
+WebCore::HTMLMediaElement& WebMediaPlayerClientImpl::mediaElement() const
+{
+ return *static_cast<HTMLMediaElement*>(m_client);
+}
+
#endif
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698