Revert of Replace GrStrokeInfo with GrStyle.

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 67 matching lines @@
     GrStyle(const SkStrokeRec& strokeRec, SkPathEffect* pe) : fStrokeRec(strokeRec) {
         this->initPathEffect(pe);
     }
 
     GrStyle(const GrStyle& that) : fStrokeRec(SkStrokeRec::kFill_InitStyle) { *this = that; }
 
     explicit GrStyle(const SkPaint& paint) : fStrokeRec(paint) {
         this->initPathEffect(paint.getPathEffect());
     }
 
-    explicit GrStyle(const SkPaint& paint, SkPaint::Style overrideStyle)
-            : fStrokeRec(paint, overrideStyle) {
-        this->initPathEffect(paint.getPathEffect());
-    }
-
     GrStyle& operator=(const GrStyle& that) {
         fPathEffect = that.fPathEffect;
         fDashInfo = that.fDashInfo;
         fStrokeRec = that.fStrokeRec;
         return *this;
     }
 
     void resetToInitStyle(SkStrokeRec::InitStyle fillOrHairline) {
         fDashInfo.reset();
         fPathEffect.reset(nullptr);
@@ skipping 28 matching lines @@
         return fDashInfo.fIntervals.get();
     }
 
     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());
     }
 
-    static SkScalar MatrixToScaleFactor(const SkMatrix& matrix) {
-        // getMaxScale will return -1 if the matrix has perspective. In that case we can use a scale
-        // factor of 1. This isn't necessarily a good choice and in the future we might consider
-        // taking a bounds here for the perspective case.
-        return SkScalarAbs(matrix.getMaxScale());
-    }
     /**
      * 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. 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, SkScalar scale) const;
 
     /**
@@ skipping 37 matching lines @@
         SkScalar                    fPhase;
         SkAutoSTArray<4, SkScalar>  fIntervals;
     };
 
     SkStrokeRec         fStrokeRec;
     sk_sp<SkPathEffect> fPathEffect;
     DashInfo            fDashInfo;
 };
 
 #endif