small tidy of benchmarkstream

tools/VisualBench/CpuWrappedBenchmark.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 
 #ifndef CpuWrappedBenchmark_DEFINED
 #define CpuWrappedBenchmark_DEFINED
 
 #include "Benchmark.h"
 #include "SkSurface.h"
 
 class CpuWrappedBenchmark : public Benchmark {
 public:
     // Takes ownership of caller's ref on `bench`.
     explicit CpuWrappedBenchmark(Benchmark* bench) : fBench(bench) {}
 
     const char* onGetName()       override { return fBench->getName(); }
     const char* onGetUniqueName() override { return fBench->getUniqueName(); }
 
+    void onDelayedSetup() override { fBench->delayedSetup(); }
+    void onPerCanvasPreDraw(SkCanvas* canvas) override { fBench->perCanvasPreDraw(canvas); }
+    void onPreDraw(SkCanvas* canvas) override { fBench->preDraw(canvas); }
+    void onPostDraw(SkCanvas* canvas) override { fBench->postDraw(canvas); }
+    void onPerCanvasPostDraw(SkCanvas* canvas) override { fBench->perCanvasPostDraw(canvas); }
+
     void onDraw(int loops, SkCanvas* canvas) override {
         // TODO: use onPreDraw() to move offscreen allocation/deallocation out of timing.
         SkAutoTUnref<SkSurface> offscreen(SkSurface::NewRaster(canvas->imageInfo()));
 
         fBench->draw(loops, offscreen->getCanvas());
         SkAutoTUnref<SkImage> image(offscreen->newImageSnapshot());
         canvas->drawImage(image, 0,0);
     }
 
+    virtual SkIPoint onGetSize() override { return fBench->getSize(); }
+
 private:
     SkAutoTUnref<Benchmark> fBench;
 };
 
 #endif//CpuWrappedBenchmark_DEFINED