Index: src/gpu/batches/GrAAConvexTessellator.h |
diff --git a/src/gpu/batches/GrAAConvexTessellator.h b/src/gpu/batches/GrAAConvexTessellator.h |
index 4ba3a9c78b17c7348fbf46d6d83903fb3e5597d4..268314791256bcca24c9fbf3bc09cc3e1f4b637a 100644 |
--- a/src/gpu/batches/GrAAConvexTessellator.h |
+++ b/src/gpu/batches/GrAAConvexTessellator.h |
@@ -12,7 +12,6 @@ |
#include "SkPaint.h" |
#include "SkPoint.h" |
#include "SkScalar.h" |
-#include "SkStrokeRec.h" |
#include "SkTDArray.h" |
class SkCanvas; |
@@ -32,13 +31,11 @@ |
// computeDepthFromEdge requests. |
class GrAAConvexTessellator { |
public: |
- GrAAConvexTessellator(SkStrokeRec::Style style = SkStrokeRec::kFill_Style, |
- SkScalar strokeWidth = -1.0f, |
+ GrAAConvexTessellator(SkScalar strokeWidth = -1.0f, |
SkPaint::Join join = SkPaint::Join::kBevel_Join, |
SkScalar miterLimit = 0.0f) |
: fSide(SkPoint::kOn_Side) |
, fStrokeWidth(strokeWidth) |
- , fStyle(style) |
, fJoin(join) |
, fMiterLimit(miterLimit) { |
} |
@@ -137,13 +134,6 @@ |
struct PointData* pt = fPts.push(); |
pt->fIndex = index; |
pt->fOrigEdgeId = origEdgeId; |
- } |
- |
- // Upgrade this ring so that it can behave like an originating ring |
- void makeOriginalRing() { |
- for (int i = 0; i < fPts.count(); ++i) { |
- fPts[i].fOrigEdgeId = fPts[i].fIndex; |
- } |
} |
// init should be called after all the indices have been added (via addIdx) |
@@ -277,9 +267,8 @@ |
#endif |
CandidateVerts fCandidateVerts; |
- // the stroke width is only used for stroke or stroke-and-fill styles |
+ // < 0 means filling rather than stroking |
SkScalar fStrokeWidth; |
- SkStrokeRec::Style fStyle; |
SkPaint::Join fJoin; |