Fix -Wshadow-field warnings

BUG=skia:

Change-Id: I44f1e11787eab88bdc5ed25c34ea802e9001d427
Reviewed-on: https://skia-review.googlesource.com/9083
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

1 files changed, 4 insertions, 8 deletions

diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp
index 48764cabdf..38a78dfce5 100644
--- a/bench/RectBench.cpp
+++ b/bench/RectBench.cpp
@@ -29,7 +29,6 @@ public:
         : fShift(shift)
         , fStroke(stroke) {}
 
-    SkString fName;
     const char* computeName(const char root[]) {
         fName.printf("%s_%d", root, fShift);
         if (fStroke > 0) {
@@ -41,6 +40,8 @@ public:
     bool isVisual() override { return true; }
 
 protected:
+    SkString fName;
+
     virtual void drawThisRect(SkCanvas* c, const SkRect& r, const SkPaint& p) {
         c->drawRect(r, p);
     }
@@ -103,7 +104,6 @@ protected:
     }
 
 private:
-    SkString    fName;
     SkBlendMode fMode;
 
     typedef RectBench INHERITED;
@@ -127,8 +127,6 @@ protected:
     }
 
 private:
-    SkString fName;
-
     typedef RectBench INHERITED;
 };
 
@@ -156,7 +154,6 @@ protected:
 class PointsBench : public RectBench {
 public:
     SkCanvas::PointMode fMode;
-    const char* fName;
 
     PointsBench(SkCanvas::PointMode mode, const char* name)
         : RectBench(2)
@@ -188,7 +185,7 @@ protected:
             }
         }
     }
-    const char* onGetName() override { return fName; }
+    const char* onGetName() override { return fName.c_str(); }
 };
 
 /*******************************************************************************
@@ -204,7 +201,6 @@ public:
         KMaskShader
     };
     SkCanvas::PointMode fMode;
-    const char* fName;
 
     BlitMaskBench(SkCanvas::PointMode mode,
                   BlitMaskBench::kMaskType type, const char* name) :
@@ -262,7 +258,7 @@ protected:
            }
         }
     }
-    const char* onGetName() override { return fName; }
+    const char* onGetName() override { return fName.c_str(); }
 private:
     typedef RectBench INHERITED;
     kMaskType _type;