diff options
| author | crogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 00:05:21 +0000 |
|---|---|---|
| committer | crogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 00:05:21 +0000 |
| commit | e0422e5e5b3b1098ab4f2fb54b7e680ba5fdc76d (patch) | |
| tree | c39cf7fc8bd6f6318d8766fe19547cd4b8a632b7 | |
| parent | 9ed3854e0d663b2b262c7ebb64e2cfcaeac8d09e (diff) | |
| download | chromium_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
| -rw-r--r-- | build/features_override.gypi | 5 | ||||
| -rw-r--r-- | chrome/renderer/render_thread.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/webpreferences.cc | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/build/features_override.gypi b/build/features_override.gypi index ce5415a..c2430cf 100644 --- a/build/features_override.gypi +++ b/build/features_override.gypi @@ -80,11 +80,6 @@ ], '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 a80fc7bd..cb78d4f 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -937,8 +937,10 @@ 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 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. |