content/content_common.gypi - Issue 177953004: Enable SurfaceTexture based zero-copy texture uploading on Android platform

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 177953004: Enable SurfaceTexture based zero-copy texture uploading on Android platform Base URL: http://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 10 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/surface_texture_bridge_android.cc ('K') | « content/common/gpu/surface_texture_bridge_android.cc ('k') | content/public/android/java/src/org/chromium/content/app/ChildProcessService.java » ('j') | content/public/common/content_switches.h » ('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 566c24500ced85499801725933f3c3d5b65374c6..2b4c76a62f22317655579d183a04c476793d8bef 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -200,6 +200,8 @@

'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_surface_texture.h',

Hongbo Min 2014/03/18 06:10:03 nit:alpha order.

+ 'common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc',

'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',

@@ -244,6 +246,8 @@

'common/gpu/media/video_decode_accelerator_impl.h',

'common/gpu/stream_texture_android.cc',

'common/gpu/stream_texture_android.h',

+ 'common/gpu/surface_texture_bridge_android.cc',

+ 'common/gpu/surface_texture_bridge_android.h',

'common/gpu/sync_point_manager.cc',

'common/gpu/sync_point_manager.h',

'common/gpu/texture_image_transport_surface.cc',