Revert 197751 "Clean up software compositing switches. "

> Clean up software compositing switches. 
> 
> After this patch just --disable-gpu should be enough to put Chrome in software compositing mode for Aura builds.
> 
> Relanding https://codereview.chromium.org/13985036 which got a speculative revert.
> 
> TBR=piman@chromium.org,jamesr@chromium.org,jochen@chromium.org
> NOTRY=true
> BUG=229712,230120
> 
> Review URL: https://chromiumcodereview.appspot.com/14598004

TBR=skaslev@chromium.org

Review URL: https://codereview.chromium.org/14620006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197812 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 25 deletions

diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
index 80913cb..5863e22 100644
--- a/content/browser/gpu/gpu_data_manager_impl.cc
+++ b/content/browser/gpu/gpu_data_manager_impl.cc
@@ -20,7 +20,6 @@
 #include "base/sys_info.h"
 #include "base/values.h"
 #include "base/version.h"
-#include "cc/base/switches.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_util.h"
 #include "content/common/gpu/gpu_messages.h"
@@ -422,11 +421,6 @@ void GpuDataManagerImpl::AppendRendererCommandLine(
     command_line->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
   if (ShouldUseSwiftShader())
     command_line->AppendSwitch(switches::kDisableFlashFullscreen3d);
-
-  if (card_blacklisted_ && use_software_compositor_) {
-    command_line->AppendSwitch(switches::kEnableSoftwareCompositing);
-    command_line->AppendSwitch(cc::switches::kEnableCompositorFrameMessage);
-  }
 }
 
 void GpuDataManagerImpl::AppendGpuCommandLine(
@@ -575,12 +569,6 @@ void GpuDataManagerImpl::UpdateRendererWebPrefs(WebPreferences* prefs) const {
     prefs->accelerated_compositing_for_3d_transforms_enabled = false;
     prefs->accelerated_compositing_for_plugins_enabled = false;
   }
-
-  if (card_blacklisted_ && use_software_compositor_) {
-    prefs->accelerated_compositing_enabled = true;
-    prefs->accelerated_compositing_for_3d_transforms_enabled = true;
-    prefs->accelerated_compositing_for_animation_enabled = true;
-  }
 }
 
 GpuSwitchingOption GpuDataManagerImpl::GetGpuSwitchingOption() const {
@@ -595,10 +583,6 @@ void GpuDataManagerImpl::DisableHardwareAcceleration() {
   for (int i = 0; i < NUMBER_OF_GPU_FEATURE_TYPES; ++i)
     blacklisted_features_.insert(i);
 
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (!command_line->HasSwitch(switches::kDisableGpu))
-    command_line->AppendSwitch(switches::kDisableGpu);
-
   EnableSwiftShaderIfNecessary();
   NotifyGpuInfoUpdate();
 }
@@ -701,11 +685,6 @@ GpuDataManagerImpl::GpuDataManagerImpl()
     : complete_gpu_info_already_requested_(false),
       gpu_switching_(GPU_SWITCHING_OPTION_AUTOMATIC),
       observer_list_(new GpuDataManagerObserverList),
-#if defined(USE_AURA)
-      use_software_compositor_(true),
-#else
-      use_software_compositor_(false),
-#endif
       use_swiftshader_(false),
       card_blacklisted_(false),
       update_histograms_(true),
@@ -830,10 +809,6 @@ void GpuDataManagerImpl::EnableSwiftShaderIfNecessary() {
   }
 }
 
-void GpuDataManagerImpl::EnableSoftwareCompositing() {
-  use_software_compositor_ = true;
-}
-
 std::string GpuDataManagerImpl::GetDomainFromURL(const GURL& url) const {
   // For the moment, we just use the host, or its IP address, as the
   // entry in the set, rather than trying to figure out the top-level