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

Unified Diff: cc/resources/resource_provider.cc

Issue 1438273002: cc: Don't crash if GMB allocation fails (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index 506d1d97954cd14f49c1a8422c5987a6519288c3..4e490750a9907b46245871954d0aa0cdb91cb778 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -1537,6 +1537,10 @@ void ResourceProvider::LazyCreateImage(Resource* resource) {
DCHECK(resource->gpu_memory_buffer);
DCHECK(resource->gl_id);
DCHECK(resource->allocated);
+ // Avoid crashing in release builds if GpuMemoryBuffer allocation fails.
+ // http://crbug.com/554541
+ if (!resource->gpu_memory_buffer)
+ return;
if (!resource->image_id) {
GLES2Interface* gl = ContextGL();
DCHECK(gl);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698