Incorporate scale into GrStyle and GrShape

src/gpu/GrShape.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 GrShape_DEFINED
 #define GrShape_DEFINED
 
@@ skipping 88 matching lines @@
     GrShape& operator=(const GrShape& that);
 
     ~GrShape() {
         if (Type::kPath == fType) {
             fPath.reset();
         }
     }
 
     const GrStyle& style() const { return fStyle; }
 
-    GrShape applyStyle(GrStyle::Apply apply) { return GrShape(*this, apply); }
+    /**
+     * Returns a shape that has either applied the path effect or path effect and stroking
+     * information from this shape's style to its geometry. Scale is used when approximating the
+     * output geometry and typically is computed from the view matrix
+     */
+    GrShape applyStyle(GrStyle::Apply apply, SkScalar scale) {
+        return GrShape(*this, apply, scale);
+    }
 
     bool asRRect(SkRRect* rrect) const {
         if (Type::kRRect != fType) {
             return false;
         }
         if (rrect) {
             *rrect = fRRect;
         }
         return true;
     }
@@ skipping 43 matching lines @@
     void writeUnstyledKey(uint32_t* key) const;
 
 private:
     enum class Type {
         kEmpty,
         kRRect,
         kPath,
     };
 
 
-    /** Constructor used by Apply* functions */
-    GrShape(const GrShape& parentShape, GrStyle::Apply);
+    /** Constructor used by the applyStyle() function */
+    GrShape(const GrShape& parentShape, GrStyle::Apply, SkScalar scale);
 
     /**
      * Determines the key we should inherit from the input shape's geometry and style when
      * we are applying the style to create a new shape.
      */
-    void setInheritedKey(const GrShape& parentShape, GrStyle::Apply);
+    void setInheritedKey(const GrShape& parentShape, GrStyle::Apply, SkScalar scale);
 
     void attemptToReduceFromPath() {
         SkASSERT(Type::kPath == fType);
         fType = AttemptToReduceFromPathImpl(*fPath.get(), &fRRect, fStyle.pathEffect(),
                                             fStyle.strokeRec());
         if (Type::kPath != fType) {
             fPath.reset();
             fInheritedKey.reset(0);
         }
     }
@@ skipping 30 matching lines @@
         return Type::kPath;
     }
 
     Type                        fType;
     SkRRect                     fRRect;
     SkTLazy<SkPath>             fPath;
     GrStyle                     fStyle;
     SkAutoSTArray<8, uint32_t>  fInheritedKey;
 };
 #endif