Make cap only affect the keys of GrShapes that are possibly-open

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 85 matching lines @@
         int parentCnt = parent.fInheritedKey.count();
         bool useParentGeoKey = !parentCnt;
         if (useParentGeoKey) {
             parentCnt = parent.unstyledKeySize();
             if (parentCnt < 0) {
                 // The parent's geometry has no key so we will have no key.
                 fPath.get()->setIsVolatile(true);
                 return;
             }
         }
-        int styleCnt = GrStyle::KeySize(parent.fStyle, apply);
+        uint32_t styleKeyFlags = 0;
+        if (parent.knownToBeClosed()) {
+            styleKeyFlags |= GrStyle::kClosed_KeyFlag;
+        }
+        int styleCnt = GrStyle::KeySize(parent.fStyle, apply, styleKeyFlags);
         if (styleCnt < 0) {
             // The style doesn't allow a key, set the path to volatile so that we fail when
             // we try to get a key for the shape.
             fPath.get()->setIsVolatile(true);
             return;
         }
         fInheritedKey.reset(parentCnt + styleCnt);
         if (useParentGeoKey) {
             // This will be the geo key.
             parent.writeUnstyledKey(fInheritedKey.get());
         } else {
             // This should be (geo,path_effect).
             memcpy(fInheritedKey.get(), parent.fInheritedKey.get(),
                    parentCnt * sizeof(uint32_t));
         }
         // Now turn (geo,path_effect) or (geo) into (geo,path_effect,stroke)
-        GrStyle::WriteKey(fInheritedKey.get() + parentCnt, parent.fStyle, apply);
+        GrStyle::WriteKey(fInheritedKey.get() + parentCnt, parent.fStyle, apply, styleKeyFlags);
     }
 }
 
 GrShape::GrShape(const GrShape& that) : fType(that.fType), fStyle(that.fStyle) {
     switch (fType) {
         case Type::kEmpty:
             return;
         case Type::kRRect:
             fRRect = that.fRRect;
             return;
@@ skipping 76 matching lines @@
             srcForStrokeRec = tmpPath.init();
             parent.asPath(tmpPath.get());
         }
         SkASSERT(parent.fStyle.strokeRec().needToApply());
         SkAssertResult(parent.fStyle.strokeRec().applyToPath(fPath.get(), *srcForStrokeRec));
         fStyle.resetToInitStyle(SkStrokeRec::kFill_InitStyle);
     }
     this->attemptToReduceFromPath();
     this->setInheritedKey(*parentForKey, apply);
 }