| Index: src/gpu/GrDefaultPathRenderer.cpp
|
| diff --git a/src/gpu/GrDefaultPathRenderer.cpp b/src/gpu/GrDefaultPathRenderer.cpp
|
| index 6d16fb63fe9a941c7445d74d20c44439230e2fa8..1f33e95a77040d7249ddadf2d41e569b36d30345 100644
|
| --- a/src/gpu/GrDefaultPathRenderer.cpp
|
| +++ b/src/gpu/GrDefaultPathRenderer.cpp
|
| @@ -241,7 +241,7 @@ bool GrDefaultPathRenderer::createGeom(const SkPath& path,
|
| uint16_t subpathIdxStart = 0;
|
|
|
| GrPoint* base = reinterpret_cast<GrPoint*>(arg->vertices());
|
| - GrAssert(NULL != base);
|
| + SkASSERT(NULL != base);
|
| GrPoint* vert = base;
|
|
|
| GrPoint pts[4];
|
| @@ -314,8 +314,8 @@ bool GrDefaultPathRenderer::createGeom(const SkPath& path,
|
| first = false;
|
| }
|
| FINISHED:
|
| - GrAssert((vert - base) <= maxPts);
|
| - GrAssert((idx - idxBase) <= maxIdxs);
|
| + SkASSERT((vert - base) <= maxPts);
|
| + SkASSERT((idx - idxBase) <= maxIdxs);
|
|
|
| *vertexCnt = vert - base;
|
| *indexCnt = idx - idxBase;
|
| @@ -348,12 +348,12 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
|
| return false;
|
| }
|
|
|
| - GrAssert(NULL != target);
|
| + SkASSERT(NULL != target);
|
| GrDrawTarget::AutoStateRestore asr(target, GrDrawTarget::kPreserve_ASRInit);
|
| GrDrawState* drawState = target->drawState();
|
| bool colorWritesWereDisabled = drawState->isColorWriteDisabled();
|
| // face culling doesn't make sense here
|
| - GrAssert(GrDrawState::kBoth_DrawFace == drawState->getDrawFace());
|
| + SkASSERT(GrDrawState::kBoth_DrawFace == drawState->getDrawFace());
|
|
|
| int passCount = 0;
|
| const GrStencilSettings* passes[3];
|
| @@ -441,7 +441,7 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
|
| }
|
| break;
|
| default:
|
| - GrAssert(!"Unknown path fFill!");
|
| + SkASSERT(!"Unknown path fFill!");
|
| return false;
|
| }
|
| }
|
| @@ -463,7 +463,7 @@ bool GrDefaultPathRenderer::internalDrawPath(const SkPath& path,
|
| SkRect bounds;
|
| GrDrawState::AutoViewMatrixRestore avmr;
|
| if (reverse) {
|
| - GrAssert(NULL != drawState->getRenderTarget());
|
| + SkASSERT(NULL != drawState->getRenderTarget());
|
| // draw over the dev bounds (which will be the whole dst surface for inv fill).
|
| bounds = devBounds;
|
| SkMatrix vmi;
|
| @@ -515,7 +515,7 @@ bool GrDefaultPathRenderer::onDrawPath(const SkPath& path,
|
| void GrDefaultPathRenderer::onStencilPath(const SkPath& path,
|
| const SkStrokeRec& stroke,
|
| GrDrawTarget* target) {
|
| - GrAssert(SkPath::kInverseEvenOdd_FillType != path.getFillType());
|
| - GrAssert(SkPath::kInverseWinding_FillType != path.getFillType());
|
| + SkASSERT(SkPath::kInverseEvenOdd_FillType != path.getFillType());
|
| + SkASSERT(SkPath::kInverseWinding_FillType != path.getFillType());
|
| this->internalDrawPath(path, stroke, target, true);
|
| }
|
|
|