diff options
| author |  bsalomon <bsalomon@google.com> | 2016-05-10 06:19:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-10 06:19:21 -0700 |
| commit | 85d9667f59d4138438427bb2cdf67992d100e1a0 (patch) | |
| tree | 1d86fd1d78a1bdd36f6b250bf31dd285986db5ef /src/gpu/GrStyle.h | |
| parent | 00e9452791a80ed9fb824214b259ecb9af0c25c6 (diff) | |
Revert of Replace GrStrokeInfo with GrStyle. (patchset #4 id:160001 of https://codereview.chromium.org/1957363002/ )
Reason for revert:
Breaking some bots
Original issue's description:
> Replace GrStrokeInfo with GrStyle.
>
> A side effect is that arbitrary path effects can no be pushed deeper into the Ganesh flow for paths. They may be applied by path renderers.
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1957363002
>
> Committed: https://skia.googlesource.com/skia/+/33595bdf4b64a745f6340338d307e806e96c587f
TBR=egdaniel@google.com,robertphillips@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/1967513002
Diffstat (limited to 'src/gpu/GrStyle.h')
| -rw-r--r-- | src/gpu/GrStyle.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/gpu/GrStyle.h b/src/gpu/GrStyle.h index 07efb40866..6166b56fb7 100644 --- a/src/gpu/GrStyle.h +++ b/src/gpu/GrStyle.h @@ -85,11 +85,6 @@ public: 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; @@ -138,12 +133,6 @@ public: 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 |