From 10cae83e4bb726610b93276e17815c5d52d73395 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Tue, 22 Sep 2015 12:50:33 -0700 Subject: Move determiniation of strokerect rects internal BUG=skia: Review URL: https://codereview.chromium.org/1345853005 --- src/gpu/batches/GrRectBatchFactory.cpp | 64 ---------------------------------- 1 file changed, 64 deletions(-) (limited to 'src/gpu/batches/GrRectBatchFactory.cpp') diff --git a/src/gpu/batches/GrRectBatchFactory.cpp b/src/gpu/batches/GrRectBatchFactory.cpp index f34a8c058a..f144d1b532 100644 --- a/src/gpu/batches/GrRectBatchFactory.cpp +++ b/src/gpu/batches/GrRectBatchFactory.cpp @@ -13,70 +13,6 @@ namespace GrRectBatchFactory { -GrDrawBatch* CreateAAStroke(GrColor color, - const SkMatrix& viewMatrix, - const SkRect& rect, - const SkRect& devRect, - const SkStrokeRec& stroke) { - SkVector devStrokeSize; - SkScalar width = stroke.getWidth(); - if (width > 0) { - devStrokeSize.set(width, width); - viewMatrix.mapVectors(&devStrokeSize, 1); - devStrokeSize.setAbs(devStrokeSize); - } else { - devStrokeSize.set(SK_Scalar1, SK_Scalar1); - } - - const SkScalar dx = devStrokeSize.fX; - const SkScalar dy = devStrokeSize.fY; - const SkScalar rx = SkScalarMul(dx, SK_ScalarHalf); - const SkScalar ry = SkScalarMul(dy, SK_ScalarHalf); - - SkRect devOutside(devRect); - devOutside.outset(rx, ry); - - bool miterStroke = true; - // For hairlines, make bevel and round joins appear the same as mitered ones. - // small miter limit means right angles show bevel... - if ((width > 0) && (stroke.getJoin() != SkPaint::kMiter_Join || - stroke.getMiter() < SK_ScalarSqrt2)) { - miterStroke = false; - } - - SkRect devInside(devRect); - devInside.inset(rx, ry); - - // If we have a degenerate stroking rect(ie the stroke is larger than inner rect) then we - // make a degenerate inside rect to avoid double hitting. We will also jam all of the points - // together when we render these rects. - SkScalar spare; - { - SkScalar w = devRect.width() - dx; - SkScalar h = devRect.height() - dy; - spare = SkTMin(w, h); - } - - bool degenerate = spare <= 0; - if (degenerate) { - devInside.fLeft = devInside.fRight = devRect.centerX(); - devInside.fTop = devInside.fBottom = devRect.centerY(); - } - - SkRect devOutsideAssist(devRect); - - // For bevel-stroke, use 2 SkRect instances(devOutside and devOutsideAssist) - // to draw the outer of the rect. Because there are 8 vertices on the outer - // edge, while vertex number of inner edge is 4, the same as miter-stroke. - if (!miterStroke) { - devOutside.inset(0, ry); - devOutsideAssist.outset(0, ry); - } - - return GrAAStrokeRectBatch::Create(color, viewMatrix, devOutside, devOutsideAssist, devInside, - miterStroke, degenerate); -} - GrDrawBatch* CreateAAFillNestedRects(GrColor color, const SkMatrix& viewMatrix, const SkRect rects[2]) { -- cgit v1.2.3