Rewrite SkTRegistry to take any trivially-copyable type.

bench/benchmain.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "BenchTimer.h"
@@ skipping 67 matching lines @@
 
 class Iter {
 public:
     Iter(void* param) {
         fBench = BenchRegistry::Head();
         fParam = param;
     }
 
     SkBenchmark* next() {
         if (fBench) {
-            BenchRegistry::Factory f = fBench->factory();
+            BenchRegistry::Data f = fBench->data();

[scroggo, 2013/09/04 15:40:21]

The name f is no longer redundant, and might be better named factory.

[mtklein, 2013/09/04 16:36:46]

Renamed everything back to Factory/factory.

             fBench = fBench->next();
             return f(fParam);
         }
         return NULL;
     }
 
 private:
     const BenchRegistry* fBench;
     void* fParam;
 };
@@ skipping 871 matching lines @@
     }
 
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif