AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove GrRectOpFactory::MakeAAFillWithDevRect

Browse Source 
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>
This commit is contained in:
Brian Salomon 2017-06-16 09:57:06 -04:00 committed by Skia Commit-Bot
parent f86d37be5b
commit 35186b5db5
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gpu/ops/GrAAFillRectOp.cpp
View File

@ -361,14 +361,6 @@ std::unique_ptr<GrDrawOp> MakeAAFill(GrPaint&& paint, const SkMatrix& viewMatrix
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) {

2
src/gpu/ops/GrAAStrokeRectOp.cpp
View File

@ -582,7 +582,7 @@ std::unique_ptr<GrDrawOp> 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);

4
src/gpu/ops/GrRectOpFactory.h
View File

@ -31,10 +31,6 @@ namespace GrRectOpFactory {
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&);