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

Unified Diff: Source/web/WebMediaPlayerClientImpl.cpp

Issue 604753003: Removing #ifdefs for WEB_AUDIO compile time flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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 e326a2e30c029c7236e0957bc7e2f353dcb365f8..6802c8db220840fe56cdc649f73d1648c99fd450 100644
--- a/Source/web/WebMediaPlayerClientImpl.cpp
+++ b/Source/web/WebMediaPlayerClientImpl.cpp
@@ -210,10 +210,8 @@ void WebMediaPlayerClientImpl::load(WebMediaPlayer::LoadType loadType, const WTF
if (!m_webMediaPlayer)
return;
-#if ENABLE(WEB_AUDIO)
// Make sure if we create/re-create the WebMediaPlayer that we update our wrapper.
m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider());
-#endif
m_webMediaPlayer->setVolume(mediaElement().effectiveMediaVolume());
@@ -228,12 +226,10 @@ void WebMediaPlayerClientImpl::setPreload(MediaPlayer::Preload preload)
m_webMediaPlayer->setPreload(static_cast<WebMediaPlayer::Preload>(preload));
}
-#if ENABLE(WEB_AUDIO)
AudioSourceProvider* WebMediaPlayerClientImpl::audioSourceProvider()
{
return &m_audioSourceProvider;
}
-#endif
PassOwnPtr<MediaPlayer> WebMediaPlayerClientImpl::create(MediaPlayerClient* client)
{
@@ -251,7 +247,6 @@ HTMLMediaElement& WebMediaPlayerClientImpl::mediaElement() const
return *static_cast<HTMLMediaElement*>(m_client);
}
-#if ENABLE(WEB_AUDIO)
void WebMediaPlayerClientImpl::AudioSourceProviderImpl::wrap(WebAudioSourceProvider* provider)
{
MutexLocker locker(provideInputLock);
@@ -309,6 +304,4 @@ void WebMediaPlayerClientImpl::AudioClientImpl::trace(Visitor* visitor)
visitor->trace(m_client);
}
-#endif
-
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698