commit d538d3df27b6add9a441ad3b53d809a6a6b5b59c
author Brian Salomon <bsalomon@google.com> Thu Apr 04 12:18:17 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 04 18:04:19 2019 +0000
tree a059f79337e3fc9fc096c38a942b9cf02f74144a
parent e797dfba6357f129b8890214bb3bd77ff18604f5

Handle promise texture image fulfill returning nullptr.

Bug: chromium:948249
Change-Id: Id5d9b732a0d9612b7ed562041fa3544fd7c39f71
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/206076
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrFragmentProcessor.h

diff --git a/src/gpu/GrFragmentProcessor.h b/src/gpu/GrFragmentProcessor.h
index fecf8d5..5136243 100644
--- a/src/gpu/GrFragmentProcessor.h
+++ b/src/gpu/GrFragmentProcessor.h
@@ -434,8 +434,7 @@
     // TODO: this can go away once explicit allocation has stuck
     bool instantiate(GrResourceProvider* resourceProvider) const {
         if (resourceProvider->explicitlyAllocateGPUResources()) {
-            SkASSERT(fProxyRef.get()->isInstantiated());
-            return true;
+            return fProxyRef.get()->isInstantiated();
         } else {
             return SkToBool(fProxyRef.get()->instantiate(resourceProvider));
         }