Enable accelerated WebKit compositor for Aura.

chrome/chrome_browser.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'dependencies': [
@@ skipping 4047 matching lines @@
           'sources!': [
             'browser/password_manager/native_backend_gnome_x.cc',
             'browser/password_manager/native_backend_gnome_x.h',
           ],
         }],
         ['touchui==0', {
           'sources/': [
             ['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'],
             ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'],
             ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
             ['exclude', '^browser/ui/views/frame/browser_non_client_frame_view_factory_x11.cc'],
             ['exclude', '^browser/ui/views/handle_web_keyboard_event_gtk.cc'],
             ['exclude', '^browser/ui/views/tab_contents/native_tab_contents_view_gtk.*'],
             ['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/': [
             ['exclude', '^browser/aeropeek_manager.cc'],
             ['exclude', '^browser/automation/automation_provider_win.cc'],
             ['exclude', '^browser/automation/testing_automation_provider_win.cc'],
             ['exclude', '^browser/chromeos/native_dialog_window.cc'],
             ['exclude', '^browser/chromeos/native_dialog_window.h'],
             ['exclude', '^browser/external_tab_container_win.cc'],
             ['exclude', '^browser/external_tab_container_win.h'],
@@ skipping 54 matching lines @@
             ['include', '^browser/ui/webui/collected_cookies_ui_delegate.h'],
             ['include', '^browser/ui/webui/cookies_tree_model_adapter.cc'],
             ['include', '^browser/ui/webui/cookies_tree_model_adapter.h'],
             ['include', '^browser/ui/webui/repost_form_warning_ui.cc'],
             ['include', '^browser/ui/webui/repost_form_warning_ui.h'],
           ],
           'dependencies': [
             '../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/*'],
             ['exclude', '^browser/ui/webui/keyboard_ui.*'],
           ],
         }],
         ['os_posix == 1 and OS != "mac"', {
           'link_settings': {
             'libraries': [
               '-lXss',
@@ skipping 947 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }