Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(956)

Unified Diff: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.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_ozone_native_buffer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
index 25c5b2d3517dc699a9994901dc678aad6f29c78c..91ba50d0b385ddaf14cf7c558e04da4e34b09aa1 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
@@ -28,8 +28,12 @@ void GpuMemoryBufferCreated(
gfx::GpuMemoryBuffer::Format format,
const GpuMemoryBufferImpl::CreationCallback& callback,
const gfx::GpuMemoryBufferHandle& handle) {
- DCHECK_EQ(gfx::SURFACE_TEXTURE_BUFFER, handle.type);
+ if (handle.is_null()) {
+ callback.Run(scoped_ptr<GpuMemoryBufferImpl>());
+ return;
+ }
+ DCHECK_EQ(gfx::SURFACE_TEXTURE_BUFFER, handle.type);
callback.Run(GpuMemoryBufferImplSurfaceTexture::CreateFromHandle(
handle, size, format, base::Bind(&GpuMemoryBufferDeleted, handle)));
}
@@ -37,7 +41,7 @@ void GpuMemoryBufferCreated(
void GpuMemoryBufferCreatedForChildProcess(
const GpuMemoryBufferImpl::AllocationCallback& callback,
const gfx::GpuMemoryBufferHandle& handle) {
- DCHECK_EQ(gfx::SURFACE_TEXTURE_BUFFER, handle.type);
+ DCHECK_IMPLIES(!handle.is_null(), gfx::SURFACE_TEXTURE_BUFFER == handle.type);
callback.Run(handle);
}
« no previous file with comments | « content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_buffer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698