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/gl/GrGLPath.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/gl/GrGLPath.h')
| -rw-r--r-- | src/gpu/gl/GrGLPath.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLPath.h b/src/gpu/gl/GrGLPath.h index ddcee533ee..1ef1346133 100644 --- a/src/gpu/gl/GrGLPath.h +++ b/src/gpu/gl/GrGLPath.h @@ -12,7 +12,6 @@ #include "gl/GrGLTypes.h" class GrGLGpu; -class GrStyle; /** * Currently this represents a path built using GL_NV_path_rendering. If we @@ -28,12 +27,12 @@ public: static void InitPathObjectPathData(GrGLGpu*, GrGLuint pathID, const SkPath&); - static void InitPathObjectStroke(GrGLGpu*, GrGLuint pathID, const SkStrokeRec&); + static void InitPathObjectStroke(GrGLGpu* gpu, GrGLuint pathID, const GrStrokeInfo& stroke); static void InitPathObjectEmptyPath(GrGLGpu*, GrGLuint pathID); - GrGLPath(GrGLGpu*, const SkPath&, const GrStyle&); + GrGLPath(GrGLGpu* gpu, const SkPath& path, const GrStrokeInfo& stroke); GrGLuint pathID() const { return fPathID; } bool shouldStroke() const { return fShouldStroke; } |