diff options
Diffstat (limited to 'src/gpu/ccpr/GrCCGeometry.h')
-rw-r--r-- | src/gpu/ccpr/GrCCGeometry.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/ccpr/GrCCGeometry.h b/src/gpu/ccpr/GrCCGeometry.h index f593744b70..01cf16c68d 100644 --- a/src/gpu/ccpr/GrCCGeometry.h +++ b/src/gpu/ccpr/GrCCGeometry.h @@ -72,9 +72,9 @@ public: } void beginPath(); - void beginContour(const SkPoint& devPt); - void lineTo(const SkPoint& devPt); - void quadraticTo(const SkPoint& devP1, const SkPoint& devP2); + void beginContour(const SkPoint&); + void lineTo(const SkPoint&); + void quadraticTo(const SkPoint[3]); // We pass through inflection points and loop intersections using a line and quadratic(s) // respectively. 'inflectPad' and 'loopIntersectPad' specify how close (in pixels) cubic @@ -87,12 +87,13 @@ public: // through the loop intersection can be approximated with a single quadratic anyway, // regardless of whether we are use one pixel of pad or two (1.622 avg. quads per loop // intersection vs. 1.489 on the tiger). - void cubicTo(const SkPoint& devP1, const SkPoint& devP2, const SkPoint& devP3, - float inflectPad = 0.55f, float loopIntersectPad = 2); + void cubicTo(const SkPoint[4], float inflectPad = 0.55f, float loopIntersectPad = 2); PrimitiveTallies endContour(); // Returns the numbers of primitives needed to draw the contour. private: + inline void appendLine(const Sk2f& endpt); + inline void appendMonotonicQuadratics(const Sk2f& p0, const Sk2f& p1, const Sk2f& p2); inline void appendSingleMonotonicQuadratic(const Sk2f& p0, const Sk2f& p1, const Sk2f& p2); @@ -117,7 +118,6 @@ private: // Transient state used while building a contour. SkPoint fCurrAnchorPoint; - SkPoint fCurrFanPoint; PrimitiveTallies fCurrContourTallies; SkCubicType fCurrCubicType; SkDEBUGCODE(bool fBuildingContour = false); |