commit 0b5b6b2105cf6a60824a28e002abf0d322e4344a
author bsalomon <bsalomon@google.com> Wed Oct 14 08:31:34 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Oct 14 08:31:34 2015 -0700
tree 99775aa9b15d4b4753d63b33ffaf6ef1651301c6
parent 0b01da7bca9dacdd58affe5d5433860cb3d59194

Fix clipping when all analytic FP creations can be skipped

BUG=skia:

Review URL: https://codereview.chromium.org/1400343004

src/gpu/GrClipMaskManager.cpp

diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index 882f607..4b464bb 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -108,10 +108,10 @@
     return false;
 }
 
-const GrFragmentProcessor* GrClipMaskManager::getAnalyticClipProcessor(
-                                                        const GrReducedClip::ElementList& elements,
-                                                        const SkVector& clipToRTOffset,
-                                                        const SkRect* drawBounds) {
+bool GrClipMaskManager::getAnalyticClipProcessor(const GrReducedClip::ElementList& elements,
+                                                 SkVector& clipToRTOffset,
+                                                 const SkRect* drawBounds,
+                                                 const GrFragmentProcessor** resultFP) {
     SkRect boundsInClipSpace;
     if (drawBounds) {
         boundsInClipSpace = *drawBounds;
@@ -190,14 +190,14 @@
         iter.next();
     }
 
-    const GrFragmentProcessor* resultFP = nullptr;
-    if (!failed) {
-        resultFP = GrFragmentProcessor::RunInSeries(fps, fpCnt);
+    *resultFP = nullptr;
+    if (!failed && fpCnt) {
+        *resultFP = GrFragmentProcessor::RunInSeries(fps, fpCnt);
     }
     for (int i = 0; i < fpCnt; ++i) {
         fps[i]->unref();
     }
-    return resultFP;
+    return !failed;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -283,7 +283,7 @@
         const GrFragmentProcessor* clipFP = nullptr;
         if (elements.isEmpty() ||
             (requiresAA && !disallowAnalyticAA &&
-             SkToBool(clipFP = this->getAnalyticClipProcessor(elements, clipToRTOffset, devBounds)))) {
+             this->getAnalyticClipProcessor(elements, clipToRTOffset, devBounds, &clipFP))) {
             SkIRect scissorSpaceIBounds(clipSpaceIBounds);
             scissorSpaceIBounds.offset(-clip.origin());
             if (nullptr == devBounds ||