content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc - Issue 701873005: Handle failed GpuMemoryBuffer allocations properly.

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

Issue 701873005: Handle failed GpuMemoryBuffer allocations properly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 1 month 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_io_surface.cc ('k') | content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 35e08c99308b44bfab62fb0e1473945eceaca92e..56113168958c70b91c6b7c0dd4f4bc3577956139 100644

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

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

@@ -25,8 +25,12 @@ void GpuMemoryBufferCreated(

gfx::GpuMemoryBuffer::Format format,

const GpuMemoryBufferImpl::CreationCallback& callback,

const gfx::GpuMemoryBufferHandle& handle) {

- DCHECK_EQ(gfx::OZONE_NATIVE_BUFFER, handle.type);

+ if (handle.is_null()) {

+ callback.Run(scoped_ptr<GpuMemoryBufferImpl>());

+ return;

+ }

+ DCHECK_EQ(gfx::OZONE_NATIVE_BUFFER, handle.type);

callback.Run(GpuMemoryBufferImplOzoneNativeBuffer::CreateFromHandle(

handle, size, format, base::Bind(&GpuMemoryBufferDeleted, handle)));

}

@@ -34,7 +38,7 @@ void GpuMemoryBufferCreated(

void GpuMemoryBufferCreatedForChildProcess(

const GpuMemoryBufferImpl::AllocationCallback& callback,

const gfx::GpuMemoryBufferHandle& handle) {

- DCHECK_EQ(gfx::OZONE_NATIVE_BUFFER, handle.type);

+ DCHECK_IMPLIES(!handle.is_null(), gfx::OZONE_NATIVE_BUFFER == handle.type);

callback.Run(handle);

}