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

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

Issue 126993002: Switch from CommandLine switch to WebPreferences to control Pepper 3D. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a bug jamesr pointed out Created 6 years, 11 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 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 #else 356 #else
357 prefs.webaudio_enabled = 357 prefs.webaudio_enabled =
358 !command_line.HasSwitch(switches::kDisableWebAudio); 358 !command_line.HasSwitch(switches::kDisableWebAudio);
359 #endif 359 #endif
360 360
361 prefs.experimental_webgl_enabled = 361 prefs.experimental_webgl_enabled =
362 GpuProcessHost::gpu_enabled() && 362 GpuProcessHost::gpu_enabled() &&
363 !command_line.HasSwitch(switches::kDisable3DAPIs) && 363 !command_line.HasSwitch(switches::kDisable3DAPIs) &&
364 !command_line.HasSwitch(switches::kDisableExperimentalWebGL); 364 !command_line.HasSwitch(switches::kDisableExperimentalWebGL);
365 365
366 prefs.pepper_3d_enabled =
367 !command_line.HasSwitch(switches::kDisablePepper3d);
368
366 prefs.flash_3d_enabled = 369 prefs.flash_3d_enabled =
367 GpuProcessHost::gpu_enabled() && 370 GpuProcessHost::gpu_enabled() &&
368 !command_line.HasSwitch(switches::kDisableFlash3d); 371 !command_line.HasSwitch(switches::kDisableFlash3d);
369 prefs.flash_stage3d_enabled = 372 prefs.flash_stage3d_enabled =
370 GpuProcessHost::gpu_enabled() && 373 GpuProcessHost::gpu_enabled() &&
371 !command_line.HasSwitch(switches::kDisableFlashStage3d); 374 !command_line.HasSwitch(switches::kDisableFlashStage3d);
372 prefs.flash_stage3d_baseline_enabled = 375 prefs.flash_stage3d_baseline_enabled =
373 GpuProcessHost::gpu_enabled() && 376 GpuProcessHost::gpu_enabled() &&
374 !command_line.HasSwitch(switches::kDisableFlashStage3d); 377 !command_line.HasSwitch(switches::kDisableFlashStage3d);
375 378
(...skipping 1903 matching lines...) Expand 10 before | Expand all | Expand 10 after
2279 void RenderViewHostImpl::AttachToFrameTree() { 2282 void RenderViewHostImpl::AttachToFrameTree() {
2280 FrameTree* frame_tree = delegate_->GetFrameTree(); 2283 FrameTree* frame_tree = delegate_->GetFrameTree();
2281 2284
2282 frame_tree->ResetForMainFrameSwap(); 2285 frame_tree->ResetForMainFrameSwap();
2283 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) { 2286 if (main_frame_id() != FrameTreeNode::kInvalidFrameId) {
2284 frame_tree->OnFirstNavigationAfterSwap(main_frame_id()); 2287 frame_tree->OnFirstNavigationAfterSwap(main_frame_id());
2285 } 2288 }
2286 } 2289 }
2287 2290
2288 } // namespace content 2291 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/common/common_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698