Add visualbench option for device-independent fonts

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 <VisualBench/WrappedBenchmark.h>
@@ skipping 39 matching lines @@
                                                                     nullptr))->unref();
         SkRect rect = SkRect::MakeLTRB(0., 0., 400., 400.);
         for (int i = 0; i < loops; i++) {
             canvas->drawPath(fPath, paint);
             canvas->drawRect(rect, perlinPaint);
         }
     }
     SkPath fPath;
 };
 
-VisualBenchmarkStream::VisualBenchmarkStream()
-    : fBenches(BenchRegistry::Head())
+VisualBenchmarkStream::VisualBenchmarkStream(const SkSurfaceProps& surfaceProps)
+    : fSurfaceProps(surfaceProps)
+    , fBenches(BenchRegistry::Head())
     , fGMs(skiagm::GMRegistry::Head())
     , fSourceType(nullptr)
     , fBenchType(nullptr)
     , fCurrentSKP(0)
     , fIsWarmedUp(false) {
     for (int i = 0; i < FLAGS_skps.count(); i++) {
         if (SkStrEndsWith(FLAGS_skps[i], ".skp")) {
             fSKPs.push_back() = FLAGS_skps[i];
         } else {
             SkOSFile::Iter it(FLAGS_skps[i], ".skp");
@@ skipping 40 matching lines @@
         // skips non matching benches
         while ((bench = this->innerNext()) &&
                (SkCommandLineFlags::ShouldSkip(FLAGS_match, bench->getUniqueName()) ||
                 !bench->isSuitableFor(Benchmark::kGPU_Backend))) {
             bench->unref();
         }
     }
 
     // TODO move this all to --config
     if (bench && FLAGS_cpu) {
-        bench = new CpuWrappedBenchmark(bench);
+        bench = new CpuWrappedBenchmark(fSurfaceProps, bench);
     } else if (bench && FLAGS_nvpr) {
-        bench = new NvprWrappedBenchmark(bench, 4);
+        bench = new NvprWrappedBenchmark(fSurfaceProps, bench, 4);
     }
 
     fBenchmark.reset(bench);
     return fBenchmark;
 }
 
 Benchmark* VisualBenchmarkStream::innerNext() {
     while (fBenches) {
         Benchmark* bench = fBenches->factory()(nullptr);
         fBenches = fBenches->next();
@@ skipping 24 matching lines @@
         }
 
         SkString name = SkOSPath::Basename(path.c_str());
         fSourceType = "skp";
         fBenchType = "playback";
         return new VisualSKPBench(name.c_str(), pic.get());
     }
 
     return nullptr;
 }