commit 2185901ceddef0ddda22e404f0f9bb7ea94aadc0
author Chris Dalton <csmartdalton@google.com> Fri Jan 29 23:44:53 2021 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Feb 02 04:06:12 2021 +0000
tree f8a7db7e4f7fc0c92f98e0a5dcd9d0bab08ce93b
parent 0879da015f3b95f44bf174943da1852422c1fa4e

Make GrShape an r-value in drawShape calls

Bug: chromium:1172543
Change-Id: I1f9c06c96e9ec41098fe27d7cdf3438055c8feb4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362797
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>

src/gpu/GrBlurUtils.cpp

diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index 3ff9b12..894a75c 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -214,7 +214,7 @@
     // maskPaint.
     SkMatrix viewMatrix = origViewMatrix;
     viewMatrix.postTranslate(-SkIntToScalar(maskRect.fLeft), -SkIntToScalar(maskRect.fTop));
-    rtContext->drawShape(&clip, std::move(maskPaint), GrAA::kYes, viewMatrix, shape);
+    rtContext->drawShape(&clip, std::move(maskPaint), GrAA::kYes, viewMatrix, GrStyledShape(shape));
     return rtContext;
 }
 
@@ -572,6 +572,7 @@
                                     viewMatrix, mf, shape);
     } else {
         GrAA aa = GrAA(paint.isAntiAlias());
-        surfaceDrawContext->drawShape(clip, std::move(grPaint), aa, viewMatrix, shape);
+        surfaceDrawContext->drawShape(clip, std::move(grPaint), aa, viewMatrix,
+                                      GrStyledShape(shape));
     }
 }