content/common/child_process_messages.h - Issue 634643002: content: Out-of-process GPU service support for SurfaceTexture backed GpuMemoryBuffers.

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/child_process_messages.h

Issue 634643002: content: Out-of-process GPU service support for SurfaceTexture backed GpuMemoryBuffers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: one last build fix Created 6 years, 2 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/android/surface_texture_manager.cc ('k') | content/common/gpu/client/gpu_memory_buffer_impl_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/child_process_messages.h

diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h

index 18c3cc4c2efe0c9e3cac05a46a4d23af8fa27faa..9cd644a88647e339bc97ef706d53cb422da11020 100644

--- a/content/common/child_process_messages.h

+++ b/content/common/child_process_messages.h

@@ -60,13 +60,6 @@ IPC_STRUCT_TRAITS_END()

IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType,

gfx::GPU_MEMORY_BUFFER_TYPE_LAST)

-#if defined(OS_ANDROID)

-IPC_STRUCT_TRAITS_BEGIN(gfx::SurfaceTextureId)

- IPC_STRUCT_TRAITS_MEMBER(primary_id)

- IPC_STRUCT_TRAITS_MEMBER(secondary_id)

-IPC_STRUCT_TRAITS_END()

-#endif

IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)

IPC_STRUCT_TRAITS_MEMBER(primary_id)

IPC_STRUCT_TRAITS_MEMBER(secondary_id)

@@ -79,9 +72,6 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle)

#if defined(OS_MACOSX)

IPC_STRUCT_TRAITS_MEMBER(io_surface_id)

#endif

-#if defined(OS_ANDROID)

- IPC_STRUCT_TRAITS_MEMBER(surface_texture_id)

-#endif

#if defined(USE_X11)

IPC_STRUCT_TRAITS_MEMBER(pixmap)

#endif

« no previous file with comments | « content/common/android/surface_texture_manager.cc ('k') | content/common/gpu/client/gpu_memory_buffer_impl_android.cc » ('j') | no next file with comments »