Revert of Add MultiPictureDraw to nanobench (patchset #7 id:120001 of https://codereview.chromium.org/731973005/)

Reason for revert:
Needs more work

Original issue's description:
> Add MultiPictureDraw to nanobench
>
> I would like some guard against performance regressions on our side before turning layer hoisting on in Chromium.
>
> TBR=bsalomon@google.com
>
> Committed: https://skia.googlesource.com/skia/+/0ddad31012dabfc1267effc8071d37f7d606efbe

TBR=mtklein@google.com,bsalomon@google.com
NOTREECHECKS=true
NOTRY=true

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

1 files changed, 0 insertions, 7 deletions

diff --git a/bench/Benchmark.h b/bench/Benchmark.h
index c30167e572..508d1da694 100644
--- a/bench/Benchmark.h
+++ b/bench/Benchmark.h
@@ -70,11 +70,6 @@ public:
     // before the initial draw.
     void preDraw();
 
-    // Called once before and after a series of draw calls to a single canvas.
-    // The setup/break down in these calls is not timed.
-    void perCanvasPreDraw(SkCanvas*);
-    void perCanvasPostDraw(SkCanvas*);
-
     // Bench framework can tune loops to be large enough for stable timing.
     void draw(const int loops, SkCanvas*);
 
@@ -106,8 +101,6 @@ protected:
     virtual const char* onGetName() = 0;
     virtual const char* onGetUniqueName() { return this->onGetName(); }
     virtual void onPreDraw() {}
-    virtual void onPerCanvasPreDraw(SkCanvas*) {}
-    virtual void onPerCanvasPostDraw(SkCanvas*) {}
     // Each bench should do its main work in a loop like this:
     //   for (int i = 0; i < loops; i++) { <work here> }
     virtual void onDraw(const int loops, SkCanvas*) = 0;