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

Side by Side Diff: content/content_common.gypi

Issue 255713008: Change glimage to accept a type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: First draft Created 6 years, 7 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 216 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 'common/gpu/client/gl_helper_readback_support.h', 227 'common/gpu/client/gl_helper_readback_support.h',
228 'common/gpu/client/gl_helper_scaling.cc', 228 'common/gpu/client/gl_helper_scaling.cc',
229 'common/gpu/client/gl_helper_scaling.h', 229 'common/gpu/client/gl_helper_scaling.h',
230 'common/gpu/client/gpu_channel_host.cc', 230 'common/gpu/client/gpu_channel_host.cc',
231 'common/gpu/client/gpu_channel_host.h', 231 'common/gpu/client/gpu_channel_host.h',
232 'common/gpu/client/gpu_memory_buffer_impl.cc', 232 'common/gpu/client/gpu_memory_buffer_impl.cc',
233 'common/gpu/client/gpu_memory_buffer_impl.h', 233 'common/gpu/client/gpu_memory_buffer_impl.h',
234 'common/gpu/client/gpu_memory_buffer_impl_android.cc', 234 'common/gpu/client/gpu_memory_buffer_impl_android.cc',
235 'common/gpu/client/gpu_memory_buffer_impl_linux.cc', 235 'common/gpu/client/gpu_memory_buffer_impl_linux.cc',
236 'common/gpu/client/gpu_memory_buffer_impl_mac.cc', 236 'common/gpu/client/gpu_memory_buffer_impl_mac.cc',
237 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
238 'common/gpu/client/gpu_memory_buffer_impl_ozone.h',
237 'common/gpu/client/gpu_memory_buffer_impl_shm.cc', 239 'common/gpu/client/gpu_memory_buffer_impl_shm.cc',
238 'common/gpu/client/gpu_memory_buffer_impl_shm.h', 240 'common/gpu/client/gpu_memory_buffer_impl_shm.h',
239 'common/gpu/client/gpu_memory_buffer_impl_win.cc', 241 'common/gpu/client/gpu_memory_buffer_impl_win.cc',
240 'common/gpu/client/gpu_video_decode_accelerator_host.cc', 242 'common/gpu/client/gpu_video_decode_accelerator_host.cc',
241 'common/gpu/client/gpu_video_decode_accelerator_host.h', 243 'common/gpu/client/gpu_video_decode_accelerator_host.h',
242 'common/gpu/client/gpu_video_encode_accelerator_host.cc', 244 'common/gpu/client/gpu_video_encode_accelerator_host.cc',
243 'common/gpu/client/gpu_video_encode_accelerator_host.h', 245 'common/gpu/client/gpu_video_encode_accelerator_host.h',
244 'common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc', 246 'common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc',
245 'common/gpu/client/webgraphicscontext3d_command_buffer_impl.h', 247 'common/gpu/client/webgraphicscontext3d_command_buffer_impl.h',
246 'common/gpu/devtools_gpu_agent.cc', 248 'common/gpu/devtools_gpu_agent.cc',
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 'dependencies': [ 577 'dependencies': [
576 '<(DEPTH)/build/linux/system.gyp:xcomposite', 578 '<(DEPTH)/build/linux/system.gyp:xcomposite',
577 ], 579 ],
578 }], 580 }],
579 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', { 581 ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
580 'sources': [ 582 'sources': [
581 'common/gpu/x_util.cc', 583 'common/gpu/x_util.cc',
582 'common/gpu/x_util.h', 584 'common/gpu/x_util.h',
583 ], 585 ],
584 }], 586 }],
587 ['use_ozone == 1', {
588 'sources!': [
589 'common/gpu/client/gpu_memory_buffer_impl_linux.cc',
590 ]
591 }],
585 ['enable_plugins==1', { 592 ['enable_plugins==1', {
586 'dependencies': [ 593 'dependencies': [
587 '../ppapi/ppapi_internal.gyp:ppapi_shared', 594 '../ppapi/ppapi_internal.gyp:ppapi_shared',
588 ], 595 ],
589 }, { # enable_plugins == 0 596 }, { # enable_plugins == 0
590 'sources!': [ 597 'sources!': [
591 'common/pepper_plugin_list.cc', 598 'common/pepper_plugin_list.cc',
592 'common/pepper_plugin_list.h', 599 'common/pepper_plugin_list.h',
593 'common/sandbox_util.cc', 600 'common/sandbox_util.cc',
594 ], 601 ],
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 'common/sandbox_linux/bpf_renderer_policy_linux.cc', 767 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
761 'common/sandbox_linux/bpf_renderer_policy_linux.h', 768 'common/sandbox_linux/bpf_renderer_policy_linux.h',
762 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', 769 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
763 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', 770 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
764 ], 771 ],
765 }, { 772 }, {
766 'defines': ['USE_SECCOMP_BPF'], 773 'defines': ['USE_SECCOMP_BPF'],
767 }], 774 }],
768 ], 775 ],
769 } 776 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698