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

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: resolve nits 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 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', 1062 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
1063 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', 1063 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
1064 ], 1064 ],
1065 }, { 1065 }, {
1066 'defines': ['USE_SECCOMP_BPF'], 1066 'defines': ['USE_SECCOMP_BPF'],
1067 }], 1067 }],
1068 ['use_ozone==1', { 1068 ['use_ozone==1', {
1069 'dependencies': [ 1069 'dependencies': [
1070 '../ui/ozone/ozone.gyp:ozone', 1070 '../ui/ozone/ozone.gyp:ozone',
1071 '../ui/ozone/ozone.gyp:ozone_base', 1071 '../ui/ozone/ozone.gyp:ozone_base',
1072 '../ui/ozone/gpu/ozone_gpu.gyp:ozone_gpu',
1073 ], 1072 ],
1074 'sources!': [ 1073 'sources!': [
1075 'common/gpu/client/gpu_memory_buffer_impl_linux.cc', 1074 'common/gpu/client/gpu_memory_buffer_impl_linux.cc',
1076 'common/gpu/gpu_memory_buffer_factory_linux.cc', 1075 'common/gpu/gpu_memory_buffer_factory_linux.cc',
1077 ], 1076 ],
1078 }, { # use_ozone!=1 1077 }, { # use_ozone!=1
1079 'sources!': [ 1078 'sources!': [
1080 'common/cursors/webcursor_ozone.cc', 1079 'common/cursors/webcursor_ozone.cc',
1081 'common/font_list_ozone.cc', 1080 'common/font_list_ozone.cc',
1082 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc', 1081 'common/gpu/client/gpu_memory_buffer_impl_ozone.cc',
1083 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc', 1082 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc',
1084 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h', 1083 'common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h',
1085 'common/gpu/gpu_memory_buffer_factory_ozone.cc', 1084 'common/gpu/gpu_memory_buffer_factory_ozone.cc',
1086 'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc', 1085 'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc',
1087 'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h', 1086 'common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h',
1088 ], 1087 ],
1089 }], 1088 }],
1090 ], 1089 ],
1091 } 1090 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698