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

Side by Side Diff: content/content_common.gypi

Issue 1258713002: ozone: unify GpuMemoryBufferFactoryOzoneNativePixmap in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 5 years, 4 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
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 1045 matching lines...) Expand 10 before | Expand all | Expand 10 after
1056 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', 1056 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
1057 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', 1057 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
1058 ], 1058 ],
1059 }, { 1059 }, {
1060 'defines': ['USE_SECCOMP_BPF'], 1060 'defines': ['USE_SECCOMP_BPF'],
1061 }], 1061 }],
1062 ['use_ozone==1', { 1062 ['use_ozone==1', {
1063 'dependencies': [ 1063 'dependencies': [
1064 '../ui/ozone/ozone.gyp:ozone', 1064 '../ui/ozone/ozone.gyp:ozone',
1065 '../ui/ozone/ozone.gyp:ozone_base', 1065 '../ui/ozone/ozone.gyp:ozone_base',
1066 '../ui/ozone/gpu/ozone_gpu.gyp:ozone_gpu',
1067 ], 1066 ],
1068 'sources!': [ 1067 'sources!': [
1069 'common/gpu/client/gpu_memory_buffer_impl_linux.cc', 1068 'common/gpu/client/gpu_memory_buffer_impl_linux.cc',
1070 'common/gpu/gpu_memory_buffer_factory_linux.cc', 1069 'common/gpu/gpu_memory_buffer_factory_linux.cc',
1071 ], 1070 ],
1072 }, { # use_ozone!=1 1071 }, { # use_ozone!=1
1073 'sources!': [ 1072 'sources!': [
1074 'common/cursors/webcursor_ozone.cc', 1073 'common/cursors/webcursor_ozone.cc',
1075 'common/font_list_ozone.cc', 1074 'common/font_list_ozone.cc',
1076 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc', 1075 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
1077 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc', 1076 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc',
1078 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h', 1077 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h',
1079 'common/gpu/gpu_memory_buffer_factory_ozone.cc', 1078 'common/gpu/gpu_memory_buffer_factory_ozone.cc',
1080 'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc', 1079 'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc',
1081 'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h', 1080 'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h',
1082 ], 1081 ],
1083 }], 1082 }],
1084 ], 1083 ],
1085 } 1084 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698