content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h - Issue 1269503007: Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone

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_memory_buffer_impl_shared_memory.h

Issue 1269503007: Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix our IPC_MESSAGE_EXPORT affecting printing_messages.h 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/client/gpu_memory_buffer_impl_shared_memory.cc » ('j') | ui/ozone/common/gpu/ozone_gpu_message_params.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h

diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h

index bb26debc7d48e705a3509b0a4030e1d80c9e94c7..fedeae774ba5650c8a8f37c9b7484000308df404 100644

--- a/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h

+++ b/content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h

@@ -17,24 +17,25 @@ class GpuMemoryBufferImplSharedMemory : public GpuMemoryBufferImpl {

static scoped_ptr<GpuMemoryBufferImpl> Create(

gfx::GpuMemoryBufferId id,

const gfx::Size& size,

- Format format,

+ gfx::BufferFormat format,

const DestructionCallback& callback);

static gfx::GpuMemoryBufferHandle AllocateForChildProcess(

gfx::GpuMemoryBufferId id,

const gfx::Size& size,

- Format format,

+ gfx::BufferFormat format,

base::ProcessHandle child_process);

static scoped_ptr<GpuMemoryBufferImpl> CreateFromHandle(

const gfx::GpuMemoryBufferHandle& handle,

const gfx::Size& size,

- Format format,

+ gfx::BufferFormat format,

const DestructionCallback& callback);

- static bool IsFormatSupported(Format format);

- static bool IsUsageSupported(Usage usage);

- static bool IsSizeValidForFormat(const gfx::Size& size, Format format);

+ static bool IsFormatSupported(gfx::BufferFormat format);

+ static bool IsUsageSupported(gfx::BufferUsage usage);

+ static bool IsSizeValidForFormat(const gfx::Size& size,

+ gfx::BufferFormat format);

// Overridden from gfx::GpuMemoryBuffer:

bool Map(void** data) override;

@@ -45,7 +46,7 @@ class GpuMemoryBufferImplSharedMemory : public GpuMemoryBufferImpl {

private:

GpuMemoryBufferImplSharedMemory(gfx::GpuMemoryBufferId id,

const gfx::Size& size,

- Format format,

+ gfx::BufferFormat format,

const DestructionCallback& callback,

scoped_ptr<base::SharedMemory> shared_memory);