diff options
author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 17:12:34 +0000 |
---|---|---|
committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 17:12:34 +0000 |
commit | 81712883419f76e25d2ffec38a9438284a45a48d (patch) | |
tree | d9b6eb86b01ae7e7117f56dc2d6ca4f95879b56f /src/gpu/GrPathUtils.h | |
parent | 35ac048e357aefa6289485c8f6a50fadce23c0d2 (diff) |
Remove GrScalar, replace with SkScalar.
Review URL: https://codereview.appspot.com/6812064
git-svn-id: http://skia.googlecode.com/svn/trunk@6243 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrPathUtils.h')
-rw-r--r-- | src/gpu/GrPathUtils.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrPathUtils.h b/src/gpu/GrPathUtils.h index 31b639864e..4ad0e8b38c 100644 --- a/src/gpu/GrPathUtils.h +++ b/src/gpu/GrPathUtils.h @@ -18,7 +18,7 @@ * Utilities for evaluating paths. */ namespace GrPathUtils { - GrScalar scaleToleranceToSrc(GrScalar devTol, + SkScalar scaleToleranceToSrc(SkScalar devTol, const GrMatrix& viewM, const GrRect& pathBounds); @@ -26,28 +26,28 @@ namespace GrPathUtils { /// very small tolerances will be increased to gMinCurveTol. int worstCasePointCount(const SkPath&, int* subpaths, - GrScalar tol); + SkScalar tol); /// Since we divide by tol if we're computing exact worst-case bounds, /// very small tolerances will be increased to gMinCurveTol. - uint32_t quadraticPointCount(const GrPoint points[], GrScalar tol); + uint32_t quadraticPointCount(const GrPoint points[], SkScalar tol); uint32_t generateQuadraticPoints(const GrPoint& p0, const GrPoint& p1, const GrPoint& p2, - GrScalar tolSqd, + SkScalar tolSqd, GrPoint** points, uint32_t pointsLeft); /// Since we divide by tol if we're computing exact worst-case bounds, /// very small tolerances will be increased to gMinCurveTol. - uint32_t cubicPointCount(const GrPoint points[], GrScalar tol); + uint32_t cubicPointCount(const GrPoint points[], SkScalar tol); uint32_t generateCubicPoints(const GrPoint& p0, const GrPoint& p1, const GrPoint& p2, const GrPoint& p3, - GrScalar tolSqd, + SkScalar tolSqd, GrPoint** points, uint32_t pointsLeft); |