summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorcrogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-22 02:32:56 +0000
committercrogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-22 02:32:56 +0000
commita4f4692c776153b2b61c0a63d8b9c80e56613881 (patch)
tree568fe436aa90898fce4efb0ffb4955ec3422a4da /webkit
parent972131b44e48e0c2558e46e22e692f279f3c5cea (diff)
downloadchromium_src-a4f4692c776153b2b61c0a63d8b9c80e56613881.zip
chromium_src-a4f4692c776153b2b61c0a63d8b9c80e56613881.tar.gz
chromium_src-a4f4692c776153b2b61c0a63d8b9c80e56613881.tar.bz2
Add run-time enable support for the web audio API
BUG=none TEST=none (tested locally on Mac OS X to verify about:flags shows the web audio feature and that it can be enabled/disabled) Review URL: http://codereview.chromium.org/6339004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/webpreferences.cc6
-rw-r--r--webkit/glue/webpreferences.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index de2fc07..cc4efef 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -60,6 +60,7 @@ WebPreferences::WebPreferences()
frame_flattening_enabled(false),
allow_universal_access_from_file_urls(false),
allow_file_access_from_file_urls(false),
+ webaudio_enabled(false),
experimental_webgl_enabled(false),
show_composited_layer_borders(false),
accelerated_compositing_enabled(false),
@@ -142,6 +143,11 @@ 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 // HAS_WEBAUDIO_FEATURE_ENABLE
+
// Enable experimental WebGL support if requested on command line
// and support is compiled in.
bool enable_webgl =
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 63c95c8..3943af1 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -66,6 +66,7 @@ struct WebPreferences {
bool frame_flattening_enabled;
bool allow_universal_access_from_file_urls;
bool allow_file_access_from_file_urls;
+ bool webaudio_enabled;
bool experimental_webgl_enabled;
bool show_composited_layer_borders;
bool accelerated_compositing_enabled;