Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 208763003: Enable WebAudio by default for Android/x86. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 !command_line.HasSwitch(switches::kDisableXSLT); 361 !command_line.HasSwitch(switches::kDisableXSLT);
362 prefs.xss_auditor_enabled = 362 prefs.xss_auditor_enabled =
363 !command_line.HasSwitch(switches::kDisableXSSAuditor); 363 !command_line.HasSwitch(switches::kDisableXSSAuditor);
364 prefs.application_cache_enabled = 364 prefs.application_cache_enabled =
365 !command_line.HasSwitch(switches::kDisableApplicationCache); 365 !command_line.HasSwitch(switches::kDisableApplicationCache);
366 366
367 prefs.local_storage_enabled = 367 prefs.local_storage_enabled =
368 !command_line.HasSwitch(switches::kDisableLocalStorage); 368 !command_line.HasSwitch(switches::kDisableLocalStorage);
369 prefs.databases_enabled = 369 prefs.databases_enabled =
370 !command_line.HasSwitch(switches::kDisableDatabases); 370 !command_line.HasSwitch(switches::kDisableDatabases);
371 #if defined(OS_ANDROID) && defined(ARCH_CPU_X86) 371 #if defined(OS_ANDROID) && !(defined(ARCH_CPU_ARMEL) || defined(ARCH_CPU_X86))
372 prefs.webaudio_enabled = 372 prefs.webaudio_enabled =
373 command_line.HasSwitch(switches::kEnableWebAudio); 373 command_line.HasSwitch(switches::kEnableWebAudio);
374 #else 374 #else
375 // WebAudio is enabled by default on x86 and ARM.
375 prefs.webaudio_enabled = 376 prefs.webaudio_enabled =
376 !command_line.HasSwitch(switches::kDisableWebAudio); 377 !command_line.HasSwitch(switches::kDisableWebAudio);
377 #endif 378 #endif
378 379
379 prefs.experimental_webgl_enabled = 380 prefs.experimental_webgl_enabled =
380 GpuProcessHost::gpu_enabled() && 381 GpuProcessHost::gpu_enabled() &&
381 !command_line.HasSwitch(switches::kDisable3DAPIs) && 382 !command_line.HasSwitch(switches::kDisable3DAPIs) &&
382 !command_line.HasSwitch(switches::kDisableExperimentalWebGL); 383 !command_line.HasSwitch(switches::kDisableExperimentalWebGL);
383 384
384 prefs.pepper_3d_enabled = 385 prefs.pepper_3d_enabled =
(...skipping 1545 matching lines...) Expand 10 before | Expand all | Expand 10 after
1930 return true; 1931 return true;
1931 } 1932 }
1932 1933
1933 void RenderViewHostImpl::AttachToFrameTree() { 1934 void RenderViewHostImpl::AttachToFrameTree() {
1934 FrameTree* frame_tree = delegate_->GetFrameTree(); 1935 FrameTree* frame_tree = delegate_->GetFrameTree();
1935 1936
1936 frame_tree->ResetForMainFrameSwap(); 1937 frame_tree->ResetForMainFrameSwap();
1937 } 1938 }
1938 1939
1939 } // namespace content 1940 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698