commit a1b283345b27fef91908b104a30cb89e6fbdaade
author scroggo <scroggo@chromium.org> Thu May 12 06:19:37 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu May 12 06:19:37 2016 -0700
tree 981ab0ed2d16bc04a206262b650d157409bf6e6e
parent 7c73a53894927d222d4aceed96893daae8ea14f1

Fail gracefully if MakeRenderTarget fails

We recently started passing --preAbandonGpuContext when running DM on
valgrind, resulting in this call returning nullptr. We had not been
checking for it, so we crash. Already fixed one in crrev.com/1959173002,
and now we reach another one.

BUG=skia:5282
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1972933002

Review-Url: https://codereview.chromium.org/1972933002

gm/image_shader.cpp

diff --git a/gm/image_shader.cpp b/gm/image_shader.cpp
index 214b05d..924199e 100644
--- a/gm/image_shader.cpp
+++ b/gm/image_shader.cpp
@@ -38,6 +38,9 @@
         return nullptr;
     }
     auto surface(SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info));
+    if (!surface) {
+        return nullptr;
+    }
     surface->getCanvas()->clear(0);
     surface->getCanvas()->drawPicture(pic);
     return surface->makeImageSnapshot();