Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / child / runtime_features.cc

diff --git a/src/content/child/runtime_features.cc b/src/content/child/runtime_features.cc
index abbeba7..bc0c204 100644 (file)
--- a/src/content/child/runtime_features.cc
+++ b/src/content/child/runtime_features.cc
@@ -23,15 +23,16 @@ static void SetRuntimeFeatureDefaultsForPlatform() {
 #if defined(OS_ANDROID)
   // MSE/EME implementation needs Android MediaCodec API.
   if (!media::MediaCodecBridge::IsAvailable()) {
-    WebRuntimeFeatures::enableWebKitMediaSource(false);
     WebRuntimeFeatures::enableMediaSource(false);
     WebRuntimeFeatures::enablePrefixedEncryptedMedia(false);
+    WebRuntimeFeatures::enableEncryptedMedia(false);
   }
-  // WebAudio is enabled by default only on ARM and only when the
+  // WebAudio is enabled by default on ARM and X86 and only when the
   // MediaCodec API is available.
   WebRuntimeFeatures::enableWebAudio(
       media::MediaCodecBridge::IsAvailable() &&
-      (android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM));
+      ((android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM) ||
+       (android_getCpuFamily() == ANDROID_CPU_FAMILY_X86)));
   // Android does not support the Gamepad API.
   WebRuntimeFeatures::enableGamepad(false);
   // Android does not have support for PagePopup
@@ -74,10 +75,7 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
   if (command_line.HasSwitch(switches::kDisableSessionStorage))
     WebRuntimeFeatures::enableSessionStorage(false);
 
-  if (command_line.HasSwitch(switches::kDisableWebKitMediaSource))
-    WebRuntimeFeatures::enableWebKitMediaSource(false);
-
-  if (command_line.HasSwitch(switches::kDisableUnprefixedMediaSource))
+  if (command_line.HasSwitch(switches::kDisableMediaSource))
     WebRuntimeFeatures::enableMediaSource(false);
 
   if (command_line.HasSwitch(switches::kDisableSharedWorkers))
@@ -97,21 +95,12 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
     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.
+  // WebAudio is enabled by default on ARM and X86, if the MediaCodec
+  // API is available.
   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
@@ -128,9 +117,6 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
   if (command_line.HasSwitch(switches::kEnableWebMIDI))
     WebRuntimeFeatures::enableWebMIDI(true);
 
-  if (command_line.HasSwitch(switches::kDisableSpeechInput))
-    WebRuntimeFeatures::enableSpeechInput(false);
-
   if (command_line.HasSwitch(switches::kDisableFileSystem))
     WebRuntimeFeatures::enableFileSystem(false);
 
@@ -143,9 +129,6 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
   if (command_line.HasSwitch(switches::kEnableWebGLDraftExtensions))
     WebRuntimeFeatures::enableWebGLDraftExtensions(true);
 
-  if (command_line.HasSwitch(switches::kEnableHTMLImports))
-    WebRuntimeFeatures::enableHTMLImports(true);
-
   if (command_line.HasSwitch(switches::kEnableOverlayFullscreenVideo))
     WebRuntimeFeatures::enableOverlayFullscreenVideo(true);
 
@@ -167,6 +150,9 @@ void SetRuntimeFeaturesDefaultsAndUpdateFromArgs(
 
   if (command_line.HasSwitch(switches::kEnableBleedingEdgeRenderingFastPaths))
     WebRuntimeFeatures::enableBleedingEdgeFastPaths(true);
+
+  if (command_line.HasSwitch(switches::kEnablePreciseMemoryInfo))
+    WebRuntimeFeatures::enablePreciseMemoryInfo(true);
 }
 
 }  // namespace content