Title: [104574] trunk/Source/WebKit/chromium
- Revision
- 104574
- Author
- [email protected]
- Date
- 2012-01-10 07:47:26 -0800 (Tue, 10 Jan 2012)
Log Message
[Chromium] Fix compilation with ENABLE_WEB_AUDIO=0
https://bugs.webkit.org/show_bug.cgi?id=75957
Reviewed by Tony Gentilcore.
Revision 104502 broke Chromium compilation for platforms which disable
the Web Audio API. All references to m_audioSourceProvider should be
guarded with the ENABLE(WEB_AUDIO) conditional.
* src/WebMediaPlayerClientImpl.cpp:
(WebKit::WebMediaPlayerClientImpl::load):
(WebKit::WebMediaPlayerClientImpl::loadInternal):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (104573 => 104574)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-01-10 15:35:59 UTC (rev 104573)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-01-10 15:47:26 UTC (rev 104574)
@@ -1,3 +1,18 @@
+2012-01-10 Peter Beverloo <[email protected]>
+
+ [Chromium] Fix compilation with ENABLE_WEB_AUDIO=0
+ https://bugs.webkit.org/show_bug.cgi?id=75957
+
+ Reviewed by Tony Gentilcore.
+
+ Revision 104502 broke Chromium compilation for platforms which disable
+ the Web Audio API. All references to m_audioSourceProvider should be
+ guarded with the ENABLE(WEB_AUDIO) conditional.
+
+ * src/WebMediaPlayerClientImpl.cpp:
+ (WebKit::WebMediaPlayerClientImpl::load):
+ (WebKit::WebMediaPlayerClientImpl::loadInternal):
+
2012-01-09 Ryosuke Niwa <[email protected]>
Roll Chromium DEPS from 116979 to 117006.
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (104573 => 104574)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-01-10 15:35:59 UTC (rev 104573)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-01-10 15:47:26 UTC (rev 104574)
@@ -237,7 +237,9 @@
m_url = url;
if (m_preload == MediaPlayer::None) {
+#if ENABLE(WEB_AUDIO)
m_audioSourceProvider.wrap(0); // Clear weak reference to m_webMediaPlayer's WebAudioSourceProvider.
+#endif
m_webMediaPlayer.clear();
m_delayingLoad = true;
} else
@@ -246,7 +248,9 @@
void WebMediaPlayerClientImpl::loadInternal()
{
+#if ENABLE(WEB_AUDIO)
m_audioSourceProvider.wrap(0); // Clear weak reference to m_webMediaPlayer's WebAudioSourceProvider.
+#endif
Frame* frame = static_cast<HTMLMediaElement*>(m_mediaPlayer->mediaPlayerClient())->document()->frame();
m_webMediaPlayer = createWebMediaPlayer(this, frame);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
