Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(747)

Side by Side Diff: content/content_browser.gypi

Issue 8307001: Enable accelerated compositing of web pages when using webkit compositor (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../crypto/crypto.gyp:crypto', 7 '../crypto/crypto.gyp:crypto',
8 '../net/net.gyp:net', 8 '../net/net.gyp:net',
9 '../net/net.gyp:http_server', 9 '../net/net.gyp:http_server',
10 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 10 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 'browser/power_save_blocker.h', 290 'browser/power_save_blocker.h',
291 'browser/power_save_blocker_common.cc', 291 'browser/power_save_blocker_common.cc',
292 'browser/power_save_blocker_mac.cc', 292 'browser/power_save_blocker_mac.cc',
293 'browser/power_save_blocker_stub.cc', 293 'browser/power_save_blocker_stub.cc',
294 'browser/power_save_blocker_win.cc', 294 'browser/power_save_blocker_win.cc',
295 'browser/ppapi_plugin_process_host.cc', 295 'browser/ppapi_plugin_process_host.cc',
296 'browser/ppapi_plugin_process_host.h', 296 'browser/ppapi_plugin_process_host.h',
297 'browser/quota_permission_context.h', 297 'browser/quota_permission_context.h',
298 'browser/renderer_host/accelerated_plugin_view_mac.h', 298 'browser/renderer_host/accelerated_plugin_view_mac.h',
299 'browser/renderer_host/accelerated_plugin_view_mac.mm', 299 'browser/renderer_host/accelerated_plugin_view_mac.mm',
300 'browser/renderer_host/accelerated_surface_container_linux.cc', 300 'browser/renderer_host/accelerated_surface_container_linux_cc.cc',
301 'browser/renderer_host/accelerated_surface_container_linux_gl.cc',
301 'browser/renderer_host/accelerated_surface_container_linux.h', 302 'browser/renderer_host/accelerated_surface_container_linux.h',
302 'browser/renderer_host/accelerated_surface_container_mac.cc', 303 'browser/renderer_host/accelerated_surface_container_mac.cc',
303 'browser/renderer_host/accelerated_surface_container_mac.h', 304 'browser/renderer_host/accelerated_surface_container_mac.h',
304 'browser/renderer_host/accelerated_surface_container_manager_mac.cc', 305 'browser/renderer_host/accelerated_surface_container_manager_mac.cc',
305 'browser/renderer_host/accelerated_surface_container_manager_mac.h', 306 'browser/renderer_host/accelerated_surface_container_manager_mac.h',
306 'browser/renderer_host/async_resource_handler.cc', 307 'browser/renderer_host/async_resource_handler.cc',
307 'browser/renderer_host/async_resource_handler.h', 308 'browser/renderer_host/async_resource_handler.h',
308 'browser/renderer_host/backing_store.cc', 309 'browser/renderer_host/backing_store.cc',
309 'browser/renderer_host/backing_store.h', 310 'browser/renderer_host/backing_store.h',
310 'browser/renderer_host/backing_store_mac.h', 311 'browser/renderer_host/backing_store_mac.h',
(...skipping 23 matching lines...) Expand all
334 'browser/renderer_host/file_utilities_message_filter.h', 335 'browser/renderer_host/file_utilities_message_filter.h',
335 'browser/renderer_host/global_request_id.h', 336 'browser/renderer_host/global_request_id.h',
336 'browser/renderer_host/gpu_message_filter.cc', 337 'browser/renderer_host/gpu_message_filter.cc',
337 'browser/renderer_host/gpu_message_filter.h', 338 'browser/renderer_host/gpu_message_filter.h',
338 'browser/renderer_host/gtk_im_context_wrapper.cc', 339 'browser/renderer_host/gtk_im_context_wrapper.cc',
339 'browser/renderer_host/gtk_im_context_wrapper.h', 340 'browser/renderer_host/gtk_im_context_wrapper.h',
340 'browser/renderer_host/gtk_key_bindings_handler.cc', 341 'browser/renderer_host/gtk_key_bindings_handler.cc',
341 'browser/renderer_host/gtk_key_bindings_handler.h', 342 'browser/renderer_host/gtk_key_bindings_handler.h',
342 'browser/renderer_host/gtk_window_utils.cc', 343 'browser/renderer_host/gtk_window_utils.cc',
343 'browser/renderer_host/gtk_window_utils.h', 344 'browser/renderer_host/gtk_window_utils.h',
345 'browser/renderer_host/image_transport_client.cc',
346 'browser/renderer_host/image_transport_client.h',
344 'browser/renderer_host/java_bridge_channel_host.cc', 347 'browser/renderer_host/java_bridge_channel_host.cc',
345 'browser/renderer_host/java_bridge_channel_host.h', 348 'browser/renderer_host/java_bridge_channel_host.h',
346 'browser/renderer_host/java_bridge_dispatcher_host_manager.cc', 349 'browser/renderer_host/java_bridge_dispatcher_host_manager.cc',
347 'browser/renderer_host/java_bridge_dispatcher_host_manager.h', 350 'browser/renderer_host/java_bridge_dispatcher_host_manager.h',
348 'browser/renderer_host/java_bridge_dispatcher_host.cc', 351 'browser/renderer_host/java_bridge_dispatcher_host.cc',
349 'browser/renderer_host/java_bridge_dispatcher_host.h', 352 'browser/renderer_host/java_bridge_dispatcher_host.h',
350 'browser/renderer_host/media/audio_common.cc', 353 'browser/renderer_host/media/audio_common.cc',
351 'browser/renderer_host/media/audio_common.h', 354 'browser/renderer_host/media/audio_common.h',
352 'browser/renderer_host/media/audio_input_device_manager.cc', 355 'browser/renderer_host/media/audio_input_device_manager.cc',
353 'browser/renderer_host/media/audio_input_device_manager.h', 356 'browser/renderer_host/media/audio_input_device_manager.h',
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 '../ui/gfx/gl/gl.gyp:gl', 725 '../ui/gfx/gl/gl.gyp:gl',
723 ], 726 ],
724 'link_settings': { 727 'link_settings': {
725 'libraries': [ 728 'libraries': [
726 '-lXcomposite', 729 '-lXcomposite',
727 ], 730 ],
728 }, 731 },
729 'include_dirs': [ 732 'include_dirs': [
730 '../third_party/angle/include', 733 '../third_party/angle/include',
731 ], 734 ],
735 'conditions': [
736 ['use_webkit_compositor != 1', {
737 'sources/': [
738 ['exclude', '^browser/renderer_host/accelerated_surface_container_li nux_cc.cc'],
739 ],
740 }, {
741 'sources/': [
742 ['exclude', '^browser/renderer_host/accelerated_surface_container_li nux_gl.cc'],
743 ],
744 }],
745 ],
732 }, { 746 }, {
733 'sources/': [ 747 'sources/': [
734 ['exclude', '^browser/renderer_host/accelerated_surface_container_linux. cc'], 748 ['exclude', '^browser/renderer_host/accelerated_surface_container_linux_ gl.cc'],
749 ['exclude', '^browser/renderer_host/accelerated_surface_container_linux_ cc.cc'],
735 ['exclude', '^browser/renderer_host/accelerated_surface_container_linux. h'], 750 ['exclude', '^browser/renderer_host/accelerated_surface_container_linux. h'],
751 ['exclude', '^browser/renderer_host/image_transport_client.cc'],
752 ['exclude', '^browser/renderer_host/image_transport_client.h'],
736 ], 753 ],
737 }], 754 }],
738 ['java_bridge==1', { 755 ['java_bridge==1', {
739 'defines': [ 756 'defines': [
740 'ENABLE_JAVA_BRIDGE', 757 'ENABLE_JAVA_BRIDGE',
741 ], 758 ],
742 }, { 759 }, {
743 'sources!': [ 760 'sources!': [
744 'browser/renderer_host/java_bridge_channel_host.cc', 761 'browser/renderer_host/java_bridge_channel_host.cc',
745 'browser/renderer_host/java_bridge_channel_host.h', 762 'browser/renderer_host/java_bridge_channel_host.h',
746 'browser/renderer_host/java_bridge_dispatcher_host_manager.cc', 763 'browser/renderer_host/java_bridge_dispatcher_host_manager.cc',
747 'browser/renderer_host/java_bridge_dispatcher_host_manager.h', 764 'browser/renderer_host/java_bridge_dispatcher_host_manager.h',
748 'browser/renderer_host/java_bridge_dispatcher_host.cc', 765 'browser/renderer_host/java_bridge_dispatcher_host.cc',
749 'browser/renderer_host/java_bridge_dispatcher_host.h', 766 'browser/renderer_host/java_bridge_dispatcher_host.h',
750 ], 767 ],
751 }], 768 }],
752 ], 769 ],
753 } 770 }
754 771
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura.cc ('k') | ui/gfx/compositor/compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698