Commit 48cb7828 authored by crogers@google.com's avatar crogers@google.com

Conditionally add compile-time enable for the web audio API only on Mac OS X

This is effectively a pared-down version of the already reviewed:
http://codereview.chromium.org/6308014/
BUG=none
TEST=none
(tested locally for Mac OS X which is the only platform this affects)

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72308 0039d316-1c4b-4281-b951-d872f2087c98
parent e0422e5e
...@@ -371,6 +371,8 @@ ...@@ -371,6 +371,8 @@
['OS=="mac"', { ['OS=="mac"', {
'link_settings': { 'link_settings': {
'libraries': [ 'libraries': [
'$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
'$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
'$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
], ],
}, },
......
...@@ -80,6 +80,11 @@ ...@@ -80,6 +80,11 @@
], ],
'use_accelerated_compositing': 1, 'use_accelerated_compositing': 1,
}], }],
['OS=="mac"', {
'feature_defines': [
'ENABLE_WEB_AUDIO=1',
],
}],
], ],
# TODO: If the need arises, create a mechanism that will intelligently # TODO: If the need arises, create a mechanism that will intelligently
# merge the lists rather than replace one with the other. This may # merge the lists rather than replace one with the other. This may
......
...@@ -937,10 +937,8 @@ void RenderThread::EnsureWebKitInitialized() { ...@@ -937,10 +937,8 @@ void RenderThread::EnsureWebKitInitialized() {
WebRuntimeFeatures::enableGeolocation( WebRuntimeFeatures::enableGeolocation(
!command_line.HasSwitch(switches::kDisableGeolocation)); !command_line.HasSwitch(switches::kDisableGeolocation));
#ifdef HAS_WEBAUDIO_RUNTIMEFEATURES
WebRuntimeFeatures::enableWebAudio( WebRuntimeFeatures::enableWebAudio(
command_line.HasSwitch(switches::kEnableWebAudio)); command_line.HasSwitch(switches::kEnableWebAudio));
#endif
WebRuntimeFeatures::enableWebGL( WebRuntimeFeatures::enableWebGL(
!command_line.HasSwitch(switches::kDisable3DAPIs) && !command_line.HasSwitch(switches::kDisable3DAPIs) &&
......
...@@ -143,10 +143,8 @@ void WebPreferences::Apply(WebView* web_view) const { ...@@ -143,10 +143,8 @@ void WebPreferences::Apply(WebView* web_view) const {
// but also because it cause a possible crash in Editor::hasBidiSelection(). // but also because it cause a possible crash in Editor::hasBidiSelection().
settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded(); settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
#ifdef HAS_WEBAUDIO_FEATURE_ENABLE
// Enable the web audio API if requested on the command line. // Enable the web audio API if requested on the command line.
settings->setWebAudioEnabled(webaudio_enabled); settings->setWebAudioEnabled(webaudio_enabled);
#endif
// Enable experimental WebGL support if requested on command line // Enable experimental WebGL support if requested on command line
// and support is compiled in. // and support is compiled in.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment