diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-28 03:23:01 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-28 03:23:01 +0000 |
| commit | f83c6f7f3c90cd3bebaa961737ba80db27240c1f (patch) | |
| tree | a3f88a052afb0c729bc087cd0a7fcb539a53df7c /build | |
| parent | 33755436093b6bb4de670227245f31043c28f85e (diff) | |
| download | chromium_src-f83c6f7f3c90cd3bebaa961737ba80db27240c1f.zip chromium_src-f83c6f7f3c90cd3bebaa961737ba80db27240c1f.tar.gz chromium_src-f83c6f7f3c90cd3bebaa961737ba80db27240c1f.tar.bz2 | |
Fold views_compositor=1 into use_aura=1
We don't have a use case for views_compositor=1 and use_aura=0 (and it's
broken/untested anyway), so this simplifies things a little bit.
BUG=None
TEST=compiles, tests pass.
Review URL: http://codereview.chromium.org/9225038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/build/common.gypi b/build/common.gypi index 2000f9f..043591e 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -27,9 +27,6 @@ # Whether we are using Views Toolkit 'toolkit_views%': 0, - # Whether the compositor is enabled on views. - 'views_compositor%': 0, - # Whether or not we are using the Aura windowing framework. 'use_aura%': 0, @@ -48,7 +45,6 @@ }, # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', - 'views_compositor%': '<(views_compositor)', 'use_aura%': '<(use_aura)', 'use_ash%': '<(use_ash)', 'use_openssl%': '<(use_openssl)', @@ -78,11 +74,6 @@ }, { 'toolkit_views%': 0, }], - - # Use the views compositor when using the Aura window manager. - ['use_aura==1', { - 'views_compositor%': 1, - }], ], }, @@ -90,7 +81,6 @@ 'chromeos%': '<(chromeos)', 'host_arch%': '<(host_arch)', 'toolkit_views%': '<(toolkit_views)', - 'views_compositor%': '<(views_compositor)', 'use_aura%': '<(use_aura)', 'use_ash%': '<(use_ash)', 'use_openssl%': '<(use_openssl)', @@ -376,7 +366,7 @@ # Use GPU accelerated cross process image transport by default # on linux builds with the Aura window manager - ['views_compositor==1 and OS=="linux"', { + ['use_aura==1 and OS=="linux"', { 'ui_compositor_image_transport%': 1, }, { 'ui_compositor_image_transport%': 0, @@ -402,7 +392,6 @@ 'host_arch%': '<(host_arch)', 'library%': 'static_library', 'toolkit_views%': '<(toolkit_views)', - 'views_compositor%': '<(views_compositor)', 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 'use_webkit_compositor%': '<(use_webkit_compositor)', 'use_aura%': '<(use_aura)', @@ -1044,9 +1033,6 @@ ['toolkit_views==1', { 'defines': ['TOOLKIT_VIEWS=1'], }], - ['views_compositor==1', { - 'defines': ['VIEWS_COMPOSITOR=1'], - }], ['ui_compositor_image_transport==1', { 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], }], |