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

Unified 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: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/gpu/gpu_messages.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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': [
« no previous file with comments | « content/common/gpu/gpu_messages.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698