commit 35186b5db595e85985df8611810ab54a99b0f835
author Brian Salomon <bsalomon@google.com> Fri Jun 16 09:57:06 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 16 15:10:44 2017 +0000
tree 717f072b37de1aa8b2fecc635b3d1d81d37c0d41
parent f86d37be5b539e8b318d4449713e13f2cfc94da8

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 <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/ops/GrAAFillRectOp.cpp

diff --git a/src/gpu/ops/GrAAFillRectOp.cpp b/src/gpu/ops/GrAAFillRectOp.cpp
index 30023f3..9d328c9 100644
--- a/src/gpu/ops/GrAAFillRectOp.cpp
+++ b/src/gpu/ops/GrAAFillRectOp.cpp
@@ -361,14 +361,6 @@
     return AAFillRectOp::Make(std::move(paint), viewMatrix, rect, devRect, nullptr, stencil);
 }
 
-std::unique_ptr<GrDrawOp> 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<GrDrawOp> MakeAAFillWithLocalMatrix(GrPaint&& paint, const SkMatrix& viewMatrix,
                                                     const SkMatrix& localMatrix,
                                                     const SkRect& rect) {

src/gpu/ops/GrAAStrokeRectOp.cpp

diff --git a/src/gpu/ops/GrAAStrokeRectOp.cpp b/src/gpu/ops/GrAAStrokeRectOp.cpp
index 662ce66..e3e2b23 100644
--- a/src/gpu/ops/GrAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrAAStrokeRectOp.cpp
@@ -582,7 +582,7 @@
         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);

src/gpu/ops/GrRectOpFactory.h

diff --git a/src/gpu/ops/GrRectOpFactory.h b/src/gpu/ops/GrRectOpFactory.h
index cf3da2f..e662ab1 100644
--- a/src/gpu/ops/GrRectOpFactory.h
+++ b/src/gpu/ops/GrRectOpFactory.h
@@ -31,10 +31,6 @@
 std::unique_ptr<GrDrawOp> 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<GrDrawOp> MakeAAFillWithDevRect(GrPaint&&, const SkMatrix& viewMatrix,
-                                                const SkRect& rect, const SkRect& devRect);
-
 std::unique_ptr<GrDrawOp> MakeAAFillWithLocalMatrix(GrPaint&&, const SkMatrix& viewMatrix,
                                                     const SkMatrix& localMatrix, const SkRect&);