diff options
Diffstat (limited to 'src/gpu/GrDefaultPathRenderer.cpp')
| -rw-r--r-- | src/gpu/GrDefaultPathRenderer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp index 2b9179f6d8..dfe7ee44c4 100644 --- a/src/gpu/GrDefaultPathRenderer.cpp +++ b/src/gpu/GrDefaultPathRenderer.cpp @@ -183,7 +183,7 @@ static inline void append_countour_edge_indices(GrPathFill fillType, bool GrDefaultPathRenderer::createGeom(const SkPath& path, GrPathFill fill, - GrScalar srcSpaceTol, + SkScalar srcSpaceTol, GrDrawTarget* target, GrPrimitiveType* primType, int* vertexCnt, @@ -192,7 +192,7 @@ bool GrDefaultPathRenderer::createGeom(const SkPath& path, { SK_TRACE_EVENT0("GrDefaultPathRenderer::createGeom"); - GrScalar srcSpaceTolSqd = GrMul(srcSpaceTol, srcSpaceTol); + SkScalar srcSpaceTolSqd = SkScalarMul(srcSpaceTol, srcSpaceTol); int contourCnt; int maxPts = GrPathUtils::worstCasePointCount(path, &contourCnt, srcSpaceTol); @@ -321,7 +321,7 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path, bool stencilOnly) { GrMatrix viewM = target->getDrawState().getViewMatrix(); - GrScalar tol = GR_Scalar1; + SkScalar tol = SK_Scalar1; tol = GrPathUtils::scaleToleranceToSrc(tol, viewM, path.getBounds()); int vertexCnt; @@ -455,8 +455,8 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path, GrAssert(NULL != drawState->getRenderTarget()); // draw over the whole world. bounds.setLTRB(0, 0, - GrIntToScalar(drawState->getRenderTarget()->width()), - GrIntToScalar(drawState->getRenderTarget()->height())); + SkIntToScalar(drawState->getRenderTarget()->width()), + SkIntToScalar(drawState->getRenderTarget()->height())); GrMatrix vmi; // mapRect through persp matrix may not be correct if (!drawState->getViewMatrix().hasPerspective() && |