Enable WebAudio support on Android/x86.

content/child/runtime_features.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/runtime_features.h"
 
 #include "base/command_line.h"
 #include "content/public/common/content_switches.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 
 #if defined(OS_ANDROID)
 #include <cpu-features.h>
 #include "media/base/android/media_codec_bridge.h"
 #endif
 
 using blink::WebRuntimeFeatures;
 
 namespace content {
 
 static void SetRuntimeFeatureDefaultsForPlatform() {
 #if defined(OS_ANDROID)
 #if !defined(GOOGLE_TV)
   // MSE/EME implementation needs Android MediaCodec API.
   if (!media::MediaCodecBridge::IsAvailable()) {
     WebRuntimeFeatures::enableWebKitMediaSource(false);
     WebRuntimeFeatures::enableMediaSource(false);
     WebRuntimeFeatures::enablePrefixedEncryptedMedia(false);
   }
 #endif  // !defined(GOOGLE_TV)
-  bool enable_webaudio = false;
-#if defined(ARCH_CPU_ARMEL)
-  // WebAudio needs Android MediaCodec API
-  enable_webaudio = media::MediaCodecBridge::IsAvailable();
-#endif  // defined(ARCH_CPU_ARMEL)
-  WebRuntimeFeatures::enableWebAudio(enable_webaudio);
+  // WebAudio is enabled by default only on ARM and only when the
+  // MediaCodec API is available.
+  WebRuntimeFeatures::enableWebAudio(
+      media::MediaCodecBridge::IsAvailable() &&
+      (android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM));
   // Android does not support the Gamepad API.
   WebRuntimeFeatures::enableGamepad(false);
   // Android does not have support for PagePopup
   WebRuntimeFeatures::enablePagePopup(false);
   // datalist on Android is not enabled
   WebRuntimeFeatures::enableDataListElement(false);
   // Android does not yet support the Web Notification API. crbug.com/115320
   WebRuntimeFeatures::enableNotifications(false);
   // Android does not yet support SharedWorker. crbug.com/154571
   WebRuntimeFeatures::enableSharedWorker(false);
@@ skipping 42 matching lines @@
     WebRuntimeFeatures::enablePeerConnection(false);
   }
 
   if (!command_line.HasSwitch(switches::kEnableSpeechRecognition))
     WebRuntimeFeatures::enableScriptedSpeech(false);
 #endif
 
   if (command_line.HasSwitch(switches::kEnableServiceWorker))
     WebRuntimeFeatures::enableServiceWorker(true);
 
+#if defined(OS_ANDROID)
+  // WebAudio requires the MediaCodec API.
+#if defined(ARCH_CPU_X86)
+  // WebAudio is disabled by default on x86.
+  WebRuntimeFeatures::enableWebAudio(
+      command_line.HasSwitch(switches::kEnableWebAudio) &&
+      media::MediaCodecBridge::IsAvailable());
+#elif defined(ARCH_CPU_ARMEL)
+  // WebAudio is enabled by default on ARM.
+  WebRuntimeFeatures::enableWebAudio(
+      !command_line.HasSwitch(switches::kDisableWebAudio) &&
+      media::MediaCodecBridge::IsAvailable());
+#else
+  WebRuntimeFeatures::enableWebAudio(false);
+#endif
+#else
   if (command_line.HasSwitch(switches::kDisableWebAudio))
     WebRuntimeFeatures::enableWebAudio(false);
+#endif
 
   if (command_line.HasSwitch(switches::kDisableFullScreen))
     WebRuntimeFeatures::enableFullscreen(false);
 
   if (command_line.HasSwitch(switches::kEnableEncryptedMedia))
     WebRuntimeFeatures::enableEncryptedMedia(true);
 
   if (command_line.HasSwitch(switches::kDisablePrefixedEncryptedMedia))
     WebRuntimeFeatures::enablePrefixedEncryptedMedia(false);
 
@@ skipping 44 matching lines @@
     WebRuntimeFeatures::enableInputModeAttribute(true);
 
   if (command_line.HasSwitch(switches::kEnableFastTextAutosizing))
     WebRuntimeFeatures::enableFastTextAutosizing(true);
 
   if (command_line.HasSwitch(switches::kEnableRepaintAfterLayout))
     WebRuntimeFeatures::enableRepaintAfterLayout(true);
 }
 
 }  // namespace content