content/common/gpu/client/gpu_memory_buffer_impl.cc - Issue 1389133002: content: Use type-parameterized tests for GpuMemoryBuffer implementations.

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

Issue 1389133002: content: Use type-parameterized tests for GpuMemoryBuffer implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add blankline Created 5 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/browser/gpu/browser_gpu_memory_buffer_manager.cc ('k') | content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/client/gpu_memory_buffer_impl.cc

diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.cc b/content/common/gpu/client/gpu_memory_buffer_impl.cc

index 44c44a2529e40c719fa29fdf92569eeea5611da9..38107a58f55fcf03e625fe9400db9f25d196e864 100644

--- a/content/common/gpu/client/gpu_memory_buffer_impl.cc

+++ b/content/common/gpu/client/gpu_memory_buffer_impl.cc

@@ -5,10 +5,7 @@

#include "content/common/gpu/client/gpu_memory_buffer_impl.h"

#include "base/logging.h"

-#include "base/numerics/safe_math.h"

#include "content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h"

-#include "ui/gfx/buffer_format_util.h"

-#include "ui/gl/gl_bindings.h"

#if defined(OS_MACOSX)

#include "content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h"

@@ -50,7 +47,7 @@ scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(

switch (handle.type) {

case gfx::SHARED_MEMORY_BUFFER:

return GpuMemoryBufferImplSharedMemory::CreateFromHandle(

- handle, size, format, callback);

+ handle, size, format, usage, callback);

#if defined(OS_MACOSX)

case gfx::IO_SURFACE_BUFFER:

return GpuMemoryBufferImplIOSurface::CreateFromHandle(

@@ -59,7 +56,7 @@ scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImpl::CreateFromHandle(

#if defined(OS_ANDROID)

case gfx::SURFACE_TEXTURE_BUFFER:

return GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(

- handle, size, format, callback);

+ handle, size, format, usage, callback);

#endif

#if defined(USE_OZONE)

case gfx::OZONE_NATIVE_PIXMAP: