Allow GMs ato be used as benchmarks. Make convex_poly_clip opt in.

bench/SkBenchmark.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkBenchmark_DEFINED
 #define SkBenchmark_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkPoint.h"
 #include "SkString.h"
 #include "SkTRegistry.h"
 
-#define DEF_BENCH(code) \
-static SkBenchmark* SK_MACRO_APPEND_LINE(F_)() { code; } \
-static BenchRegistry SK_MACRO_APPEND_LINE(R_)(SK_MACRO_APPEND_LINE(F_));
+#define DEF_BENCH(code)                                                 \
+namespace {                                                             \
+class SK_MACRO_APPEND_LINE(F_CLASS) : public SkBenchmarkFactory {       \
+    virtual SkBenchmark* operator()() const SK_OVERRIDE { code; }       \
+} SK_MACRO_APPEND_LINE(g_F_);                                           \
+BenchRegistry SK_MACRO_APPEND_LINE(g_R_)(&SK_MACRO_APPEND_LINE(g_F_));  \
+}
 
 /*
  *  With the above macros, you can register benches as follows (at the bottom
  *  of your .cpp)
  *
  *  DEF_BENCH(return new MyBenchmark(...))
  *  DEF_BENCH(return new MyBenchmark(...))
  *  DEF_BENCH(return new MyBenchmark(...))
  */
 
@@ skipping 96 matching lines @@
     int     fForceAlpha;
     bool    fForceAA;
     bool    fForceFilter;
     SkTriState::State  fDither;
     uint32_t    fOrMask, fClearMask;
     static  SkString gResourcePath;
 
     typedef SkRefCnt INHERITED;
 };
 
-typedef SkTRegistry<SkBenchmark*(*)()> BenchRegistry;
+class SkBenchmarkFactory : public SkRefCnt {
+public:
+    // Creates a new SkBenchmark that is owned by the caller on each call.
+    virtual SkBenchmark* operator()() const = 0;
+    virtual ~SkBenchmarkFactory() {}
+};
+
+typedef SkTRegistry<SkBenchmarkFactory*> BenchRegistry;
 
 #endif