content/common/gpu/gpu_memory_buffer_factory.cc - Issue 1831513003: Pull gpu service/client shared memory buffer code to GpuMemoryBufferSupport

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/gpu_memory_buffer_factory.cc

Issue 1831513003: Pull gpu service/client shared memory buffer code to GpuMemoryBufferSupport (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed ifdef mixup Created 4 years, 9 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/gpu/gpu_memory_buffer_factory.h ('k') | content/common/gpu/gpu_memory_buffer_factory_io_surface.h » ('j') | gpu/ipc/common/gpu_memory_buffer_support.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/gpu_memory_buffer_factory.cc

diff --git a/content/common/gpu/gpu_memory_buffer_factory.cc b/content/common/gpu/gpu_memory_buffer_factory.cc

index 8469e1621782ecd80a3c6a8a70e651dfd7db96c3..3468d5a6f189bc566f141a6eadedb992c2f8c20a 100644

--- a/content/common/gpu/gpu_memory_buffer_factory.cc

+++ b/content/common/gpu/gpu_memory_buffer_factory.cc

@@ -22,20 +22,6 @@

namespace content {

// static

-gfx::GpuMemoryBufferType GpuMemoryBufferFactory::GetNativeType() {

-#if defined(OS_MACOSX)

- return gfx::IO_SURFACE_BUFFER;

-#endif

-#if defined(OS_ANDROID)

- return gfx::SURFACE_TEXTURE_BUFFER;

-#endif

-#if defined(USE_OZONE)

- return gfx::OZONE_NATIVE_PIXMAP;

-#endif

- return gfx::EMPTY_BUFFER;

-// static

scoped_ptr<GpuMemoryBufferFactory> GpuMemoryBufferFactory::CreateNativeType() {

#if defined(OS_MACOSX)

return make_scoped_ptr(new GpuMemoryBufferFactoryIOSurface);