diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-01-23 20:33:21 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-23 20:33:30 +0000 |
| commit | ea26d6b81606a52eb2d8e3cb7007ece2c298b53c (patch) | |
| tree | 30626025b33f00bed0133c121c621adf13ea4a89 /src/gpu/GrRenderTargetContext.h | |
| parent | 574b06f7038f32680919b72ca7a3ef95584184db (diff) | |
Revert "Revert "Revert "Use GrOvalOpFactory ops to draw non-AA rrects, ovals, and arcs."""
This reverts commit b4e965c103c3140f0072949343befb34bceadc96.
Reason for revert: Thin stroke problems, chrome pixel test, g3 clang-tidy
Original change's description:
> Revert "Revert "Use GrOvalOpFactory ops to draw non-AA rrects, ovals, and arcs.""
>
> This reverts commit befff6580e9dc6b15bc6db3cc3f5fff22185cba8.
>
> Bug: skia:
> Change-Id: Ia108408cd986c03783af5058845790f6b17201f4
> Reviewed-on: https://skia-review.googlesource.com/98703
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com
Change-Id: I785af7efdfc39680052f5721a55ecffbeaf1f0ad
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/98785
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrRenderTargetContext.h')
| -rw-r--r-- | src/gpu/GrRenderTargetContext.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/GrRenderTargetContext.h index bc1e69d0a0..6e0c6745fd 100644 --- a/src/gpu/GrRenderTargetContext.h +++ b/src/gpu/GrRenderTargetContext.h @@ -385,12 +385,8 @@ protected: private: class TextTarget; - GrAAType chooseAAType( - GrAA aa, GrAllowMixedSamples allowMixedSamples, - GrAllowNonAABinaryCoverage allowNonAABinaryCoverage = GrAllowNonAABinaryCoverage::kNo, - const GrPaint* paint = nullptr) { - return GrChooseAAType(aa, this->fsaaType(), allowMixedSamples, allowNonAABinaryCoverage, - paint, *this->caps()); + inline GrAAType chooseAAType(GrAA aa, GrAllowMixedSamples allowMixedSamples) { + return GrChooseAAType(aa, this->fsaaType(), allowMixedSamples, *this->caps()); } friend class GrAtlasTextBlob; // for access to add[Mesh]DrawOp |