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

Side by Side Diff: content/content_common.gypi

Issue 331723003: gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: wip Created 6 years, 5 months 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 9 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
10 '../net/net.gyp:net', 10 '../net/net.gyp:net',
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 'common/gpu/devtools_gpu_agent.h', 255 'common/gpu/devtools_gpu_agent.h',
256 'common/gpu/devtools_gpu_instrumentation.cc', 256 'common/gpu/devtools_gpu_instrumentation.cc',
257 'common/gpu/devtools_gpu_instrumentation.h', 257 'common/gpu/devtools_gpu_instrumentation.h',
258 'common/gpu/gpu_channel.cc', 258 'common/gpu/gpu_channel.cc',
259 'common/gpu/gpu_channel.h', 259 'common/gpu/gpu_channel.h',
260 'common/gpu/gpu_channel_manager.cc', 260 'common/gpu/gpu_channel_manager.cc',
261 'common/gpu/gpu_channel_manager.h', 261 'common/gpu/gpu_channel_manager.h',
262 'common/gpu/gpu_command_buffer_stub.cc', 262 'common/gpu/gpu_command_buffer_stub.cc',
263 'common/gpu/gpu_command_buffer_stub.h', 263 'common/gpu/gpu_command_buffer_stub.h',
264 'common/gpu/gpu_config.h', 264 'common/gpu/gpu_config.h',
265 'common/gpu/gpu_memory_buffer_factory.h',
266 'common/gpu/gpu_memory_buffer_factory_android.cc',
267 'common/gpu/gpu_memory_buffer_factory_mac.cc',
268 'common/gpu/gpu_memory_buffer_factory_ozone.cc',
269 'common/gpu/gpu_memory_buffer_factory_win.cc',
270 'common/gpu/gpu_memory_buffer_factory_x11.cc',
265 'common/gpu/gpu_memory_manager.cc', 271 'common/gpu/gpu_memory_manager.cc',
266 'common/gpu/gpu_memory_manager.h', 272 'common/gpu/gpu_memory_manager.h',
267 'common/gpu/gpu_memory_manager_client.cc', 273 'common/gpu/gpu_memory_manager_client.cc',
268 'common/gpu/gpu_memory_manager_client.h', 274 'common/gpu/gpu_memory_manager_client.h',
269 'common/gpu/gpu_memory_tracking.cc', 275 'common/gpu/gpu_memory_tracking.cc',
270 'common/gpu/gpu_memory_tracking.h', 276 'common/gpu/gpu_memory_tracking.h',
271 'common/gpu/gpu_memory_uma_stats.h', 277 'common/gpu/gpu_memory_uma_stats.h',
272 'common/gpu/gpu_messages.h', 278 'common/gpu/gpu_messages.h',
273 'common/gpu/gpu_process_launch_causes.h', 279 'common/gpu/gpu_process_launch_causes.h',
274 'common/gpu/gpu_surface_lookup.cc', 280 'common/gpu/gpu_surface_lookup.cc',
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 'common/font_list_ozone.cc', 611 'common/font_list_ozone.cc',
606 ], 612 ],
607 }], 613 }],
608 ['use_x11 == 1', { 614 ['use_x11 == 1', {
609 'include_dirs': [ 615 'include_dirs': [
610 '<(DEPTH)/third_party/khronos', 616 '<(DEPTH)/third_party/khronos',
611 ], 617 ],
612 'dependencies': [ 618 'dependencies': [
613 '<(DEPTH)/build/linux/system.gyp:xcomposite', 619 '<(DEPTH)/build/linux/system.gyp:xcomposite',
614 ], 620 ],
621 'sources': [
622 'common/gpu/gpu_memory_buffer_factory_x11_pixmap.cc',
623 'common/gpu/gpu_memory_buffer_factory_x11_pixmap.h',
624 ],
615 }], 625 }],
616 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', { 626 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
617 'sources': [ 627 'sources': [
618 'common/gpu/x_util.cc', 628 'common/gpu/x_util.cc',
619 'common/gpu/x_util.h', 629 'common/gpu/x_util.h',
620 ], 630 ],
621 }], 631 }],
622 ['enable_plugins==1', { 632 ['enable_plugins==1', {
623 'dependencies': [ 633 'dependencies': [
624 '../ppapi/ppapi_internal.gyp:ppapi_shared', 634 '../ppapi/ppapi_internal.gyp:ppapi_shared',
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 }, { 808 }, {
799 'defines': ['USE_SECCOMP_BPF'], 809 'defines': ['USE_SECCOMP_BPF'],
800 }], 810 }],
801 ['use_ozone==1', { 811 ['use_ozone==1', {
802 'dependencies': [ 812 'dependencies': [
803 '../ui/ozone/ozone.gyp:ozone', 813 '../ui/ozone/ozone.gyp:ozone',
804 ], 814 ],
805 }], 815 }],
806 ], 816 ],
807 } 817 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698