diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 05:07:13 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-02 05:07:13 +0000 |
| commit | c3e32ed4ddaf646ca8b16254331e8bf8e36fc6ca (patch) | |
| tree | fb3ecc5194b972c6d8c511244e9d328fd1a24544 /ui/compositor | |
| parent | 4cbef85b2dcb86cf762fe9430975eccbc68bcc5b (diff) | |
| download | chromium_src-c3e32ed4ddaf646ca8b16254331e8bf8e36fc6ca.zip chromium_src-c3e32ed4ddaf646ca8b16254331e8bf8e36fc6ca.tar.gz chromium_src-c3e32ed4ddaf646ca8b16254331e8bf8e36fc6ca.tar.bz2 | |
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
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[]; |