commit 833dcf48844dd053ddf7ecea20e3e1c2b6b47e01
author Robert Phillips <robertphillips@google.com> Fri Nov 18 08:44:13 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 18 14:26:48 2016 +0000
tree 6d7726179687c027c9ab65cc02bfb4155caf7488
parent eaef615377bc5347bfcf3c3da0b6ad922441a317

Add handling for instantiate failure up the call stack

The following two CLs were created via grep:
https://skia-review.googlesource.com/c/4929/ (Guard against instantiate & accessRenderTarget failures)
https://skia-review.googlesource.com/c/4961/ (Remove accessRenderTarget call in SkGpuDevice ctor)

This CL was created by running through all the tests and having instantiate fail so it catches up-stack failures to handle a null return.

BUG=665681,665500,665621

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4991

Change-Id: I6611eec8d36679123eef140538ee2526fb18628f
Reviewed-on: https://skia-review.googlesource.com/4991
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/core/SkCanvas.cpp

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index eddf106..aa74a64 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1419,9 +1419,11 @@
         paint = &looper.paint();
         SkImageFilter* filter = paint->getImageFilter();
         SkIPoint pos = { x - iter.getX(), y - iter.getY() };
-        sk_sp<SkSpecialImage> specialImage;
-        if (filter && (specialImage = srcDev->snapSpecial())) {
-            dstDev->drawSpecial(iter, specialImage.get(), pos.x(), pos.y(), *paint);
+        if (filter) {
+            sk_sp<SkSpecialImage> specialImage = srcDev->snapSpecial();
+            if (specialImage) {
+                dstDev->drawSpecial(iter, specialImage.get(), pos.x(), pos.y(), *paint);
+            }
         } else {
             dstDev->drawDevice(iter, srcDev, pos.x(), pos.y(), *paint);
         }