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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 10459016: Disable accelerated animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Just switch enable/disable. Don't rename flag. Created 8 years, 6 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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 438 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 prefs.force_compositing_mode = 449 prefs.force_compositing_mode =
450 command_line.HasSwitch(switches::kForceCompositingMode); 450 command_line.HasSwitch(switches::kForceCompositingMode);
451 prefs.fixed_position_compositing_enabled = 451 prefs.fixed_position_compositing_enabled =
452 command_line.HasSwitch(switches::kEnableCompositingForFixedPosition); 452 command_line.HasSwitch(switches::kEnableCompositingForFixedPosition);
453 prefs.accelerated_2d_canvas_enabled = 453 prefs.accelerated_2d_canvas_enabled =
454 GpuProcessHost::gpu_enabled() && 454 GpuProcessHost::gpu_enabled() &&
455 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas); 455 !command_line.HasSwitch(switches::kDisableAccelerated2dCanvas);
456 prefs.deferred_2d_canvas_enabled = 456 prefs.deferred_2d_canvas_enabled =
457 !command_line.HasSwitch(switches::kDisableDeferred2dCanvas); 457 !command_line.HasSwitch(switches::kDisableDeferred2dCanvas);
458 prefs.threaded_animation_enabled = 458 prefs.threaded_animation_enabled =
459 !command_line.HasSwitch(switches::kDisableThreadedAnimation); 459 command_line.HasSwitch(switches::kEnableThreadedAnimation);
460 prefs.accelerated_painting_enabled = 460 prefs.accelerated_painting_enabled =
461 GpuProcessHost::gpu_enabled() && 461 GpuProcessHost::gpu_enabled() &&
462 command_line.HasSwitch(switches::kEnableAcceleratedPainting); 462 command_line.HasSwitch(switches::kEnableAcceleratedPainting);
463 prefs.accelerated_filters_enabled = 463 prefs.accelerated_filters_enabled =
464 GpuProcessHost::gpu_enabled() && 464 GpuProcessHost::gpu_enabled() &&
465 command_line.HasSwitch(switches::kEnableAcceleratedFilters); 465 command_line.HasSwitch(switches::kEnableAcceleratedFilters);
466 prefs.accelerated_layers_enabled = 466 prefs.accelerated_layers_enabled =
467 prefs.accelerated_animation_enabled = 467 prefs.accelerated_animation_enabled =
468 !command_line.HasSwitch(switches::kDisableAcceleratedLayers); 468 !command_line.HasSwitch(switches::kDisableAcceleratedLayers);
469 prefs.accelerated_plugins_enabled = 469 prefs.accelerated_plugins_enabled =
(...skipping 2597 matching lines...) Expand 10 before | Expand all | Expand 10 after
3067 browser_plugin_host()->embedder_render_process_host(); 3067 browser_plugin_host()->embedder_render_process_host();
3068 *embedder_container_id = browser_plugin_host()->instance_id(); 3068 *embedder_container_id = browser_plugin_host()->instance_id();
3069 int embedder_process_id = 3069 int embedder_process_id =
3070 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; 3070 embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
3071 if (embedder_process_id != -1) { 3071 if (embedder_process_id != -1) {
3072 *embedder_channel_name = 3072 *embedder_channel_name =
3073 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), 3073 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
3074 embedder_process_id); 3074 embedder_process_id);
3075 } 3075 }
3076 } 3076 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698