commit 43e73df990cfb7edf7df9639689dabc44b4fadad
author Chris Dalton <csmartdalton@google.com> Wed Mar 10 19:48:29 2021 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Mar 11 17:15:00 2021 +0000
tree 5148b2593d0b399fa00121451800194e75dbdfdf
parent 317e5887a27e583d0e027b5577a4dd9184648ee5

Remove GrAAType from GrFillRRectOp

Replaces it with GrAA. This op always uses analytic coverage,
regardless of MSAA state.

Bug: skia:11396
Change-Id: I75174a00bdb3b1f62319de5970aac7f1bbae8e10
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/383418
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrSurfaceDrawContext.cpp

diff --git a/src/gpu/GrSurfaceDrawContext.cpp b/src/gpu/GrSurfaceDrawContext.cpp
index 7556d15..6aa0667 100644
--- a/src/gpu/GrSurfaceDrawContext.cpp
+++ b/src/gpu/GrSurfaceDrawContext.cpp
@@ -937,7 +937,7 @@
     }
     if (!op && style.isSimpleFill()) {
         assert_alive(paint);
-        op = GrFillRRectOp::Make(fContext, std::move(paint), viewMatrix, rrect, aaType);
+        op = GrFillRRectOp::Make(fContext, std::move(paint), viewMatrix, rrect, aa);
     }
     if (!op && GrAAType::kCoverage == aaType) {
         assert_alive(paint);
@@ -1363,7 +1363,7 @@
         // ovals the exact same way we do round rects.
         assert_alive(paint);
         op = GrFillRRectOp::Make(fContext, std::move(paint), viewMatrix, SkRRect::MakeOval(oval),
-                                 aaType);
+                                 aa);
     }
     if (!op && GrAAType::kCoverage == aaType) {
         assert_alive(paint);