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

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

Issue 79193003: Enable WebAudio support on Android/x86. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 !command_line.HasSwitch(switches::kDisableXSLT); 334 !command_line.HasSwitch(switches::kDisableXSLT);
335 prefs.xss_auditor_enabled = 335 prefs.xss_auditor_enabled =
336 !command_line.HasSwitch(switches::kDisableXSSAuditor); 336 !command_line.HasSwitch(switches::kDisableXSSAuditor);
337 prefs.application_cache_enabled = 337 prefs.application_cache_enabled =
338 !command_line.HasSwitch(switches::kDisableApplicationCache); 338 !command_line.HasSwitch(switches::kDisableApplicationCache);
339 339
340 prefs.local_storage_enabled = 340 prefs.local_storage_enabled =
341 !command_line.HasSwitch(switches::kDisableLocalStorage); 341 !command_line.HasSwitch(switches::kDisableLocalStorage);
342 prefs.databases_enabled = 342 prefs.databases_enabled =
343 !command_line.HasSwitch(switches::kDisableDatabases); 343 !command_line.HasSwitch(switches::kDisableDatabases);
344 #if defined(OS_ANDROID) && defined(ARCH_CPU_X86)
345 prefs.webaudio_enabled =
346 command_line.HasSwitch(switches::kEnableWebAudio);
347 #else
344 prefs.webaudio_enabled = 348 prefs.webaudio_enabled =
345 !command_line.HasSwitch(switches::kDisableWebAudio); 349 !command_line.HasSwitch(switches::kDisableWebAudio);
350 #endif
346 351
347 prefs.experimental_webgl_enabled = 352 prefs.experimental_webgl_enabled =
348 GpuProcessHost::gpu_enabled() && 353 GpuProcessHost::gpu_enabled() &&
349 !command_line.HasSwitch(switches::kDisable3DAPIs) && 354 !command_line.HasSwitch(switches::kDisable3DAPIs) &&
350 !command_line.HasSwitch(switches::kDisableExperimentalWebGL); 355 !command_line.HasSwitch(switches::kDisableExperimentalWebGL);
351 356
352 prefs.flash_3d_enabled = 357 prefs.flash_3d_enabled =
353 GpuProcessHost::gpu_enabled() && 358 GpuProcessHost::gpu_enabled() &&
354 !command_line.HasSwitch(switches::kDisableFlash3d); 359 !command_line.HasSwitch(switches::kDisableFlash3d);
355 prefs.flash_stage3d_enabled = 360 prefs.flash_stage3d_enabled =
(...skipping 1922 matching lines...) Expand 10 before | Expand all | Expand 10 after
2278 void RenderViewHostImpl::AttachToFrameTree() { 2283 void RenderViewHostImpl::AttachToFrameTree() {
2279 FrameTree* frame_tree = delegate_->GetFrameTree(); 2284 FrameTree* frame_tree = delegate_->GetFrameTree();
2280 2285
2281 frame_tree->SwapMainFrame(main_render_frame_host_.get()); 2286 frame_tree->SwapMainFrame(main_render_frame_host_.get());
2282 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { 2287 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) {
2283 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); 2288 frame_tree->OnFirstNavigationAfterSwap(main_frame_id());
2284 } 2289 }
2285 } 2290 }
2286 2291
2287 } // namespace content 2292 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698