Consolidate special case shape transformation logic in GrShapeTest.

src/gpu/GrShape.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 "GrShape.h"
 
 GrShape& GrShape::operator=(const GrShape& that) {
@@ skipping 384 matching lines @@
     if (fRRectData.fRRect.isEmpty()) {
         fType = Type::kEmpty;
         return;
     }
     if (!this->style().hasPathEffect()) {
         fRRectData.fDir = kDefaultRRectDir;
         fRRectData.fStart = kDefaultRRectStart;
     } else if (fStyle.isDashed()) {
         // Dashing ignores the inverseness (currently). skbug.com/5421
         fRRectData.fInverted = false;
     }

[robertphillips, 2016/07/19 17:36:05]

shocrtcuts ?

[bsalomon, 2016/07/20 14:00:20]

Done.

+    // Turn a stroke-and-filled miter rect into a filled rect. TODO: more rrect stroke shocrtcuts.
+    if (!fStyle.hasPathEffect() &&
+        fStyle.strokeRec().getStyle() == SkStrokeRec::kStrokeAndFill_Style &&
+        fStyle.strokeRec().getJoin() == SkPaint::kMiter_Join &&
+        fStyle.strokeRec().getMiter() >= SK_ScalarSqrt2 &&
+        fRRectData.fRRect.isRect()) {
+        SkScalar r = fStyle.strokeRec().getWidth() / 2;
+        fRRectData.fRRect = SkRRect::MakeRect(fRRectData.fRRect.rect().makeOutset(r, r));
+        fStyle = GrStyle::SimpleFill();
+    }
 }
 
 void GrShape::attemptToSimplifyLine() {
     SkASSERT(Type::kLine == fType);
     SkASSERT(!fInheritedKey.count());
     if (fStyle.isDashed()) {
         // Dashing ignores inverseness.
         fLineData.fInverted = false;
         return;
     } else if (fStyle.hasPathEffect()) {
@@ skipping 56 matching lines @@
             fStyle = GrStyle::SimpleFill();
             return;
         }
     }
     // Only path effects could care about the order of the points. Otherwise canonicalize
     // the point order.
     if (pts[1].fY < pts[0].fY || (pts[1].fY == pts[0].fY && pts[1].fX < pts[0].fX)) {
         SkTSwap(pts[0], pts[1]);
     }
 }