Fix for nexus 5 crashing in GL benches

bench/GLBench.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 GLBench_DEFINED
 #define GLBench_DEFINED
 
@@ skipping 11 matching lines @@
  * A virtual base class for microbenches which want to specifically test the performance of GL
  */
 
 class GLBench : public Benchmark {
 public:
     GLBench() {}
 
 protected:
     const GrGLContext* getGLContext(SkCanvas*);
     virtual const GrGLContext* onGetGLContext(const GrGLContext* ctx) { return ctx; }
-    void onPerCanvasPreDraw(SkCanvas* canvas) override;
+    void onPreDraw(SkCanvas*) override;
     virtual void setup(const GrGLContext*)=0;
-    void onPerCanvasPostDraw(SkCanvas* canvas) override;
+    void onPostDraw(SkCanvas* canvas) override;
     virtual void teardown(const GrGLInterface*)=0;
     void onDraw(const int loops, SkCanvas*) override;
     virtual void glDraw(const int loops, const GrGLContext*)=0;
     static GrGLuint CompileShader(const GrGLInterface*, const char* shaderSrc, GrGLenum type);
     static GrGLuint CreateProgram(const GrGLInterface*, const char* vshader, const char* fshader);
     static GrGLuint SetupFramebuffer(const GrGLInterface*, int screenWidth, int screenHeight);
     static void DumpImage(const GrGLInterface* gl, uint32_t screenWidth, uint32_t screenHeight,
                           const char* filename);
 
 
 private:
     typedef Benchmark INHERITED;
 };
 
 
 #endif
 #endif