commit 6af270116dcf0bc123ce5ca22c319e087cd21f2f
author Brian Salomon <bsalomon@google.com> Fri Jun 09 08:21:42 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 09 14:57:27 2017 +0000
tree a5a1b031690c5deb57f06a55f61a4888ef96c633
parent 12bf424ec21f1a99759fda8e196850a8789c8e3e

Make gradient effect creation fail if texture LUT creation fails

Bug: skia:6198
Change-Id: Ib8fb273564ca54ee9e6e045ac67e191af705a37a
Reviewed-on: https://skia-review.googlesource.com/19260
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/shaders/gradients/SkLinearGradient.cpp

diff --git a/src/shaders/gradients/SkLinearGradient.cpp b/src/shaders/gradients/SkLinearGradient.cpp
index f803d5e..02969bd 100644
--- a/src/shaders/gradients/SkLinearGradient.cpp
+++ b/src/shaders/gradients/SkLinearGradient.cpp
@@ -376,7 +376,8 @@
     class GLSLLinearProcessor;
 
     static sk_sp<GrFragmentProcessor> Make(const CreateArgs& args) {
-        return sk_sp<GrFragmentProcessor>(new GrLinearGradient(args));
+        auto processor = sk_sp<GrLinearGradient>(new GrLinearGradient(args));
+        return processor->isValid() ? std::move(processor) : nullptr;
     }
 
     ~GrLinearGradient() override {}
@@ -489,6 +490,9 @@
     sk_sp<GrFragmentProcessor> inner(GrLinearGradient::Make(
         GrGradientEffect::CreateArgs(args.fContext, this, &matrix, fTileMode,
                                      std::move(colorSpaceXform), SkToBool(args.fDstColorSpace))));
+    if (!inner) {
+        return nullptr;
+    }
     return GrFragmentProcessor::MulOutputByInputAlpha(std::move(inner));
 }