content/common/gpu/gpu_memory_buffer_factory.cc - Issue 1240353002: ozone: rename to GpuMemoryBuffer(Factory|Impl)OzoneNativePixmap.

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 1240353002: ozone: rename to GpuMemoryBuffer(Factory|Impl)OzoneNativePixmap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address nits in comments Created 5 years, 5 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/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc ('k') | content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h » ('j') | no next file with comments »
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 019bdd8dbcc629c80ad7ae24fe43d15526feaf77..2c5bd395c59e2a0610cdd37644bc1361ce56b747 100644

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

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

@@ -16,7 +16,7 @@

#endif

#if defined(USE_OZONE)

-#include "content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.h"

+#include "content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h"

#endif

namespace content {

@@ -32,7 +32,7 @@ void GpuMemoryBufferFactory::GetSupportedTypes(

gfx::SURFACE_TEXTURE_BUFFER,

#endif

#if defined(USE_OZONE)

- gfx::OZONE_NATIVE_BUFFER,

+ gfx::OZONE_NATIVE_PIXMAP,

#endif

gfx::SHARED_MEMORY_BUFFER

};

@@ -54,8 +54,8 @@ scoped_ptr<GpuMemoryBufferFactory> GpuMemoryBufferFactory::Create(

return make_scoped_ptr(new GpuMemoryBufferFactorySurfaceTexture);

#endif

#if defined(USE_OZONE)

- case gfx::OZONE_NATIVE_BUFFER:

- return make_scoped_ptr(new GpuMemoryBufferFactoryOzoneNativeBuffer);

+ case gfx::OZONE_NATIVE_PIXMAP:

+ return make_scoped_ptr(new GpuMemoryBufferFactoryOzoneNativePixmap);

#endif

default:

NOTREACHED();