SkPaint: eliminate some dead bytes in 64-bit build.

tests/PaintTest.cpp

Index: tests/PaintTest.cpp
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index e7954b913685aefa3b946a1e3e82d3a304e155db..1f306a49de0351aed21d5481c9966bd945e74279 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -59,7 +59,10 @@ static int find_first_zero(const uint16_t glyphs[], int count) {
     return count;
 }
 
-static void test_cmap(skiatest::Reporter* reporter) {
+// need to implement charsToGlyphs on other backends (e.g. linux, win)
+// before we can run this tests everywhere
+/*
+DEF_TEST(Paint_cmap, reporter) {
     static const int NGLYPHS = 64;
 
     SkUnichar src[NGLYPHS];
@@ -111,9 +114,10 @@ static void test_cmap(skiatest::Reporter* reporter) {
         }
     }
 }
+*/
 
 // temparary api for bicubic, just be sure we can set/clear it
-static void test_filterlevel(skiatest::Reporter* reporter) {
+DEF_TEST(Paint_filterlevel, reporter) {
     SkPaint p0, p1;
 
     REPORTER_ASSERT(reporter,
@@ -137,7 +141,7 @@ static void test_filterlevel(skiatest::Reporter* reporter) {
     }
 }
 
-static void test_copy(skiatest::Reporter* reporter) {
+DEF_TEST(Paint_copy, reporter) {
     SkPaint paint;
     // set a few member variables
     paint.setStyle(SkPaint::kStrokeAndFill_Style);
@@ -192,7 +196,7 @@ static void test_copy(skiatest::Reporter* reporter) {
 
 // found and fixed for webkit: mishandling when we hit recursion limit on
 // mostly degenerate cubic flatness test
-static void regression_cubic(skiatest::Reporter* reporter) {
+DEF_TEST(Paint_regression_cubic, reporter) {
     SkPath path, stroke;
     SkPaint paint;
 
@@ -225,7 +229,7 @@ static void regression_cubic(skiatest::Reporter* reporter) {
 }
 
 // found and fixed for android: not initializing rect for string's of length 0
-static void regression_measureText(skiatest::Reporter* reporter) {
+DEF_TEST(Paint_regression_measureText, reporter) {
 
     SkPaint paint;
     paint.setTextSize(12.0f);
@@ -238,23 +242,6 @@ static void regression_measureText(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, r.isEmpty());
 }
 
-DEF_TEST(Paint, reporter) {
-    // TODO add general paint tests
-    test_copy(reporter);
-
-    // regression tests
-    regression_cubic(reporter);
-    regression_measureText(reporter);
-
-    test_filterlevel(reporter);
-
-    // need to implement charsToGlyphs on other backends (e.g. linux, win)
-    // before we can run this tests everywhere
-    if (false) {
-       test_cmap(reporter);
-    }
-}
-
 #define ASSERT(expr) REPORTER_ASSERT(r, expr)
 
 DEF_TEST(Paint_FlatteningTraits, r) {