summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/features_override.gypi5
-rw-r--r--chrome/renderer/render_thread.cc2
-rw-r--r--webkit/glue/webpreferences.cc2
3 files changed, 5 insertions, 4 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi
index c2430cf..ce5415a 100644
--- a/build/features_override.gypi
+++ b/build/features_override.gypi
@@ -80,6 +80,11 @@
],
'use_accelerated_compositing': 1,
}],
+ ['OS=="mac"', {
+ 'feature_defines': [
+ 'ENABLE_WEB_AUDIO=1',
+ ],
+ }],
],
# TODO: If the need arises, create a mechanism that will intelligently
# merge the lists rather than replace one with the other. This may
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index cb78d4f..a80fc7bd 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -937,10 +937,8 @@ void RenderThread::EnsureWebKitInitialized() {
WebRuntimeFeatures::enableGeolocation(
!command_line.HasSwitch(switches::kDisableGeolocation));
-#ifdef HAS_WEBAUDIO_RUNTIMEFEATURES
WebRuntimeFeatures::enableWebAudio(
command_line.HasSwitch(switches::kEnableWebAudio));
-#endif
WebRuntimeFeatures::enableWebGL(
!command_line.HasSwitch(switches::kDisable3DAPIs) &&
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index cc1965b..c0ff514 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -143,10 +143,8 @@ void WebPreferences::Apply(WebView* web_view) const {
// but also because it cause a possible crash in Editor::hasBidiSelection().
settings->setTextDirectionSubmenuInclusionBehaviorNeverIncluded();
-#ifdef HAS_WEBAUDIO_FEATURE_ENABLE
// Enable the web audio API if requested on the command line.
settings->setWebAudioEnabled(webaudio_enabled);
-#endif
// Enable experimental WebGL support if requested on command line
// and support is compiled in.