Add _aa variants of Xfermode benches.
Also, allow multiple DEF_BENCH() per line by using __COUNTER__ instead of __LINE__.
BUG=skia:
Review URL: https://codereview.chromium.org/1140643004
diff --git a/bench/Benchmark.h b/bench/Benchmark.h
index 5ba6e91..22b52ab 100644
--- a/bench/Benchmark.h
+++ b/bench/Benchmark.h
@@ -13,11 +13,10 @@
#include "SkString.h"
#include "SkTRegistry.h"
-#define DEF_BENCH(code) \
-namespace { \
-static Benchmark* SK_MACRO_APPEND_LINE(factory)(void*) { code; } \
-BenchRegistry SK_MACRO_APPEND_LINE(g_R_)(SK_MACRO_APPEND_LINE(factory)); \
-}
+#define DEF_BENCH3(code, N) \
+ static BenchRegistry gBench##N([](void*) -> Benchmark* { code; });
+#define DEF_BENCH2(code, N) DEF_BENCH3(code, N)
+#define DEF_BENCH(code) DEF_BENCH2(code, __COUNTER__)
/*
* With the above macros, you can register benches as follows (at the bottom