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 /ui/compositor | |
| 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 'ui/compositor')
| -rw-r--r-- | ui/compositor/compositor_switches.cc | 2 | ||||
| -rw-r--r-- | ui/compositor/compositor_switches.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/ui/compositor/compositor_switches.cc b/ui/compositor/compositor_switches.cc index b160712..7f1bd23 100644 --- a/ui/compositor/compositor_switches.cc +++ b/ui/compositor/compositor_switches.cc @@ -10,6 +10,8 @@ const char kDisableTestCompositor[] = "disable-test-compositor"; const char kUIDisableThreadedCompositing[] = "ui-disable-threaded-compositing"; +const char kUIEnableSoftwareCompositing[] = "ui-enable-software-compositing"; + const char kUIEnableThreadedCompositing[] = "ui-enable-threaded-compositing"; const char kUIMaxFramesPending[] = "ui-max-frames-pending"; diff --git a/ui/compositor/compositor_switches.h b/ui/compositor/compositor_switches.h index 85708a7..5b59477 100644 --- a/ui/compositor/compositor_switches.h +++ b/ui/compositor/compositor_switches.h @@ -11,6 +11,7 @@ namespace switches { COMPOSITOR_EXPORT extern const char kDisableTestCompositor[]; COMPOSITOR_EXPORT extern const char kUIDisableThreadedCompositing[]; +COMPOSITOR_EXPORT extern const char kUIEnableSoftwareCompositing[]; COMPOSITOR_EXPORT extern const char kUIEnableThreadedCompositing[]; COMPOSITOR_EXPORT extern const char kUIMaxFramesPending[]; COMPOSITOR_EXPORT extern const char kUIShowPaintRects[]; |