diff options
| author | crogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-22 20:05:03 +0000 |
|---|---|---|
| committer | crogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-22 20:05:03 +0000 |
| commit | 8df5119e7f38e089337ffc1688f1bcc91c0610de (patch) | |
| tree | f0a1066864847b926b60502d8a6b8b4bdfcb82d6 /webkit | |
| parent | 970b2fdbfb3ae8fd98ff9b2a15003269d1dec5db (diff) | |
| download | chromium_src-8df5119e7f38e089337ffc1688f1bcc91c0610de.zip chromium_src-8df5119e7f38e089337ffc1688f1bcc91c0610de.tar.gz chromium_src-8df5119e7f38e089337ffc1688f1bcc91c0610de.tar.bz2 | |
Re-land http://codereview.chromium.org/6339004 which was reverted
BUG=none
TEST=none
TBR=rniwa
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webpreferences.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc index de2fc07..cc1965b 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 + // 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; |