Incorporate scale into GrStyle and GrShape

src/gpu/GrStyle.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrStyle_DEFINED
 #define GrStyle_DEFINED
 
@@ skipping 42 matching lines @@
         // The shape being styled has no open contours.
         kClosed_KeyFlag = 0x1
     };
 
     /**
      * Computes the key length for a GrStyle. The return will be negative if it cannot be turned
      * into a key. This occurs when there is a path effect that is not a dash. The key can
      * either reflect just the path effect (if one) or the path effect and the strokerec. Note
      * that a simple fill has a zero sized key.
      */
-    static int KeySize(const GrStyle& , Apply, uint32_t flags = 0);
+    static int KeySize(const GrStyle&, Apply, uint32_t flags = 0);
 
     /**
      * Writes a unique key for the style into the provided buffer. This function assumes the buffer
      * has room for at least KeySize() values. It assumes that KeySize() returns a non-negative
      * value for the combination of GrStyle, Apply and flags params. This is written so that the key
      * for just dash application followed by the key for the remaining SkStrokeRec is the same as
      * the key for applying dashing and SkStrokeRec all at once.
      */
-    static void WriteKey(uint32_t*, const GrStyle&, Apply, uint32_t flags = 0);
+    static void WriteKey(uint32_t*, const GrStyle&, Apply, SkScalar scale, uint32_t flags = 0);
 
     GrStyle() : GrStyle(SkStrokeRec::kFill_InitStyle) {}
 
     explicit GrStyle(SkStrokeRec::InitStyle initStyle) : fStrokeRec(initStyle) {}
 
     GrStyle(const SkStrokeRec& strokeRec, SkPathEffect* pe) : fStrokeRec(strokeRec) {
         this->initPathEffect(pe);
     }
 
     GrStyle(const GrStyle& that) : fStrokeRec(SkStrokeRec::kFill_InitStyle) { *this = that; }
@@ skipping 45 matching lines @@
 
     const SkStrokeRec& strokeRec() const { return fStrokeRec; }
 
     /** Hairline or fill styles without path effects make no alterations to a geometry. */
     bool applies() const {
         return this->pathEffect() || (!fStrokeRec.isFillStyle() && !fStrokeRec.isHairlineStyle());
     }
 
     /**
      * Applies just the path effect and returns remaining stroke information. This will fail if
-     * there is no path effect. dst may or may not have been overwritten on failure.
+     * there is no path effect. dst may or may not have been overwritten on failure. Scale controls
+     * geometric approximations made by the path effect. It is typically computed from the view
+     * matrix.
      */
     bool SK_WARN_UNUSED_RESULT applyPathEffectToPath(SkPath* dst, SkStrokeRec* remainingStoke,
-                                                     const SkPath& src) const;
+                                                     const SkPath& src, SkScalar scale) const;
 
-    /** If this succeeds then the result path should be filled or hairlined as indicated by the
-        returned SkStrokeRec::InitStyle value. Will fail if there is no path effect and the
-        strokerec doesn't change the geometry. When this fails the outputs may or may not have
-        been overwritten.
-      */
+    /**
+     * If this succeeds then the result path should be filled or hairlined as indicated by the
+     * returned SkStrokeRec::InitStyle value. Will fail if there is no path effect and the
+     * strokerec doesn't change the geometry. When this fails the outputs may or may not have
+     * been overwritten. Scale controls geometric approximations made by the path effect and
+     * stroker. It is typically computed from the view matrix.
+     */
     bool SK_WARN_UNUSED_RESULT applyToPath(SkPath* dst, SkStrokeRec::InitStyle* fillOrHairline,
-                                           const SkPath& src) const;
+                                           const SkPath& src, SkScalar scale) const;
 
     /** Given bounds of a path compute the bounds of path with the style applied. */
     void adjustBounds(SkRect* dst, const SkRect& src) const {
         if (this->pathEffect()) {
             this->pathEffect()->computeFastBounds(dst, src);
         } else {
             SkScalar radius = fStrokeRec.getInflationRadius();
             *dst = src.makeOutset(radius, radius);
         }
     }
@@ skipping 19 matching lines @@
         SkScalar                    fPhase;
         SkAutoSTArray<4, SkScalar>  fIntervals;
     };
 
     SkStrokeRec         fStrokeRec;
     sk_sp<SkPathEffect> fPathEffect;
     DashInfo            fDashInfo;
 };
 
 #endif