summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorrniwa@chromium.org <rniwa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-22 05:49:45 +0000
committerrniwa@chromium.org <rniwa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-22 05:49:45 +0000
commitb8dc182ba5a4724861bd11465fb633969e4429b5 (patch)
treec2901577b2d32795a5b73de552fa69a852a3db46 /webkit
parentce38e6b81f4bd3c57ef480c46401f96981e3b75f (diff)
downloadchromium_src-b8dc182ba5a4724861bd11465fb633969e4429b5.zip
chromium_src-b8dc182ba5a4724861bd11465fb633969e4429b5.tar.gz
chromium_src-b8dc182ba5a4724861bd11465fb633969e4429b5.tar.bz2
Revert 72261 - Add run-time enable support for the web audio API
Windows browser tests are failing. 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 TBR=crogers@google.com Review URL: http://codereview.chromium.org/6364005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72270 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, 0 insertions, 7 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index cc4efef..de2fc07 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -60,7 +60,6 @@ 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),
@@ -143,11 +142,6 @@ 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 3943af1..63c95c8 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -66,7 +66,6 @@ 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;