Changeset 95160 in webkit
- Timestamp:
- Sep 14, 2011 9:15:52 PM (13 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r95156 r95160 1 2011-09-14 Peter Beverloo <peter@chromium.org> 2 3 [Chromium] Make WEB_AUDIO conditional and fix the build when disabled 4 https://bugs.webkit.org/show_bug.cgi?id=68107 5 6 Reviewed by Kenneth Russell. 7 8 * features.gypi: 9 * src/WebMediaPlayerClientImpl.cpp: 10 (WebKit::WebMediaPlayerClientImpl::audioSourceProvider): 11 * src/WebMediaPlayerClientImpl.h: 12 1 13 2011-09-14 John Bauman <jbauman@chromium.org> 2 14 -
trunk/Source/WebKit/chromium/features.gypi
r95107 r95160 86 86 'ENABLE_V8_SCRIPT_DEBUG_SERVER=1', 87 87 'ENABLE_VIDEO=1', 88 'ENABLE_WEB_AUDIO=1',89 88 'ENABLE_WEB_SOCKETS=1', 90 89 'ENABLE_WEB_TIMING=1', … … 119 118 'use_skia%': '<(use_skia)', 120 119 'conditions': [ 120 ['OS=="android"', { 121 'feature_defines': [ 122 'ENABLE_WEB_AUDIO=0', 123 ], 124 }, { 125 'feature_defines': [ 126 'ENABLE_WEB_AUDIO=1', 127 ], 128 }], 121 129 ['use_accelerated_compositing==1', { 122 130 'feature_defines': [ -
trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
r94431 r95160 557 557 WebCore::AudioSourceProvider* WebMediaPlayerClientImpl::audioSourceProvider() 558 558 { 559 #if ENABLE(WEB_AUDIO) 559 560 if (m_webMediaPlayer.get()) { 560 561 // Wrap the WebAudioSourceProvider in the form of WebCore::AudioSourceProvider. … … 562 563 return &m_audioSourceProvider; 563 564 } 565 #endif 564 566 return 0; 565 567 } … … 664 666 } 665 667 668 #if ENABLE(WEB_AUDIO) 666 669 void WebMediaPlayerClientImpl::AudioSourceProviderImpl::provideInput(WebCore::AudioBus* bus, size_t framesToProcess) 667 670 { … … 684 687 m_webAudioSourceProvider->provideInput(webAudioData, framesToProcess); 685 688 } 689 #endif 686 690 687 691 } // namespace WebKit -
trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h
r94121 r95160 166 166 static bool m_isEnabled; 167 167 168 #if ENABLE(WEB_AUDIO) 168 169 // AudioSourceProviderImpl wraps a WebAudioSourceProvider. 169 170 … … 185 186 186 187 AudioSourceProviderImpl m_audioSourceProvider; 188 #endif 187 189 }; 188 190
Note: See TracChangeset
for help on using the changeset viewer.