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

Unified Diff: content/browser/gpu/gpu_data_manager_impl_private.cc

Issue 234443002: Remove enable-software-compositing command-line flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/gpu/gpu_data_manager_impl_private.cc
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index 42b7db1805757a7d59d40d85c10f00ffba139248..f13cdf305222ef293a7269f50e228b6b7d75094b 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -645,10 +645,6 @@ void GpuDataManagerImplPrivate::AppendRendererCommandLine(
command_line->AppendSwitch(switches::kDisableWebRtcHWEncoding);
#endif
- if (use_software_compositor_ &&
- !command_line->HasSwitch(switches::kEnableSoftwareCompositing))
- command_line->AppendSwitch(switches::kEnableSoftwareCompositing);
-
#if defined(USE_AURA)
if (!CanUseGpuBrowserCompositor())
command_line->AppendSwitch(switches::kDisableGpuCompositing);
@@ -774,21 +770,15 @@ void GpuDataManagerImplPrivate::UpdateRendererWebPrefs(
// Accelerated video and animation are slower than regular when using
// SwiftShader. 3D CSS or Pepper 3D may also be too slow to be worthwhile.
if (ShouldUseSwiftShader()) {
- prefs->accelerated_compositing_for_video_enabled = false;
- prefs->accelerated_compositing_for_animation_enabled = false;
- prefs->accelerated_compositing_for_3d_transforms_enabled = false;
- prefs->accelerated_compositing_for_plugins_enabled = false;
prefs->pepper_3d_enabled = false;
}
- if (use_software_compositor_) {
- prefs->force_compositing_mode = true;
- prefs->accelerated_compositing_enabled = true;
- prefs->accelerated_compositing_for_3d_transforms_enabled = true;
- prefs->accelerated_compositing_for_animation_enabled = true;
- prefs->accelerated_compositing_for_plugins_enabled = true;
- prefs->accelerated_compositing_for_video_enabled = true;
- }
+ prefs->force_compositing_mode = true;
piman 2014/04/11 20:30:46 I'm lost between all the overrides... LayoutTests
+ prefs->accelerated_compositing_enabled = true;
+ prefs->accelerated_compositing_for_3d_transforms_enabled = true;
+ prefs->accelerated_compositing_for_animation_enabled = true;
+ prefs->accelerated_compositing_for_plugins_enabled = true;
+ prefs->accelerated_compositing_for_video_enabled = true;
#if defined(USE_AURA)
if (!CanUseGpuBrowserCompositor()) {
@@ -964,7 +954,6 @@ GpuDataManagerImplPrivate::GpuDataManagerImplPrivate(
owner_(owner),
display_count_(0),
gpu_process_accessible_(true),
- use_software_compositor_(false),
finalized_(false) {
DCHECK(owner_);
CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ -974,11 +963,6 @@ GpuDataManagerImplPrivate::GpuDataManagerImplPrivate(
}
if (command_line->HasSwitch(switches::kDisableGpu))
DisableHardwareAcceleration();
- if (command_line->HasSwitch(switches::kEnableSoftwareCompositing))
- use_software_compositor_ = true;
-#if defined(USE_AURA) || defined(OS_MACOSX)
- use_software_compositor_ = true;
-#endif
#if defined(OS_MACOSX)
CGGetActiveDisplayList (0, NULL, &display_count_);

Powered by Google App Engine
This is Rietveld 408576698