Match works correctly on visualbench

tools/VisualBench/VisualBenchmarkStream.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 <VisualBench/VisualBenchmarkStream.h>
 #include "GMBench.h"
@@ skipping 47 matching lines @@
 
     pic->reset(SkPicture::CreateFromStream(stream.get()));
     if (pic->get() == NULL) {
         SkDebugf("Could not read %s as an SkPicture.\n", path);
         return false;
     }
     return true;
 }
 
 Benchmark* VisualBenchmarkStream::next() {
+    Benchmark* bench;

[robertphillips, 2015/07/15 15:25:40]

// skip non-matching benchs
?

+    while ((bench = this->innerNext()) &&

[robertphillips, 2015/07/15 15:25:40]

Maybe put the '}' on its own line ?

+           SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName())) {}
+    return bench;
+}
+
+Benchmark* VisualBenchmarkStream::innerNext() {
     while (fBenches) {
         Benchmark* bench = fBenches->factory()(NULL);
         fBenches = fBenches->next();
         if (bench->isVisual()) {
             fSourceType = "bench";
             fBenchType  = "micro";
             return bench;
         }
     }
 
@@ skipping 16 matching lines @@
         }
 
         SkString name = SkOSPath::Basename(path.c_str());
         fSourceType = "skp";
         fBenchType = "playback";
         return SkNEW_ARGS(VisualSKPBench, (name.c_str(), pic.get()));
     }
 
     return NULL;
 }