Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(341)

Unified Diff: src/gpu/GrPath.h

Issue 1957363002: Replace GrStrokeInfo with GrStyle. (Closed) Base URL: https://chromium.googlesource.com/skia.git@resscale
Patch Set: Fix issue where hairlines were going to MSAAPathRenderer Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/gpu/GrPath.h
diff --git a/src/gpu/GrPath.h b/src/gpu/GrPath.h
index 4cb12f4325c6b3c5741eaeaa5502a28e1a6ad416..ee3123f9b59a9c0ea4fa6c34d2c5a3d6c09f3cf7 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:

Powered by Google App Engine
This is Rietveld 408576698