ui/gfx/gpu_memory_buffer.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: ui/gfx/gpu_memory_buffer.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/public/android/java/src/org/chromium/content/common/IChildProcessCallback.aidl ('k') | ui/gfx/gpu_memory_buffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/gfx/gpu_memory_buffer.h

diff --git a/ui/gfx/gpu_memory_buffer.h b/ui/gfx/gpu_memory_buffer.h

index 932c8d6be98ff330907d8b68f4125e529be16761..013a039d245910a80bc49dcbbd17701236d37038 100644

--- a/ui/gfx/gpu_memory_buffer.h

+++ b/ui/gfx/gpu_memory_buffer.h

@@ -26,18 +26,6 @@ enum GpuMemoryBufferType {

GPU_MEMORY_BUFFER_TYPE_LAST = OZONE_NATIVE_BUFFER

};

-// TODO(alexst): Merge this with GpuMemoryBufferId as part of switchover to

-// the new API for GpuMemoryBuffer allocation when it's done.

-#if defined(OS_ANDROID)

-struct SurfaceTextureId {

- SurfaceTextureId() : primary_id(0), secondary_id(0) {}

- SurfaceTextureId(int32 primary_id, int32 secondary_id)

- : primary_id(primary_id), secondary_id(secondary_id) {}

- int32 primary_id;

- int32 secondary_id;

-};

-#endif

struct GpuMemoryBufferId {

GpuMemoryBufferId() : primary_id(0), secondary_id(0) {}

GpuMemoryBufferId(int32 primary_id, int32 secondary_id)

@@ -55,10 +43,6 @@ struct GFX_EXPORT GpuMemoryBufferHandle {

#if defined(OS_MACOSX)

uint32 io_surface_id;

#endif

-#if defined(OS_ANDROID)

- long buffer_id;

- SurfaceTextureId surface_texture_id;

-#endif

#if defined(USE_X11)

XID pixmap;

#endif