Enable accelerated WebKit compositor for Aura.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 4f9b427d9dab0a0a8e7d445b3afe5e654537ac90..235dd603300bd53704adbcc373c44ef533be68dd 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4065,17 +4065,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'],
@@ -4087,14 +4081,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/': [
@@ -4169,6 +4155,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/*'],