content/content_common.gypi - Issue 331723003: gpu: Remove Create/DeleteImage IPC by adding an X11_PIXMAP_BUFFER GpuMemoryBuffer type.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: crown of aragorn 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

« content/common/gpu/gpu_memory_buffer_factory_android.cc ('K') | « content/common/gpu/gpu_messages.h ('k') | content/renderer/render_thread_impl.h » ('j') | gpu/command_buffer/service/in_process_command_buffer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/content_common.gypi

diff --git a/content/content_common.gypi b/content/content_common.gypi

index 5d7d04d7edd7e7e2be860db18f50faac2e066c3c..e07c9ec76fdef0a7613bea0bca53f64a9e26ad65 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -256,8 +256,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',

@@ -276,6 +276,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',

@@ -670,6 +676,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': [