diff options
author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 17:58:28 +0000 |
---|---|---|
committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 17:58:28 +0000 |
commit | 972f9cd7a063d0544f8c919fd12b9a3adbd12b24 (patch) | |
tree | f72b7df8838068916ec1c61ed02db69342d9a21b /src/gpu/GrPathUtils.h | |
parent | 0e9e6a331394721bdc47607733880d4c67b595dd (diff) |
SK_SUPPORT_LEGACY_GRTYPES to hide duplicate types from SkTypes.h
BUG=skia:
R=bsalomon@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/216503004
git-svn-id: http://skia.googlecode.com/svn/trunk@13982 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrPathUtils.h')
-rw-r--r-- | src/gpu/GrPathUtils.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/gpu/GrPathUtils.h b/src/gpu/GrPathUtils.h index 71f6e0b9c1..d6c18ea4a8 100644 --- a/src/gpu/GrPathUtils.h +++ b/src/gpu/GrPathUtils.h @@ -31,25 +31,25 @@ namespace GrPathUtils { /// 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[], SkScalar tol); + uint32_t quadraticPointCount(const SkPoint points[], SkScalar tol); - uint32_t generateQuadraticPoints(const GrPoint& p0, - const GrPoint& p1, - const GrPoint& p2, + uint32_t generateQuadraticPoints(const SkPoint& p0, + const SkPoint& p1, + const SkPoint& p2, SkScalar tolSqd, - GrPoint** points, + SkPoint** 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[], SkScalar tol); + uint32_t cubicPointCount(const SkPoint points[], SkScalar tol); - uint32_t generateCubicPoints(const GrPoint& p0, - const GrPoint& p1, - const GrPoint& p2, - const GrPoint& p3, + uint32_t generateCubicPoints(const SkPoint& p0, + const SkPoint& p1, + const SkPoint& p2, + const SkPoint& p3, SkScalar tolSqd, - GrPoint** points, + SkPoint** points, uint32_t pointsLeft); // A 2x3 matrix that goes from the 2d space coordinates to UV space where @@ -59,8 +59,8 @@ namespace GrPathUtils { public: QuadUVMatrix() {}; // Initialize the matrix from the control pts - QuadUVMatrix(const GrPoint controlPts[3]) { this->set(controlPts); } - void set(const GrPoint controlPts[3]); + QuadUVMatrix(const SkPoint controlPts[3]) { this->set(controlPts); } + void set(const SkPoint controlPts[3]); /** * Applies the matrix to vertex positions to compute UV coords. This @@ -85,8 +85,8 @@ namespace GrPathUtils { float sy = fM[4]; float ty = fM[5]; for (int i = 0; i < N; ++i) { - const GrPoint* xy = reinterpret_cast<const GrPoint*>(xyPtr); - GrPoint* uv = reinterpret_cast<GrPoint*>(uvPtr); + const SkPoint* xy = reinterpret_cast<const SkPoint*>(xyPtr); + SkPoint* uv = reinterpret_cast<SkPoint*>(uvPtr); uv->fX = sx * xy->fX + kx * xy->fY + tx; uv->fY = ky * xy->fX + sy * xy->fY + ty; xyPtr += STRIDE; @@ -119,7 +119,7 @@ namespace GrPathUtils { // Setting constrainWithinTangents to true enforces this property. When this // is true the cubic must be simple and dir must specify the orientation of // the cubic. Otherwise, dir is ignored. - void convertCubicToQuads(const GrPoint p[4], + void convertCubicToQuads(const SkPoint p[4], SkScalar tolScale, bool constrainWithinTangents, SkPath::Direction dir, |