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/GrPath.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/GrPath.h')
| -rw-r--r-- | src/gpu/GrPath.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrPath.h b/src/gpu/GrPath.h index ee3123f9b5..4cb12f4325 100644 --- a/src/gpu/GrPath.h +++ b/src/gpu/GrPath.h @@ -9,8 +9,8 @@ #define GrPath_DEFINED #include "GrGpuResource.h" +#include "GrStrokeInfo.h" #include "GrPathRendering.h" -#include "GrStyle.h" #include "SkPath.h" #include "SkRect.h" @@ -19,25 +19,25 @@ public: /** * Initialize to a path with a fixed stroke. Stroke must not be hairline. */ - GrPath(GrGpu* gpu, const SkPath& skPath, const GrStyle& style) + GrPath(GrGpu* gpu, const SkPath& skPath, const GrStrokeInfo& stroke) : INHERITED(gpu) , fBounds(SkRect::MakeEmpty()) , fFillType(GrPathRendering::kWinding_FillType) #ifdef SK_DEBUG , fSkPath(skPath) - , fStyle(style) + , fStroke(stroke) #endif { } - static void ComputeKey(const SkPath& path, const GrStyle& style, GrUniqueKey* key, + static void ComputeKey(const SkPath& path, const GrStrokeInfo& stroke, GrUniqueKey* key, bool* outIsVolatile); const SkRect& getBounds() const { return fBounds; } GrPathRendering::FillType getFillType() const { return fFillType; } #ifdef SK_DEBUG - bool isEqualTo(const SkPath& path, const GrStyle& style) const; + bool isEqualTo(const SkPath& path, const GrStrokeInfo& stroke) const; #endif protected: @@ -46,7 +46,7 @@ protected: GrPathRendering::FillType fFillType; #ifdef SK_DEBUG SkPath fSkPath; - GrStyle fStyle; + GrStrokeInfo fStroke; #endif private: |