Fix more clang errors.

Fixed -Wunused-private-field errors.

R=reed@google.com,bsalomon@google.com

Review URL: https://codereview.chromium.org/13474012

git-svn-id: http://skia.googlecode.com/svn/trunk@8547 2bbb7eff-a529-9590-31e7-b0007b416f81

5 files changed, 12 insertions, 15 deletions

diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp
index d1a7dd29e5..cae5622414 100644
--- a/bench/MatrixBench.cpp
+++ b/bench/MatrixBench.cpp
@@ -266,12 +266,12 @@ private:
 
 class ScaleTransMixedMatrixBench : public MatrixBench {
  public:
-    ScaleTransMixedMatrixBench(void* p) : INHERITED(p, "scaletrans_mixed"), fCount (16) {
+    ScaleTransMixedMatrixBench(void* p) : INHERITED(p, "scaletrans_mixed") {
         fMatrix.setAll(fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1(),
                        fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1(),
                        fRandom.nextSScalar1(), fRandom.nextSScalar1(), fRandom.nextSScalar1());
         int i;
-        for (i = 0; i < SkBENCHLOOP(fCount); i++) {
+        for (i = 0; i < kCount; i++) {
             fSrc[i].fX = fRandom.nextSScalar1();
             fSrc[i].fY = fRandom.nextSScalar1();
             fDst[i].fX = fRandom.nextSScalar1();
@@ -282,7 +282,7 @@ class ScaleTransMixedMatrixBench : public MatrixBench {
     virtual void performTest() {
         SkPoint* dst = fDst;
         const SkPoint* src = fSrc;
-        int count = SkBENCHLOOP(fCount);
+        int count = kCount;
         float mx = fMatrix[SkMatrix::kMScaleX];
         float my = fMatrix[SkMatrix::kMScaleY];
         float tx = fMatrix[SkMatrix::kMTransX];
@@ -295,20 +295,22 @@ class ScaleTransMixedMatrixBench : public MatrixBench {
         } while (--count);
     }
  private:
+    enum {
+        kCount = SkBENCHLOOP(16)
+    };
     SkMatrix fMatrix;
     SkPoint fSrc [16];
     SkPoint fDst [16];
-    int fCount;
     SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };
 
 class ScaleTransDoubleMatrixBench : public MatrixBench {
  public:
-    ScaleTransDoubleMatrixBench(void* p) : INHERITED(p, "scaletrans_double"), fCount (16) {
+    ScaleTransDoubleMatrixBench(void* p) : INHERITED(p, "scaletrans_double") {
         init9(fMatrix);
         int i;
-        for (i = 0; i < SkBENCHLOOP(fCount); i++) {
+        for (i = 0; i < kCount; i++) {
             fSrc[i].fX = fRandom.nextSScalar1();
             fSrc[i].fY = fRandom.nextSScalar1();
             fDst[i].fX = fRandom.nextSScalar1();
@@ -319,7 +321,7 @@ class ScaleTransDoubleMatrixBench : public MatrixBench {
     virtual void performTest() {
         SkPoint* dst = fDst;
         const SkPoint* src = fSrc;
-        int count = SkBENCHLOOP(fCount);
+        int count = kCount;
         // As doubles, on Z600 Linux systems this is 2.5x as expensive as mixed mode
         float mx = (float) fMatrix[SkMatrix::kMScaleX];
         float my = (float) fMatrix[SkMatrix::kMScaleY];
@@ -333,10 +335,12 @@ class ScaleTransDoubleMatrixBench : public MatrixBench {
         } while (--count);
     }
  private:
+    enum {
+        kCount = SkBENCHLOOP(16)
+    };
     double fMatrix [9];
     SkPoint fSrc [16];
     SkPoint fDst [16];
-    int fCount;
     SkRandom fRandom;
     typedef MatrixBench INHERITED;
 };
diff --git a/bench/MatrixConvolutionBench.cpp b/bench/MatrixConvolutionBench.cpp
index dfa05dbd35..161fc23296 100644
--- a/bench/MatrixConvolutionBench.cpp
+++ b/bench/MatrixConvolutionBench.cpp
@@ -12,8 +12,6 @@
 #include "SkMatrixConvolutionImageFilter.h"
 
 class MatrixConvolutionBench : public SkBenchmark {
-    SkMatrixConvolutionImageFilter::TileMode  fTileMode;
-
 public:
     MatrixConvolutionBench(void* param, SkMatrixConvolutionImageFilter::TileMode tileMode, bool convolveAlpha)
         : INHERITED(param), fName("matrixconvolution") {
diff --git a/bench/VertBench.cpp b/bench/VertBench.cpp
index e5053d9805..5456e28825 100644
--- a/bench/VertBench.cpp
+++ b/bench/VertBench.cpp
@@ -31,7 +31,6 @@ class VertBench : public SkBenchmark {
 
     SkPoint fPts[PTS];
     SkColor fColors[PTS];
-    SkPoint fTex[PTS];
     uint16_t fIdx[IDX];
 
     static void load_2_tris(uint16_t idx[], int x, int y, int rb) {
diff --git a/include/pdf/SkPDFDocument.h b/include/pdf/SkPDFDocument.h
index 8f4ee48564..664b3030a2 100644
--- a/include/pdf/SkPDFDocument.h
+++ b/include/pdf/SkPDFDocument.h
@@ -83,7 +83,6 @@ private:
     SkTSet<SkPDFObject*>* fFirstPageResources;
     SkTSet<SkPDFObject*>* fOtherPageResources;
     SkTDArray<SkPDFObject*> fSubstitutes;
-    int fSecondPageFirstResourceIndex;
 
     SkPDFDict* fTrailerDict;
 
diff --git a/samplecode/SampleMovie.cpp b/samplecode/SampleMovie.cpp
index 560151cb44..5928f92ae7 100644
--- a/samplecode/SampleMovie.cpp
+++ b/samplecode/SampleMovie.cpp
@@ -53,10 +53,7 @@ protected:
     }
 
 private:
-    SkRect      fClip;
-    SkIPoint*   fPoints;
     SkPath      fPath;
-    int         fPtCount;
 
     typedef SkView INHERITED;
 };