diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 02:40:20 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-25 02:40:20 +0000 |
| commit | dbff3c2ddce98bc2d40ee5fcb4929a5cd0a28fa6 (patch) | |
| tree | 75d40b9b3159d13f4e665e494454abd825940263 /build | |
| parent | f48462904c893f72d493e490bf518fa507373ce0 (diff) | |
| download | chromium_src-dbff3c2ddce98bc2d40ee5fcb4929a5cd0a28fa6.zip chromium_src-dbff3c2ddce98bc2d40ee5fcb4929a5cd0a28fa6.tar.gz chromium_src-dbff3c2ddce98bc2d40ee5fcb4929a5cd0a28fa6.tar.bz2 | |
Always use webkit compositor
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/9141034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/build/common.gypi b/build/common.gypi index 04344b6..76466c4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -83,13 +83,6 @@ ['use_aura==1', { 'views_compositor%': 1, }], - - # Use the WebKit compositor for ui, when Aura is on. - ['use_aura==1', { - 'use_webkit_compositor%': 1, - }, { - 'use_webkit_compositor%': 0, - }], ], }, @@ -98,7 +91,6 @@ 'host_arch%': '<(host_arch)', 'toolkit_views%': '<(toolkit_views)', 'views_compositor%': '<(views_compositor)', - 'use_webkit_compositor%': '<(use_webkit_compositor)', 'use_aura%': '<(use_aura)', 'use_ash%': '<(use_ash)', 'use_openssl%': '<(use_openssl)', @@ -261,6 +253,9 @@ # Enable plug-in installation by default. 'enable_plugin_installation%': 1, + # Use the WebKit compositor for ui. + 'use_webkit_compositor%': 1, + 'conditions': [ # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of # the 'conditions' clause. Initial attempts resulted in chromium and |