Match works correctly on visualbench

BUG=skia:

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

2 files changed, 11 insertions, 0 deletions

diff --git a/tools/VisualBench/VisualBenchmarkStream.cpp b/tools/VisualBench/VisualBenchmarkStream.cpp
index 841fb5d11b..1f16664081 100644
--- a/tools/VisualBench/VisualBenchmarkStream.cpp
+++ b/tools/VisualBench/VisualBenchmarkStream.cpp
@@ -65,6 +65,15 @@ bool VisualBenchmarkStream::ReadPicture(const char* path, SkAutoTUnref<SkPicture
 }
 
 Benchmark* VisualBenchmarkStream::next() {
+    Benchmark* bench;
+    // skips non matching benches
+    while ((bench = this->innerNext()) &&
+           SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName())) {
+    }
+    return bench;
+}
+
+Benchmark* VisualBenchmarkStream::innerNext() {
     while (fBenches) {
         Benchmark* bench = fBenches->factory()(NULL);
         fBenches = fBenches->next();
diff --git a/tools/VisualBench/VisualBenchmarkStream.h b/tools/VisualBench/VisualBenchmarkStream.h
index 4c6a1eb262..e8d2cbe524 100644
--- a/tools/VisualBench/VisualBenchmarkStream.h
+++ b/tools/VisualBench/VisualBenchmarkStream.h
@@ -25,6 +25,8 @@ public:
     Benchmark* next();
 
 private:
+    Benchmark* innerNext();
+
     const BenchRegistry* fBenches;
     const skiagm::GMRegistry* fGMs;
     SkTArray<SkString> fSKPs;