Remove SkBenchmark::postDraw.

bench/PathBench.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkBenchmark.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 321 matching lines @@
     virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         for (int i = 0; i < loops; ++i) {
             if (i % 1000 == 0) {
                 fPath.reset();  // PathRef memory can grow without bound otherwise.
             }
             this->makePath(&fPath);
         }
         this->restartMakingPaths();
     }
 
-    virtual void onPostDraw() SK_OVERRIDE {
-        this->finishedMakingPaths();
-    }
-
 private:
     SkPath fPath;
 
     typedef RandomPathBench INHERITED;
 };
 
 class PathCopyBench : public RandomPathBench {
 public:
     PathCopyBench()  {
     }
@@ skipping 10 matching lines @@
             this->makePath(&fPaths[i]);
         }
         this->finishedMakingPaths();
     }
     virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         for (int i = 0; i < loops; ++i) {
             int idx = i & (kPathCnt - 1);
             fCopies[idx] = fPaths[idx];
         }
     }
-    virtual void onPostDraw() SK_OVERRIDE {
-        fPaths.reset(0);
-        fCopies.reset(0);
-    }
 
 private:
     enum {
         // must be a pow 2
         kPathCnt = 1 << 5,
     };
     SkAutoTArray<SkPath> fPaths;
     SkAutoTArray<SkPath> fCopies;
 
     typedef RandomPathBench INHERITED;
@@ skipping 27 matching lines @@
                 fPaths[i & (kPathCnt - 1)].transform(fMatrix);
             }
         } else {
             for (int i = 0; i < loops; ++i) {
                 int idx = i & (kPathCnt - 1);
                 fPaths[idx].transform(fMatrix, &fTransformed[idx]);
             }
         }
     }
 
-    virtual void onPostDraw() SK_OVERRIDE {
-        fPaths.reset(0);
-        fTransformed.reset(0);
-    }
-
 private:
     enum {
         // must be a pow 2
         kPathCnt = 1 << 5,
     };
     SkAutoTArray<SkPath> fPaths;
     SkAutoTArray<SkPath> fTransformed;
 
     SkMatrix fMatrix;
     bool fInPlace;
@@ skipping 21 matching lines @@
         this->finishedMakingPaths();
     }
 
     virtual void onDraw(const int loops, SkCanvas*) SK_OVERRIDE {
         for (int i = 0; i < loops; ++i) {
             int idx = i & (kPathCnt - 1);
             fParity ^= (fPaths[idx] == fCopies[idx & ~0x1]);
         }
     }
 
-    virtual void onPostDraw() SK_OVERRIDE {
-        fPaths.reset(0);
-        fCopies.reset(0);
-    }
-
 private:
     bool fParity; // attempt to keep compiler from optimizing out the ==
     enum {
         // must be a pow 2
         kPathCnt = 1 << 5,
     };
     SkAutoTArray<SkPath> fPaths;
     SkAutoTArray<SkPath> fCopies;
     typedef RandomPathBench INHERITED;
 };
@@ skipping 77 matching lines @@
             case kReversePathTo_AddType:
                 for (int i = 0; i < loops; ++i) {
                     int idx = i & (kPathCnt - 1);
                     SkPath result = fPaths0[idx];
                     result.reversePathTo(fPaths1[idx]);
                 }
                 break;
         }
     }
 
-    virtual void onPostDraw() SK_OVERRIDE {
-        fPaths0.reset(0);
-        fPaths1.reset(0);
-    }
-
 private:
     AddType fType; // or reverseAddPath
     enum {
         // must be a pow 2
         kPathCnt = 1 << 5,
     };
     SkAutoTArray<SkPath> fPaths0;
     SkAutoTArray<SkPath> fPaths1;
     SkMatrix         fMatrix;
     typedef RandomPathBench INHERITED;
@@ skipping 211 matching lines @@
             SkPoint xy;
             size.fWidth = rand.nextRangeScalar(kQueryMin.fWidth,  kQueryMax.fWidth);
             size.fHeight = rand.nextRangeScalar(kQueryMin.fHeight, kQueryMax.fHeight);
             xy.fX = rand.nextRangeScalar(kBounds.fLeft, kBounds.fRight - size.fWidth);
             xy.fY = rand.nextRangeScalar(kBounds.fTop, kBounds.fBottom - size.fHeight);
 
             fQueryRects[i] = SkRect::MakeXYWH(xy.fX, xy.fY, size.fWidth, size.fHeight);
         }
     }
 
-    virtual void onPostDraw() SK_OVERRIDE {
-        fQueryRects.setCount(0);
-    }
-
     enum {
         kQueryRectCnt = 400,
     };
     static const SkRect kBounds;   // bounds for all random query rects
     static const SkSize kQueryMin; // minimum query rect size, should be <= kQueryMax
     static const SkSize kQueryMax; // max query rect size, should < kBounds
     static const SkRect kBaseRect; // rect that is used to construct the path
     static const SkScalar kRRRadii[2]; // x and y radii for round rect
 
     SkString            fName;
@@ skipping 212 matching lines @@
 DEF_BENCH( return new ArbRoundRectBench(true); )
 DEF_BENCH( return new ConservativelyContainsBench(ConservativelyContainsBench::kRect_Type); )
 DEF_BENCH( return new ConservativelyContainsBench(ConservativelyContainsBench::kRoundRect_Type); )
 DEF_BENCH( return new ConservativelyContainsBench(ConservativelyContainsBench::kOval_Type); )
 
 DEF_BENCH( return new ConicBench_Chop5() )
 DEF_BENCH( return new ConicBench_ChopHalf() )
 DEF_BENCH( return new ConicBench_ComputeError() )
 DEF_BENCH( return new ConicBench_asQuadTol() )
 DEF_BENCH( return new ConicBench_quadPow2() )