content/common/gpu/client/gpu_channel_host.cc - 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/common/gpu/client/gpu_channel_host.cc

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/client/command_buffer_proxy_impl.cc ('K') | « content/common/gpu/client/gl_helper.h ('k') | content/common/gpu/client/gpu_memory_buffer_impl_android.cc » ('j') | content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/client/gpu_channel_host.cc

diff --git a/content/common/gpu/client/gpu_channel_host.cc b/content/common/gpu/client/gpu_channel_host.cc

index debcfc8032a9c540548798f3e81be05492912a0d..acadc1afe11d6968014a43831d4d9007d2650b0d 100644

--- a/content/common/gpu/client/gpu_channel_host.cc

+++ b/content/common/gpu/client/gpu_channel_host.cc

@@ -51,6 +51,9 @@ bool GpuChannelHost::IsValidGpuMemoryBuffer(

#if defined(OS_MACOSX)

case gfx::IO_SURFACE_BUFFER:

#endif

+#if defined(OS_ANDROID)

+ case gfx::SURFACE_TEXTURE_BUFFER:

+#endif

return true;

default:

return false;

@@ -278,6 +281,10 @@ gfx::GpuMemoryBufferHandle GpuChannelHost::ShareGpuMemoryBufferToGpuProcess(

case gfx::IO_SURFACE_BUFFER:

return source_handle;

#endif

+#if defined(OS_ANDROID)

+ case gfx::SURFACE_TEXTURE_BUFFER:

+ return source_handle;

+#endif

default:

NOTREACHED();

return gfx::GpuMemoryBufferHandle();