diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-12 00:58:35 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-12 00:58:35 +0000 |
| commit | 8bbe3a92317499860e4b522aca6656ef93742d6c (patch) | |
| tree | b21a310a7d97a9749496237e43e2bb607e3abce8 /content/shell/app/shell_main_delegate.cc | |
| parent | 59d4cad7c8812208721f09cb23e26b22c788dda9 (diff) | |
| download | chromium_src-8bbe3a92317499860e4b522aca6656ef93742d6c.zip chromium_src-8bbe3a92317499860e4b522aca6656ef93742d6c.tar.gz chromium_src-8bbe3a92317499860e4b522aca6656ef93742d6c.tar.bz2 | |
Revert 199551 "Reland "Clean up software compositing switches" p..."
Broke Win Aura:
http://build.chromium.org/p/chromium.win/builders/Win%20Aura%20Tests%20%281%29/builds/3836
Try jobs failed too:
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&number=38939
> Reland "Clean up software compositing switches" patch.
>
> After this patch just --disable-gpu should be enough to put Chrome in software compositing mode for Aura builds.
>
> TBR=piman@chromium.org,jamesr@chromium.org,jochen@chromium.org
> BUG=229712, 230120
>
> Review URL: https://codereview.chromium.org/15048003
TBR=skaslev@chromium.org
Review URL: https://codereview.chromium.org/14822009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/app/shell_main_delegate.cc')
| -rw-r--r-- | content/shell/app/shell_main_delegate.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc index 61012b6..9ac38c9 100644 --- a/content/shell/app/shell_main_delegate.cc +++ b/content/shell/app/shell_main_delegate.cc @@ -9,7 +9,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "content/public/browser/browser_main_runner.h" -#include "content/public/browser/gpu_data_manager.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" #include "content/public/test/layouttest_support.h" @@ -117,11 +116,8 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) { command_line.AppendSwitch(switches::kEnableCssShaders); command_line.AppendSwitchASCII(switches::kTouchEvents, switches::kTouchEventsEnabled); - - // TODO(skaslev) Remove that after codereview.chromium.org/14615005/ - // lands and rolls. if (command_line.HasSwitch(switches::kEnableSoftwareCompositing)) - GpuDataManager::GetInstance()->DisableHardwareAcceleration(); + command_line.AppendSwitch(switches::kEnableSoftwareCompositingGLAdapter); net::CookieMonster::EnableFileScheme(); if (!WebKitTestPlatformInitialize()) { |