Enable accelerated WebKit compositor for Aura.
This allows the use of the WebKit compositor for Aura on Linux. It reuses the same display path as TOUCH_UI.
BUG=none
TEST=build GYP_DEFINES="use_aura" on Linux; go to http://www.webkit.org/blog-files/3d-transforms/poster-circle.html
Review URL: http://codereview.chromium.org/8241012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105323 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ec5a6d4a..6851dd0 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4069,17 +4069,11 @@
['exclude', '^browser/chromeos/login/touch_*'],
['exclude', '^browser/extensions/extension_input_ui_api.cc'],
['exclude', '^browser/extensions/extension_input_ui_api.h'],
- ['exclude', '^browser/renderer_host/accelerated_surface_container_touch.cc'],
- ['exclude', '^browser/renderer_host/accelerated_surface_container_touch.h'],
['exclude', '^browser/renderer_host/render_widget_host_view_views_touch.cc'],
['exclude', '^browser/ui/touch/*'],
],
}],
['touchui==1', {
- 'dependencies': [
- '../ui/gfx/compositor/compositor.gyp:compositor',
- '../ui/gfx/gl/gl.gyp:gl',
- ],
'sources/': [
['include', '^browser/ui/touch/*'],
['exclude', '^browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.cc'],
@@ -4091,14 +4085,6 @@
['exclude', '^browser/chromeos/input_method/candidate_window.cc'],
['exclude', '^browser/chromeos/input_method/candidate_window.h'],
],
- 'include_dirs': [
- '../third_party/angle/include',
- ],
- 'link_settings': {
- 'libraries': [
- '-lXcomposite',
- ],
- },
}],
['use_aura==1', {
'sources/': [
@@ -4173,6 +4159,26 @@
'../ui/aura_shell/aura_shell.gyp:aura_shell',
],
}],
+ ['views_gpu_image_transport==0', {
+ 'sources/': [
+ ['exclude', '^browser/renderer_host/accelerated_surface_container_touch.cc'],
+ ['exclude', '^browser/renderer_host/accelerated_surface_container_touch.h'],
+ ],
+ }],
+ ['views_gpu_image_transport==1', {
+ 'dependencies': [
+ '../ui/gfx/compositor/compositor.gyp:compositor',
+ '../ui/gfx/gl/gl.gyp:gl',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lXcomposite',
+ ],
+ },
+ 'include_dirs': [
+ '../third_party/angle/include',
+ ],
+ }],
['use_virtual_keyboard==0', {
'sources/': [
['exclude', '^browser/ui/virtual_keyboard/*'],
