diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 23:45:38 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-28 23:45:38 +0000 |
| commit | 4916d62ca7ae3365d8234682dc28b815ad4c5031 (patch) | |
| tree | cee8d9c4f6bba9d3bdcfc4bf7d2c7378a3ce58c1 /build | |
| parent | 5bce52305fac51d1bafffbd9dee9bb1e261c01ef (diff) | |
| download | chromium_src-4916d62ca7ae3365d8234682dc28b815ad4c5031.zip chromium_src-4916d62ca7ae3365d8234682dc28b815ad4c5031.tar.gz chromium_src-4916d62ca7ae3365d8234682dc28b815ad4c5031.tar.bz2 | |
Refactors TestCompositor out of views_unittests into a place it can be
used by both the layer tests and the views test. Also fixes a bug that
was causing test to fail and fixes up defines. I've disabled a portion
of the compositor unit tests on linux as they don't compile.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8072010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1d77143..90b8451 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -74,8 +74,9 @@ 'use_only_pure_views%': 0, }], - # Use the views compositor when using the Aura window manager. - ['use_aura==1', { + # Use the views compositor when using the Aura window manager or + # touch. + ['use_aura==1 or touchui==1', { 'views_compositor%': 1, }], ], |