Minor clean up related to blur mask filters

gm/occludedrrectblur.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkBlurMaskFilter.h"
 #include "SkRRect.h"
@@ skipping 131 matching lines @@
     dist -= 10.0f;
     SkRRect occRR = SkRRect::MakeOval(
                             offset_center_to(r, center.fX + dist*v.fX, center.fY + dist*v.fY));
 
     draw_rrect(canvas, rr, occRR);
 }
 
 static void draw_90_simple(SkCanvas* canvas, const SkVector& v,
                            SkScalar dist, const SkPoint& center) {
     static const int kLength = 128;
-    static const int kWidth = 32;
+    // The width needs to be larger than 2*3*blurRadii+2*cornerRadius for the analytic
+    // RRect blur to kick in
+    static const int kWidth = 47;
 
     SkIRect r;
     if (fabs(v.fX) < fabs(v.fY)) {
         r = SkIRect::MakeWH(kLength, kWidth);
     } else {
         r = SkIRect::MakeWH(kWidth, kLength);
     }
     SkRRect rr = SkRRect::MakeRectXY(
                             offset_center_to(r, center.fX + dist*v.fX, center.fY + dist*v.fY),
                             8, 8);
@@ skipping 123 matching lines @@
                    SkVector::Make(-0.5f, -kRoot3Over2), 120, center);
         draw_30_60(canvas, SkRRect::kUpperRight_Corner,
                    SkVector::Make(-kRoot3Over2, -0.5f), 120, center);
 
         draw_30_60(canvas, SkRRect::kUpperLeft_Corner,
                    SkVector::Make(0.5f, -kRoot3Over2), 120, center);
         draw_30_60(canvas, SkRRect::kLowerRight_Corner,
                    SkVector::Make(kRoot3Over2, -0.5f), 120, center);
 
         draw_45_simple(canvas, SkVector::Make(-SK_ScalarRoot2Over2, -SK_ScalarRoot2Over2),
-                       190, center);
+                       210, center);
         draw_45_simple(canvas, SkVector::Make(SK_ScalarRoot2Over2, -SK_ScalarRoot2Over2),
-                       190, center);
+                       210, center);
         draw_45_simple(canvas, SkVector::Make(SK_ScalarRoot2Over2, SK_ScalarRoot2Over2),
-                       190, center);
+                       210, center);
         draw_45_simple(canvas, SkVector::Make(-SK_ScalarRoot2Over2, SK_ScalarRoot2Over2),
-                       190, center);
+                       210, center);
 
-        draw_90_simple(canvas, SkVector::Make(-1.0f, 0.0f), 150, center);
-        draw_90_simple(canvas, SkVector::Make(0.0f, -1.0f), 150, center);
-        draw_90_simple(canvas, SkVector::Make(1.0f, 0.0f), 150, center);
-        draw_90_simple(canvas, SkVector::Make(0.0f, 1.0f), 150, center);
+        draw_90_simple(canvas, SkVector::Make(-1.0f, 0.0f), 160, center);
+        draw_90_simple(canvas, SkVector::Make(0.0f, -1.0f), 160, center);
+        draw_90_simple(canvas, SkVector::Make(1.0f, 0.0f), 160, center);
+        draw_90_simple(canvas, SkVector::Make(0.0f, 1.0f), 160, center);
     }
 
 private:
     static const int kWidth = 440;
     static const int kHeight = 440;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new OccludedRRectBlurGM;)
 }