Attachment 107379 Details for Bug 68107 – Patch

[patch] Patch

web-audio-patch.patch (text/plain), 3.45 KB, created by Peter Beverloo on 2011-09-14 12:50:24 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Beverloo

Created: 2011-09-14 12:50:24 PDT

Size: 3.45 KB

patch

obsolete

>diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
>index 250fbe5..38e10ba 100644
>--- a/Source/WebKit/chromium/ChangeLog
>+++ b/Source/WebKit/chromium/ChangeLog
>@@ -1,3 +1,15 @@
>+2011-09-14  Peter Beverloo  <peter@chromium.org>
>+
>+        [Chromium] Make WEB_AUDIO conditional and fix the build when disabled
>+        https://bugs.webkit.org/show_bug.cgi?id=68107
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * features.gypi:
>+        * src/WebMediaPlayerClientImpl.cpp:
>+        (WebKit::WebMediaPlayerClientImpl::audioSourceProvider):
>+        * src/WebMediaPlayerClientImpl.h:
>+
> 2011-09-05  Yury Semikhatsky  <yurys@chromium.org>
> 
>         [Chromium] Web Inspector: repair console sniffing for interactive ui tests
>diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi
>index 2717c50..ff73797 100644
>--- a/Source/WebKit/chromium/features.gypi
>+++ b/Source/WebKit/chromium/features.gypi
>@@ -86,7 +86,6 @@
>       'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
>       'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',
>       'ENABLE_VIDEO=1',
>-      'ENABLE_WEB_AUDIO=1',
>       'ENABLE_WEB_SOCKETS=1',
>       'ENABLE_WEB_TIMING=1',
>       'ENABLE_WEBGL=1',
>@@ -121,6 +120,15 @@
>     'enable_smooth_scrolling%': '<(enable_smooth_scrolling)',
>     'use_skia%': '<(use_skia)',
>     'conditions': [
>+      ['OS=="android"', {
>+        'feature_defines': [
>+          'ENABLE_WEB_AUDIO=0',
>+        ],
>+      }, {
>+        'feature_defines': [
>+          'ENABLE_WEB_AUDIO=1',
>+        ],
>+      }],
>       ['use_accelerated_compositing==1', {
>         'feature_defines': [
>           'WTF_USE_ACCELERATED_COMPOSITING=1',
>diff --git a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
>index ce51afc..a2a0f90 100644
>--- a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
>+++ b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
>@@ -556,11 +556,13 @@ unsigned WebMediaPlayerClientImpl::videoDecodedByteCount() const
> 
> WebCore::AudioSourceProvider* WebMediaPlayerClientImpl::audioSourceProvider()
> {
>+#if ENABLE(WEB_AUDIO)
>     if (m_webMediaPlayer.get()) {
>         // Wrap the WebAudioSourceProvider in the form of WebCore::AudioSourceProvider.
>         m_audioSourceProvider.initialize(m_webMediaPlayer->audioSourceProvider());
>         return &m_audioSourceProvider;
>     }
>+#endif
>     return 0;
> }
> 
>@@ -663,6 +665,7 @@ WebMediaPlayerClientImpl::WebMediaPlayerClientImpl()
> {
> }
> 
>+#if ENABLE(WEB_AUDIO)
> void WebMediaPlayerClientImpl::AudioSourceProviderImpl::provideInput(WebCore::AudioBus* bus, size_t framesToProcess)
> {
>     ASSERT(bus);
>@@ -683,6 +686,7 @@ void WebMediaPlayerClientImpl::AudioSourceProviderImpl::provideInput(WebCore::Au
> 
>     m_webAudioSourceProvider->provideInput(webAudioData, framesToProcess);
> }
>+#endif
> 
> } // namespace WebKit
> 
>diff --git a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h
>index 35f854d..448680f 100644
>--- a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h
>+++ b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h
>@@ -165,6 +165,7 @@ private:
> #endif
>     static bool m_isEnabled;
> 
>+#if ENABLE(WEB_AUDIO)
>     // AudioSourceProviderImpl wraps a WebAudioSourceProvider.
> 
>     class AudioSourceProviderImpl : public WebCore::AudioSourceProvider {
>@@ -184,6 +185,7 @@ private:
>     };
> 
>     AudioSourceProviderImpl m_audioSourceProvider;
>+#endif
> };
> 
> } // namespace WebKit

Actions: View | Formatted Diff | Diff

Attachments on bug 68107: 107379