Fix for nexus 5 crashing in GL benches

tools/VisualBench/VisualLightweightBenchModule.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 
 #include "VisualLightweightBenchModule.h"
 
@@ skipping 151 matching lines @@
         return true;
     }
 
     fBenchmark.reset(fBenchmarkStream->next());
     if (!fBenchmark) {
         return false;
     }
 
     fOwner->clear(canvas, SK_ColorWHITE, 2);
 
-    fBenchmark->preDraw();
+    fBenchmark->delayedSetup();
     fRecords.push_back();
 
     // Log bench name
     fResults->bench(fBenchmark->getUniqueName(), fBenchmark->getSize().fX,
                     fBenchmark->getSize().fY);
     return true;
 }
 
 inline void VisualLightweightBenchModule::nextState(State nextState) {
     fState = nextState;
 }
 
 void VisualLightweightBenchModule::perCanvasPreDraw(SkCanvas* canvas, State nextState) {
     fBenchmark->perCanvasPreDraw(canvas);
+    fBenchmark->preDraw(canvas);
     fCurrentFrame = 0;
     this->nextState(nextState);
 }
 
 void VisualLightweightBenchModule::warmup(SkCanvas* canvas) {
     if (fCurrentFrame >= FLAGS_maxWarmupFrames) {
         this->nextState(kPreWarmLoopsPerCanvasPreDraw_State);
         fBenchmark.reset(nullptr);
         this->resetTimingState();
         fLoops = 1;
@@ skipping 89 matching lines @@
         this->resetTimingState();
     }
 }
 
 void VisualLightweightBenchModule::recordMeasurement() {
     double measurement = this->elapsed() / (FLAGS_frames * fLoops);
     fRecords.back().fMeasurements.push_back(measurement);
 }
 
 void VisualLightweightBenchModule::postDraw(SkCanvas* canvas) {
+    fBenchmark->postDraw(canvas);
     fBenchmark->perCanvasPostDraw(canvas);
     fBenchmark.reset(nullptr);
     fCurrentSample = 0;
     fLoops = 1;
 }
 
 inline void VisualLightweightBenchModule::timing(SkCanvas* canvas) {
     if (fCurrentFrame >= FLAGS_frames) {
         this->recordMeasurement();
         if (fCurrentSample++ >= FLAGS_samples) {
             this->printStats();
             this->postDraw(canvas);
             this->nextState(kPreWarmLoopsPerCanvasPreDraw_State);
         } else {
             this->nextState(kPreWarmTimingPerCanvasPreDraw_State);
         }
         this->resetTimingState();
     } else {
         fCurrentFrame++;
     }
 }
 
 bool VisualLightweightBenchModule::onHandleChar(SkUnichar c) {
     return true;
 }