diff options
| author |  bsalomon <bsalomon@google.com> | 2016-05-10 05:57:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-10 05:57:27 -0700 |
| commit | 33595bdf4b64a745f6340338d307e806e96c587f (patch) | |
| tree | e6a4e7abd27df7aa3fdc764d67ec9e3b4cf86868 /src/gpu/GrPath.h | |
| parent | 82595b6fa4733e1525f357bdcac22db058790550 (diff) | |
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
Review-Url: https://codereview.chromium.org/1957363002
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 4cb12f4325..ee3123f9b5 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 GrStrokeInfo& stroke) + GrPath(GrGpu* gpu, const SkPath& skPath, const GrStyle& style) : INHERITED(gpu) , fBounds(SkRect::MakeEmpty()) , fFillType(GrPathRendering::kWinding_FillType) #ifdef SK_DEBUG , fSkPath(skPath) - , fStroke(stroke) + , fStyle(style) #endif { } - static void ComputeKey(const SkPath& path, const GrStrokeInfo& stroke, GrUniqueKey* key, + static void ComputeKey(const SkPath& path, const GrStyle& style, 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 GrStrokeInfo& stroke) const; + bool isEqualTo(const SkPath& path, const GrStyle& style) const; #endif protected: @@ -46,7 +46,7 @@ protected: GrPathRendering::FillType fFillType; #ifdef SK_DEBUG SkPath fSkPath; - GrStrokeInfo fStroke; + GrStyle fStyle; #endif private: |