diff options
| author | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 23:05:52 +0000 |
|---|---|---|
| committer | lipalani@chromium.org <lipalani@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 23:05:52 +0000 |
| commit | 4ef39e9b974e78b9cfabe4db2a7aab7da9333a98 (patch) | |
| tree | 8faebe2144cc01e266449b96b5d9237bcf8ee8fc /build | |
| parent | 7f3c7afde3b300f5fc922493d494f9a9f6c36c0d (diff) | |
| download | chromium_src-4ef39e9b974e78b9cfabe4db2a7aab7da9333a98.zip chromium_src-4ef39e9b974e78b9cfabe4db2a7aab7da9333a98.tar.gz chromium_src-4ef39e9b974e78b9cfabe4db2a7aab7da9333a98.tar.bz2 | |
Revert 106606 - Use WebKit compositor in ui::Layer
BUG=99524
TEST=compositor_unittests
Review URL: http://codereview.chromium.org/8222028
TBR=piman@chromium.org
Review URL: http://codereview.chromium.org/8360018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/build/common.gypi b/build/common.gypi index 2c6a0a4..917c33c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -51,9 +51,6 @@ '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"', { @@ -104,7 +101,6 @@ '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)', @@ -335,7 +331,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" and use_webkit_compositor!=1', { + ['views_compositor==1 and OS=="linux"', { 'ui_compositor_image_transport%': 1, }, { 'ui_compositor_image_transport%': 0, @@ -353,7 +349,6 @@ '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)', @@ -959,9 +954,6 @@ ['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'], }], |