diff options
| author |  robertphillips <robertphillips@google.com> | 2016-09-07 08:29:08 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-07 08:29:08 -0700 |
| commit | 7a00e8bc9868f262d13d21c484f978f99e0adb95 (patch) | |
| tree | f599567384b1636465075a7e1fc490101d2f8b0a /src/gpu/batches/GrAAConvexTessellator.h | |
| parent | b393a49e5fa7e69ba67692929e9fa2a4e1f6bbb1 (diff) | |
Revert of Make AALinearizingConvexPathRenderer able to handle stroke and fill (patchset #7 id:120001 of https://codereview.chromium.org/2301353004/ )
Reason for revert:
Image quality issues on Android devices
Original issue's description:
> Make AALinearizingConvexPathRenderer able to handle stroke and fill
>
> This is intended to catch stroke-and-fill convex paths with potentially small stroke widths (e.g., .1).
>
> It does have the disconcerting side effect of changing bevel-joined stroke-and-filled degenerate-single-line-rects into plain rects (w/o triangular end-caps).
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2301353004
>
> Committed: https://skia.googlesource.com/skia/+/522bcd99fa65a8abd130880f59b500cf367d0845
TBR=ethannicholas@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2318183002
Diffstat (limited to 'src/gpu/batches/GrAAConvexTessellator.h')
| -rw-r--r-- | src/gpu/batches/GrAAConvexTessellator.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/gpu/batches/GrAAConvexTessellator.h b/src/gpu/batches/GrAAConvexTessellator.h index 4ba3a9c78b..2683147912 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 @@ class GrAAConvexTessellator; // 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) { } @@ -139,13 +136,6 @@ private: 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) void init(const GrAAConvexTessellator& tess); void init(const SkTDArray<SkVector>& norms, const SkTDArray<SkVector>& bisectors); @@ -277,9 +267,8 @@ private: #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; |