commit acf71645878e6a64f8b4d3d9d904aefe4bd87207
author John Stiles <johnstiles@google.com> Thu Aug 12 22:33:57 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri Aug 13 03:35:15 2021 +0000
tree 9efa9ed0a24723033f3fdf9ad1d9c15a4a23e213
parent ab005016f9aa852916cb0f548d8af2ce81dd598d

Fix cases of variable shadowing in /gm/.

If we manage to fix all the existing cases of variable shadowing, we
could enable -Wshadow.

Change-Id: I905459bf0bbaa205da7dc59e1910e345bed2af51
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438538
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

gm/drawbitmaprect.cpp

diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp
index e7f4f21..d160274 100644
--- a/gm/drawbitmaprect.cpp
+++ b/gm/drawbitmaprect.cpp
@@ -184,9 +184,10 @@
 
         const int kPadX = 30;
         const int kPadY = 40;
-        SkPaint paint;
-        paint.setAlphaf(0.125f);
-        canvas->drawImageRect(fImage, SkRect::MakeIWH(gSize, gSize), SkSamplingOptions(), &paint);
+        SkPaint alphaPaint;
+        alphaPaint.setAlphaf(0.125f);
+        canvas->drawImageRect(fImage, SkRect::MakeIWH(gSize, gSize), SkSamplingOptions(),
+                              &alphaPaint);
         canvas->translate(SK_Scalar1 * kPadX / 2,
                           SK_Scalar1 * kPadY / 2);
         SkPaint blackPaint;
@@ -237,16 +238,16 @@
             // test the following code path:
             // SkGpuDevice::drawPath() -> SkGpuDevice::drawWithMaskFilter()
             SkIRect srcRect;
-            SkPaint paint;
+            SkPaint maskPaint;
             SkBitmap bm = make_chessbm(5, 5);
 
             srcRect.setXYWH(1, 1, 3, 3);
-            paint.setMaskFilter(SkMaskFilter::MakeBlur(
+            maskPaint.setMaskFilter(SkMaskFilter::MakeBlur(
                 kNormal_SkBlurStyle,
                 SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(5))));
 
             fProc(canvas, bm.asImage().get(), bm, srcRect, dstRect,
-                  SkSamplingOptions(SkFilterMode::kLinear), &paint);
+                  SkSamplingOptions(SkFilterMode::kLinear), &maskPaint);
         }
     }