commit 7c3fa4e059835fbc9dfe59d367dfd9cfde3e73a8
author John Stiles <johnstiles@google.com> Tue Aug 10 17:00:56 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Wed Aug 11 00:15:48 2021 +0000
tree ee808f976357bf43f2ce973f86442a1b25bc2928
parent 14f8d795d3504389d4a3b357a5e94300ad2d82e4

Fix cases of variable shadowing in /src/gpu.

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

Change-Id: I3ad3c603f97e398382202d11c159d25cca0a7b9f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/438317
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/GrSoftwarePathRenderer.cpp

diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index b32dbe5..ec47bc3 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -315,10 +315,9 @@
         args.fShape->writeUnstyledKey(&builder[7]);
     }
 
-    sk_sp<GrTextureProxy> proxy;
     GrSurfaceProxyView view;
     if (useCache) {
-        auto proxy = fProxyProvider->findOrCreateProxyByUniqueKey(maskKey);
+        sk_sp<GrTextureProxy> proxy = fProxyProvider->findOrCreateProxyByUniqueKey(maskKey);
         if (proxy) {
             GrSwizzle swizzle = args.fSurfaceDrawContext->caps()->getReadSwizzle(
                     proxy->backendFormat(), GrColorType::kAlpha_8);