summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webpreferences.cc
diff options
context:
space:
mode:
authorcrogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-24 00:05:21 +0000
committercrogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-24 00:05:21 +0000
commite0422e5e5b3b1098ab4f2fb54b7e680ba5fdc76d (patch)
treec39cf7fc8bd6f6318d8766fe19547cd4b8a632b7 /webkit/glue/webpreferences.cc
parent9ed3854e0d663b2b262c7ebb64e2cfcaeac8d09e (diff)
downloadchromium_src-e0422e5e5b3b1098ab4f2fb54b7e680ba5fdc76d.zip
chromium_src-e0422e5e5b3b1098ab4f2fb54b7e680ba5fdc76d.tar.gz
chromium_src-e0422e5e5b3b1098ab4f2fb54b7e680ba5fdc76d.tar.bz2
Revert 72306 - Conditionally add compile-time enable for web audio API on Mac OS X
This is a more limited version of the patch already reviewed here: http://codereview.chromium.org/6308014/ BUG=none TEST=none (tested locally on Mac OS X to verify build and that the feature could be enabled) Review URL: http://codereview.chromium.org/6388002 TBR=crogers@google.com Review URL: http://codereview.chromium.org/6271014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72307 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webpreferences.cc')
-rw-r--r--webkit/glue/webpreferences.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index c0ff514..cc1965b 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -143,8 +143,10 @@ 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.