Revert of Replace GrStrokeInfo with GrStyle.

include/gpu/GrTestUtils.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTestUtils_DEFINED
 #define GrTestUtils_DEFINED
 
 #include "SkTypes.h"
 
 #ifdef GR_TEST_UTILS
 
 #include "GrColor.h"
-#include "SkPathEffect.h"
 #include "SkRandom.h"
 #include "SkStrokeRec.h"
-#include "../private/SkTemplates.h"
 
-class GrStyle;
+class GrStrokeInfo;
 class SkMatrix;
 class SkPath;
 class SkRRect;
 struct SkRect;
 
 namespace GrTest {
 /**
- * Helpers for use in Test functions.
+ * A helper for use in Test functions.
  */
 const SkMatrix& TestMatrix(SkRandom*);
 const SkMatrix& TestMatrixPreservesRightAngles(SkRandom*);
 const SkMatrix& TestMatrixRectStaysRect(SkRandom*);
 const SkMatrix& TestMatrixInvertible(SkRandom*);
 const SkRect& TestRect(SkRandom*);
 const SkRect& TestSquare(SkRandom*);
 const SkRRect& TestRRectSimple(SkRandom*);
 const SkPath& TestPath(SkRandom*);
 const SkPath& TestPathConvex(SkRandom*);
 SkStrokeRec TestStrokeRec(SkRandom*);
-/** Creates styles with dash path effects and null path effects */
-void TestStyle(SkRandom*, GrStyle*);
+GrStrokeInfo TestStrokeInfo(SkRandom*);
 
-// We have a simplified dash path effect here to avoid relying on SkDashPathEffect which
-// is in the optional build target effects.
-class TestDashPathEffect : public SkPathEffect {
-public:
-    static sk_sp<SkPathEffect> Make(const SkScalar* intervals, int count, SkScalar phase) {
-        return sk_sp<SkPathEffect>(new TestDashPathEffect(intervals, count, phase));
-    }
-
-    bool filterPath(SkPath* dst, const SkPath&, SkStrokeRec* , const SkRect*) const override;
-    DashType asADash(DashInfo* info) const override;
-    Factory getFactory() const override { return nullptr; }
-    void toString(SkString*) const override {}
-
-private:
-    TestDashPathEffect(const SkScalar* intervals, int count, SkScalar phase);
-
-    int                     fCount;
-    SkAutoTArray<SkScalar>  fIntervals;
-    SkScalar                fPhase;
-    SkScalar                fInitialDashLength;
-    int                     fInitialDashIndex;
-    SkScalar                fIntervalLength;
-};
-
-}  // namespace GrTest
+}
 
 static inline GrColor GrRandomColor(SkRandom* random) {
     // There are only a few cases of random colors which interest us
     enum ColorMode {
         kAllOnes_ColorMode,
         kAllZeros_ColorMode,
         kAlphaOne_ColorMode,
         kRandom_ColorMode,
         kLast_ColorMode = kRandom_ColorMode
     };
@@ skipping 45 matching lines @@
             break;
         case kRandom_CoverageMode:
             coverage = random->nextULessThan(256);
             break;
     }
     return coverage;
 }
 
 #endif
 #endif