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

tests/PaintTest.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 "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkLayerDrawLooper.h"
@@ skipping 41 matching lines @@
 
 static int find_first_zero(const uint16_t glyphs[], int count) {
     for (int i = 0; i < count; ++i) {
         if (0 == glyphs[i]) {
             return i;
         }
     }
     return count;
 }
 
-DEF_TEST(Paint_cmap, reporter) {
-    // need to implement charsToGlyphs on other backends (e.g. linux, win)
-    // before we can run this tests everywhere
-    return;
-
+static void test_cmap(skiatest::Reporter* reporter) {
     static const int NGLYPHS = 64;
 
     SkUnichar src[NGLYPHS];
     SkUnichar dst[NGLYPHS]; // used for utf8, utf16, utf32 storage
 
     static const struct {
         size_t (*fSeedTextProc)(const SkUnichar[], void* dst, int count);
         SkPaint::TextEncoding   fEncoding;
     } gRec[] = {
         { uni_to_utf8,  SkPaint::kUTF8_TextEncoding },
@@ skipping 33 matching lines @@
             if (contains) {
                 REPORTER_ASSERT(reporter, NGLYPHS == first);
             } else {
                 REPORTER_ASSERT(reporter, NGLYPHS > first);
             }
         }
     }
 }
 
 // temparary api for bicubic, just be sure we can set/clear it
-DEF_TEST(Paint_filterlevel, reporter) {
+static void test_filterlevel(skiatest::Reporter* reporter) {
     SkPaint p0, p1;
 
     REPORTER_ASSERT(reporter,
                     SkPaint::kNone_FilterLevel == p0.getFilterLevel());
 
     static const SkPaint::FilterLevel gLevels[] = {
         SkPaint::kNone_FilterLevel,
         SkPaint::kLow_FilterLevel,
         SkPaint::kMedium_FilterLevel,
         SkPaint::kHigh_FilterLevel
     };
     for (size_t i = 0; i < SK_ARRAY_COUNT(gLevels); ++i) {
         p0.setFilterLevel(gLevels[i]);
         REPORTER_ASSERT(reporter, gLevels[i] == p0.getFilterLevel());
         p1 = p0;
         REPORTER_ASSERT(reporter, gLevels[i] == p1.getFilterLevel());
 
         p0.reset();
         REPORTER_ASSERT(reporter,
                         SkPaint::kNone_FilterLevel == p0.getFilterLevel());
     }
 }
 
-DEF_TEST(Paint_copy, reporter) {
+static void test_copy(skiatest::Reporter* reporter) {
     SkPaint paint;
     // set a few member variables
     paint.setStyle(SkPaint::kStrokeAndFill_Style);
     paint.setTextAlign(SkPaint::kLeft_Align);
     paint.setStrokeWidth(SkIntToScalar(2));
     // set a few pointers
     SkLayerDrawLooper* looper = new SkLayerDrawLooper();
     paint.setLooper(looper)->unref();
     SkMaskFilter* mask = SkBlurMaskFilter::Create(SkBlurMaskFilter::kNormal_BlurStyle,
                                       SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(1)));
@@ skipping 34 matching lines @@
     // the reset function should increment the Generation ID
     REPORTER_ASSERT(reporter, paint.getGenerationID() != paintGenID);
     REPORTER_ASSERT(reporter, copiedPaint.getGenerationID() != copiedPaintGenID);
     REPORTER_ASSERT(reporter, memcmp(&cleanPaint, &paint, sizeof(cleanPaint)));
     REPORTER_ASSERT(reporter, memcmp(&cleanPaint, &copiedPaint, sizeof(cleanPaint)));
 #endif
 }
 
 // found and fixed for webkit: mishandling when we hit recursion limit on
 // mostly degenerate cubic flatness test
-DEF_TEST(Paint_regression_cubic, reporter) {
+static void regression_cubic(skiatest::Reporter* reporter) {
     SkPath path, stroke;
     SkPaint paint;
 
     path.moveTo(460.2881309415525f,
                 303.250847066498f);
     path.cubicTo(463.36378422175284f,
                  302.1169735073363f,
                  456.32239330810046f,
                  304.720354932878f,
                  453.15255460013304f,
@@ skipping 12 matching lines @@
     SkScalar inset = paint.getStrokeJoin() == SkPaint::kMiter_Join ?
                             SkScalarMul(paint.getStrokeWidth(), miter) :
                             paint.getStrokeWidth();
     maxR.inset(-inset, -inset);
 
     // test that our stroke didn't explode
     REPORTER_ASSERT(reporter, maxR.contains(strokeR));
 }
 
 // found and fixed for android: not initializing rect for string's of length 0
-DEF_TEST(Paint_regression_measureText, reporter) {
+static void regression_measureText(skiatest::Reporter* reporter) {
 
     SkPaint paint;
     paint.setTextSize(12.0f);
 
     SkRect r;
     r.setLTRB(SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN, SK_ScalarNaN);
 
     // test that the rect was reset
     paint.measureText("", 0, &r, 1.0f);
     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) {
     SkPaint paint;
     paint.setColor(0x00AABBCC);
     paint.setTextScaleX(1.0f);  // Encoded despite being the default value.
     paint.setTextSize(19);
     paint.setXfermode(SkXfermode::Create(SkXfermode::kModulate_Mode))->unref();
     paint.setLooper(NULL);  // Ignored.
 
@@ skipping 16 matching lines @@
     ASSERT(other.getTextScaleX() == paint.getTextScaleX());
     ASSERT(other.getTextSize()   == paint.getTextSize());
     ASSERT(other.getLooper()     == paint.getLooper());
 
     // We have to be a little looser and compare just the modes.  Pointers might not be the same.
     SkXfermode::Mode otherMode, paintMode;
     ASSERT(other.getXfermode()->asMode(&otherMode));
     ASSERT(paint.getXfermode()->asMode(&paintMode));
     ASSERT(otherMode == paintMode);
 }