commit 0d96175c97856d272d299c86577a34f825e810fc
author Yuqian Li <liyuqian@google.com> Fri Nov 17 16:34:03 2017
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 17 16:58:37 2017
tree 92a56a4e9f920bff2db9214a6367531ca5bab8eb
parent 55ad77481290384038d7638ac4136ebf32a4ee2b

Do not return null paint if shaderFP is null

This fixes the ripple bug reported by LG:
https://b.corp.google.com/issues/68964656

In that bug, the button is so tall that our image shader returns
a null fragment processor because the height exceeds GL_MAX_TEXTURE_SIZE.
If we return null paint, the ripple is completely gone. This CL returns
a default paint so we can still see the ripple, and that matches HWUI's
behaviour.

A GM will be added later after some other urgent Android ripple bug fixes.

Bug: skia:
Change-Id: I9bcafc078916a6a15fbd84d2019f39ac88d2b2f8
Reviewed-on: https://skia-review.googlesource.com/73200
Commit-Queue: Yuqian Li <liyuqian@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/SkGr.cpp

diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 026a748..7fba93e 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -444,9 +444,6 @@
         } else if (const auto* shader = as_SB(skPaint.getShader())) {
             shaderFP = shader->asFragmentProcessor(SkShaderBase::AsFPArgs(
                     context, &viewM, nullptr, skPaint.getFilterQuality(), &colorSpaceInfo));
-            if (!shaderFP) {
-                return false;
-            }
         }
     }