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

Unified Diff: Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

Issue 13674022: Remove MEDIA_SOURCE feature define. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@blink-master
Patch Set: Rebase Created 7 years, 8 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/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
diff --git a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
index bc77af2f52cea64dd2e96a9b7a44d614c3c19777..2fcbc37058667c35710eaf838f9c160216fdab57 100644
--- a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
+++ b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
@@ -299,20 +299,16 @@ void WebMediaPlayerClientImpl::setWebLayer(WebLayer* layer)
void WebMediaPlayerClientImpl::load(const String& url)
{
m_url = KURL(ParsedURLString, url);
-#if ENABLE(MEDIA_SOURCE)
m_mediaSource = 0;
-#endif
loadRequested();
}
-#if ENABLE(MEDIA_SOURCE)
void WebMediaPlayerClientImpl::load(const String& url, PassRefPtr<WebCore::MediaSource> mediaSource)
{
m_url = KURL(ParsedURLString, url);
m_mediaSource = mediaSource;
loadRequested();
}
-#endif
void WebMediaPlayerClientImpl::loadRequested()
{
@@ -348,12 +344,10 @@ void WebMediaPlayerClientImpl::loadInternal()
#endif
WebMediaPlayer::CORSMode corsMode = static_cast<WebMediaPlayer::CORSMode>(m_mediaPlayer->mediaPlayerClient()->mediaPlayerCORSMode());
-#if ENABLE(MEDIA_SOURCE)
if (m_mediaSource) {
m_webMediaPlayer->load(m_url, new WebMediaSourceImpl(m_mediaSource), corsMode);
return;
}
-#endif
m_webMediaPlayer->load(m_url, corsMode);
}
}
« no previous file with comments | « Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h ('k') | Source/WebKit/chromium/src/WebMediaSourceImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698