diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 00:32:46 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-22 00:32:46 +0000 |
| commit | 332749034b6cf2164b364c8020aadcee17ff0d26 (patch) | |
| tree | b0a0b88e6f09a38f0c0ad6322c75c597cd781074 /build | |
| parent | e2b52bee102c05b6aaf515b3e693283548e16faf (diff) | |
| download | chromium_src-332749034b6cf2164b364c8020aadcee17ff0d26.zip chromium_src-332749034b6cf2164b364c8020aadcee17ff0d26.tar.gz chromium_src-332749034b6cf2164b364c8020aadcee17ff0d26.tar.bz2 | |
Use WebKit compositor in ui::Layer
BUG=99524
TEST=compositor_unittests
Review URL: http://codereview.chromium.org/8222028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 5537473..cc29fc1 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -51,6 +51,9 @@ 'use_aura%': '<(use_aura)', 'use_openssl%': '<(use_openssl)', + # WebKit compositor for ui + 'use_webkit_compositor%': 0, + # Compute the architecture that we're building on. 'conditions': [ [ 'OS=="win" or OS=="mac"', { @@ -101,6 +104,7 @@ 'toolkit_views%': '<(toolkit_views)', 'use_only_pure_views%': '<(use_only_pure_views)', 'views_compositor%': '<(views_compositor)', + 'use_webkit_compositor%': '<(use_webkit_compositor)', 'use_aura%': '<(use_aura)', 'use_openssl%': '<(use_openssl)', @@ -331,7 +335,7 @@ # Use GPU accelerated cross process image transport by default # on TOUCH_UI and linux builds with the Aura window manager - ['views_compositor==1 and OS=="linux"', { + ['views_compositor==1 and OS=="linux" and use_webkit_compositor!=1', { 'ui_compositor_image_transport%': 1, }, { 'ui_compositor_image_transport%': 0, @@ -349,6 +353,7 @@ 'use_only_pure_views%': '<(use_only_pure_views)', 'views_compositor%': '<(views_compositor)', 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', + 'use_webkit_compositor%': '<(use_webkit_compositor)', 'use_aura%': '<(use_aura)', 'use_openssl%': '<(use_openssl)', 'use_nss%': '<(use_nss)', @@ -954,6 +959,9 @@ ['ui_compositor_image_transport==1', { 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], }], + ['use_webkit_compositor==1', { + 'defines': ['USE_WEBKIT_COMPOSITOR=1'], + }], ['use_aura==1', { 'defines': ['USE_AURA=1'], }], |