| Index: content/content_common.gypi
|
| diff --git a/content/content_common.gypi b/content/content_common.gypi
|
| index d43c465da9f015c3eb2a0feb29d0b6d55c2e8705..6c3d71c7dd503754aff3a44971f2b9fc99daf1f5 100644
|
| --- a/content/content_common.gypi
|
| +++ b/content/content_common.gypi
|
| @@ -258,8 +258,8 @@
|
| 'common/gpu/client/gpu_memory_buffer_impl_android.cc',
|
| 'common/gpu/client/gpu_memory_buffer_impl_linux.cc',
|
| 'common/gpu/client/gpu_memory_buffer_impl_mac.cc',
|
| - 'common/gpu/client/gpu_memory_buffer_impl_shm.cc',
|
| - 'common/gpu/client/gpu_memory_buffer_impl_shm.h',
|
| + 'common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc',
|
| + 'common/gpu/client/gpu_memory_buffer_impl_shared_memory.h',
|
| 'common/gpu/client/gpu_memory_buffer_impl_win.cc',
|
| 'common/gpu/client/gpu_video_decode_accelerator_host.cc',
|
| 'common/gpu/client/gpu_video_decode_accelerator_host.h',
|
| @@ -278,6 +278,12 @@
|
| 'common/gpu/gpu_command_buffer_stub.cc',
|
| 'common/gpu/gpu_command_buffer_stub.h',
|
| 'common/gpu/gpu_config.h',
|
| + 'common/gpu/gpu_memory_buffer_factory.h',
|
| + 'common/gpu/gpu_memory_buffer_factory_android.cc',
|
| + 'common/gpu/gpu_memory_buffer_factory_mac.cc',
|
| + 'common/gpu/gpu_memory_buffer_factory_ozone.cc',
|
| + 'common/gpu/gpu_memory_buffer_factory_win.cc',
|
| + 'common/gpu/gpu_memory_buffer_factory_x11.cc',
|
| 'common/gpu/gpu_memory_manager.cc',
|
| 'common/gpu/gpu_memory_manager.h',
|
| 'common/gpu/gpu_memory_manager_client.cc',
|
| @@ -673,6 +679,10 @@
|
| 'dependencies': [
|
| '<(DEPTH)/build/linux/system.gyp:xcomposite',
|
| ],
|
| + 'sources': [
|
| + 'common/gpu/gpu_memory_buffer_factory_x11_pixmap.cc',
|
| + 'common/gpu/gpu_memory_buffer_factory_x11_pixmap.h',
|
| + ],
|
| }],
|
| ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
|
| 'sources': [
|
|
|