From 35186b5db595e85985df8611810ab54a99b0f835 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Fri, 16 Jun 2017 09:57:06 -0400 Subject: [PATCH] Remove GrRectOpFactory::MakeAAFillWithDevRect This was only used in a rare case. Change-Id: I69aaca40ce6529a492311fa0893a85adcc08aa4d Reviewed-on: https://skia-review.googlesource.com/20143 Reviewed-by: Robert Phillips Commit-Queue: Brian Salomon --- src/gpu/ops/GrAAFillRectOp.cpp | 8 -------- src/gpu/ops/GrAAStrokeRectOp.cpp | 2 +- src/gpu/ops/GrRectOpFactory.h | 4 ---- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/gpu/ops/GrAAFillRectOp.cpp b/src/gpu/ops/GrAAFillRectOp.cpp index 30023f3e99..9d328c92f2 100644 --- a/src/gpu/ops/GrAAFillRectOp.cpp +++ b/src/gpu/ops/GrAAFillRectOp.cpp @@ -361,14 +361,6 @@ std::unique_ptr MakeAAFill(GrPaint&& paint, const SkMatrix& viewMatrix return AAFillRectOp::Make(std::move(paint), viewMatrix, rect, devRect, nullptr, stencil); } -std::unique_ptr MakeAAFillWithDevRect(GrPaint&& paint, const SkMatrix& viewMatrix, - const SkRect& rect, const SkRect& devRect) { - if (!view_matrix_ok_for_aa_fill_rect(viewMatrix)) { - return nullptr; - } - return AAFillRectOp::Make(std::move(paint), viewMatrix, rect, devRect, nullptr, nullptr); -} - std::unique_ptr MakeAAFillWithLocalMatrix(GrPaint&& paint, const SkMatrix& viewMatrix, const SkMatrix& localMatrix, const SkRect& rect) { diff --git a/src/gpu/ops/GrAAStrokeRectOp.cpp b/src/gpu/ops/GrAAStrokeRectOp.cpp index 662ce669fd..e3e2b23b37 100644 --- a/src/gpu/ops/GrAAStrokeRectOp.cpp +++ b/src/gpu/ops/GrAAStrokeRectOp.cpp @@ -582,7 +582,7 @@ std::unique_ptr MakeAAFillNestedRects(GrPaint&& paint, if (devOutside.isEmpty()) { return nullptr; } - return MakeAAFillWithDevRect(std::move(paint), viewMatrix, rects[0], devOutside); + return MakeAAFill(std::move(paint), viewMatrix, rects[0]); } return AAStrokeRectOp::Make(std::move(paint), viewMatrix, devOutside, devInside); diff --git a/src/gpu/ops/GrRectOpFactory.h b/src/gpu/ops/GrRectOpFactory.h index cf3da2f8bd..e662ab108a 100644 --- a/src/gpu/ops/GrRectOpFactory.h +++ b/src/gpu/ops/GrRectOpFactory.h @@ -31,10 +31,6 @@ namespace GrRectOpFactory { std::unique_ptr MakeAAFill(GrPaint&&, const SkMatrix&, const SkRect&, const GrUserStencilSettings* = nullptr); -// Using this method to supply a device rect simply saves recalculation if the device rect is known. -std::unique_ptr MakeAAFillWithDevRect(GrPaint&&, const SkMatrix& viewMatrix, - const SkRect& rect, const SkRect& devRect); - std::unique_ptr MakeAAFillWithLocalMatrix(GrPaint&&, const SkMatrix& viewMatrix, const SkMatrix& localMatrix, const SkRect&);