Fix Ganesh analytic blurred rect draws

src/effects/SkBlurMaskFilter.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBlurMaskFilter.h"
 #include "SkBlurMask.h"
 #include "SkGpuBlurUtils.h"
@@ skipping 1140 matching lines @@
         SkASSERT(mask);
         context->textureProvider()->assignUniqueKeyToTexture(key, mask.get());
     }
 
     return mask;
 }
 
 sk_sp<GrFragmentProcessor> GrRRectBlurEffect::Make(GrContext* context,
                                                    float sigma, float xformedSigma,
                                                    const SkRRect& srcRRect, const SkRRect& devRRect) {
-    SkASSERT(!devRRect.isCircle()); // Should've been caught up-stream
+    SkASSERT(!devRRect.isCircle() && !devRRect.isRect()); // Should've been caught up-stream
 
     // TODO: loosen this up
     if (!devRRect.isSimpleCircular()) {
         return nullptr;
     }
 
     // Make sure we can successfully ninepatch this rrect -- the blur sigma has to be
     // sufficiently small relative to both the size of the corner radius and the
     // width (and height) of the rrect.
     SkRRect rrectToDraw;
@@ skipping 172 matching lines @@
     if (fBlurStyle != kNormal_SkBlurStyle) {
         return false;
     }
 
     if (!strokeRec.isFillStyle()) {
         return false;
     }
 
     SkScalar xformedSigma = this->computeXformedSigma(viewMatrix);
 
-    if (devRRect.isCircle()) {
-        sk_sp<GrFragmentProcessor> fp(GrCircleBlurFragmentProcessor::Make(
-                                                                        context->textureProvider(),
-                                                                        devRRect.rect(),
-                                                                        xformedSigma));
+    if (devRRect.isRect() || devRRect.isCircle()) {
+        if (this->ignoreXform()) {
+            return false;
+        }
+
+        sk_sp<GrFragmentProcessor> fp;
+        if (devRRect.isRect()) {
+            SkScalar pad = 3.0f * xformedSigma;
+            const SkRect dstCoverageRect = devRRect.rect().makeOutset(pad, pad);
+
+            fp = GrRectBlurEffect::Make(context->textureProvider(), dstCoverageRect, xformedSigma);
+        } else {
+            fp = GrCircleBlurFragmentProcessor::Make(context->textureProvider(),
+                                                     devRRect.rect(),
+                                                     xformedSigma);
+        }
+
         if (!fp) {
             return false;
         }
 
         GrPaint newPaint(*grp);
         newPaint.addCoverageFragmentProcessor(std::move(fp));
         newPaint.setAntiAlias(false);
 
         SkRect srcProxyRect = srcRRect.rect();
         srcProxyRect.outset(3.0f*fSigma, 3.0f*fSigma);
@@ skipping 181 matching lines @@
     } else {
         str->append("None");
     }
     str->append("))");
 }
 #endif
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkBlurMaskFilter)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurMaskFilterImpl)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END