diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 03:22:13 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 03:22:13 +0000 |
| commit | 4466cbde3ee2d518081872862e3cfe741731540e (patch) | |
| tree | 60fe5f3552774bb90ca2dc20b68d9a71574d8291 /build | |
| parent | bfe3010dd8c3dfc7a62d791bacdc51569ca94055 (diff) | |
| download | chromium_src-4466cbde3ee2d518081872862e3cfe741731540e.zip chromium_src-4466cbde3ee2d518081872862e3cfe741731540e.tar.gz chromium_src-4466cbde3ee2d518081872862e3cfe741731540e.tar.bz2 | |
Revert 118789 - Always use webkit compositor
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/9141034
TBR=piman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9283008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index b949544..684d39b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -83,6 +83,13 @@ ['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, + }], ], }, @@ -91,6 +98,7 @@ '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)', @@ -253,9 +261,6 @@ # 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 |