Changeset 95160 in webkit


Ignore:
Timestamp:
Sep 14, 2011 9:15:52 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

[Chromium] Make WEB_AUDIO conditional and fix the build when disabled
​https://bugs.webkit.org/show_bug.cgi?id=68107

Patch by Peter Beverloo <​peter@chromium.org> on 2011-09-14
Reviewed by Kenneth Russell.

  • features.gypi:
  • src/WebMediaPlayerClientImpl.cpp:

(WebKit::WebMediaPlayerClientImpl::audioSourceProvider):

  • src/WebMediaPlayerClientImpl.h:
Location:
trunk/Source/WebKit/chromium
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/chromium/ChangeLog

    r95156 r95160  
     12011-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
    1132011-09-14  John Bauman  <jbauman@chromium.org>
    214

  • trunk/Source/WebKit/chromium/features.gypi

    r95107 r95160  
    8686      'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
    8787      'ENABLE_VIDEO=1',
    88       'ENABLE_WEB_AUDIO=1',
    8988      'ENABLE_WEB_SOCKETS=1',
    9089      'ENABLE_WEB_TIMING=1',
    … …  
    119118    'use_skia%': '<(use_skia)',
    120119    'conditions': [
     120      ['OS=="android"', {
     121        'feature_defines': [
     122          'ENABLE_WEB_AUDIO=0',
     123        ],
     124      }, {
     125        'feature_defines': [
     126          'ENABLE_WEB_AUDIO=1',
     127        ],
     128      }],
    121129      ['use_accelerated_compositing==1', {
    122130        'feature_defines': [

  • trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

    r94431 r95160  
    557557WebCore::AudioSourceProvider* WebMediaPlayerClientImpl::audioSourceProvider()
    558558{
     559#if ENABLE(WEB_AUDIO)
    559560    if (m_webMediaPlayer.get()) {
    560561        // Wrap the WebAudioSourceProvider in the form of WebCore::AudioSourceProvider.
    … …  
    562563        return &m_audioSourceProvider;
    563564    }
     565#endif
    564566    return 0;
    565567}
    … …  
    664666}
    665667
     668#if ENABLE(WEB_AUDIO)
    666669void WebMediaPlayerClientImpl::AudioSourceProviderImpl::provideInput(WebCore::AudioBus* bus, size_t framesToProcess)
    667670{
    … …  
    684687    m_webAudioSourceProvider->provideInput(webAudioData, framesToProcess);
    685688}
     689#endif
    686690
    687691} // namespace WebKit

  • trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h

    r94121 r95160  
    166166    static bool m_isEnabled;
    167167
     168#if ENABLE(WEB_AUDIO)
    168169    // AudioSourceProviderImpl wraps a WebAudioSourceProvider.
    169170
    … …  
    185186
    186187    AudioSourceProviderImpl m_audioSourceProvider;
     188#endif
    187189};
    188190
Note: See TracChangeset for help on using the changeset viewer.