In GrShape detect that stroked axis-aligned lines are rrects.

src/gpu/GrStyle.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 "GrStyle.h"
 #include "SkDashPathPriv.h"
 
@@ skipping 57 matching lines @@
             kCapBits = 32 - kStyleBits - kJoinBits,
 
             kJoinShift = kStyleBits,
             kCapShift = kJoinShift + kJoinBits,
         };
         GR_STATIC_ASSERT(SkStrokeRec::kStyleCount <= (1 << kStyleBits));
         GR_STATIC_ASSERT(SkPaint::kJoinCount <= (1 << kJoinBits));
         GR_STATIC_ASSERT(SkPaint::kCapCount <= (1 << kCapBits));
         // The cap type only matters for unclosed shapes. However, a path effect could unclose
         // the shape before it is stroked.
-        SkPaint::Cap cap;
-        if ((flags & kClosed_KeyFlag) && !style.pathEffect()) {
-            cap = SkPaint::kButt_Cap;
-        } else {
+        SkPaint::Cap cap = SkPaint::kDefault_Cap;
+        if (!(flags & kClosed_KeyFlag) || style.pathEffect()) {
             cap = style.strokeRec().getCap();
         }
+        SkScalar miter = -1.f;
+        SkPaint::Join join = SkPaint::kDefault_Join;
+
+        // Dashing will not insert joins but other path effects may.
+        if (!(flags & kNoJoins_KeyFlag) || style.hasNonDashPathEffect()) {
+            join = style.strokeRec().getJoin();
+            // Miter limit only affects miter joins
+            if (SkPaint::kMiter_Join == join) {
+                miter = style.strokeRec().getMiter();
+            }
+        }
+
         key[i++] = style.strokeRec().getStyle() |
-                   style.strokeRec().getJoin() << kJoinShift |
+                   join << kJoinShift |
                    cap << kCapShift;
 
-        SkScalar scalar;
-        // Miter limit only affects miter joins
-        scalar = SkPaint::kMiter_Join == style.strokeRec().getJoin()
-                 ? style.strokeRec().getMiter()
-                 : -1.f;
-        memcpy(&key[i++], &scalar, sizeof(scalar));
+        memcpy(&key[i++], &miter, sizeof(miter));
 
-        scalar = style.strokeRec().getWidth();
-        memcpy(&key[i++], &scalar, sizeof(scalar));
+        SkScalar width = style.strokeRec().getWidth();
+        memcpy(&key[i++], &width, sizeof(width));
     }
     SkASSERT(KeySize(style, apply) == i);
 }
 
 void GrStyle::initPathEffect(SkPathEffect* pe) {
     SkASSERT(!fPathEffect)
     SkASSERT(SkPathEffect::kNone_DashType == fDashInfo.fType);
     SkASSERT(0 == fDashInfo.fIntervals.count());
     if (!pe) {
         return;
@@ skipping 78 matching lines @@
         return false;
     } else {
         SkASSERT(SkStrokeRec::kFill_Style == strokeRec.getStyle() ||
                  SkStrokeRec::kHairline_Style == strokeRec.getStyle());
         *style = strokeRec.getStyle() == SkStrokeRec::kFill_Style
                  ? SkStrokeRec::kFill_InitStyle
                  : SkStrokeRec::kHairline_InitStyle;
     }
     return true;
 }