content/common/gpu/gpu_memory_buffer_factory_surface_texture.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/gpu_memory_buffer_factory_surface_texture.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: add header to BUILD.gn Created 5 years, 4 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_shared_memory.cc ('k') | content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/gpu_memory_buffer_factory_surface_texture.h

diff --git a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h

index 24679b06c574a702497e9e4958f3e4d8d4f52f24..1b1ae4eb8746b3a25606a16e422cf06ed5a85956 100644

--- a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h

+++ b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h

@@ -26,9 +26,8 @@ class GpuMemoryBufferFactorySurfaceTexture : public GpuMemoryBufferFactory,

GpuMemoryBufferFactorySurfaceTexture();

~GpuMemoryBufferFactorySurfaceTexture() override;

- static bool IsGpuMemoryBufferConfigurationSupported(

- gfx::GpuMemoryBuffer::Format format,

- gfx::GpuMemoryBuffer::Usage usage);

+ static bool IsGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,

+ gfx::BufferUsage usage);

// Overridden from GpuMemoryBufferFactory:

void GetSupportedGpuMemoryBufferConfigurations(

@@ -36,8 +35,8 @@ class GpuMemoryBufferFactorySurfaceTexture : public GpuMemoryBufferFactory,

gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(

gfx::GpuMemoryBufferId id,

const gfx::Size& size,

- gfx::GpuMemoryBuffer::Format format,

- gfx::GpuMemoryBuffer::Usage usage,

+ gfx::BufferFormat format,

+ gfx::BufferUsage usage,

int client_id,

gfx::PluginWindowHandle surface_handle) override;

void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,

@@ -48,7 +47,7 @@ class GpuMemoryBufferFactorySurfaceTexture : public GpuMemoryBufferFactory,

scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(

const gfx::GpuMemoryBufferHandle& handle,

const gfx::Size& size,

- gfx::GpuMemoryBuffer::Format format,

+ gfx::BufferFormat format,

unsigned internalformat,

int client_id) override;