Guard colorNames variable under SK_SUPPORT_UNITTEST.

src/utils/SkParseColor.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkParse.h"
 
 #ifdef SK_DEBUG
 #include "SkString.h"
 
+#ifdef SK_SUPPORT_UNITTEST
     // compress names 6 chars per long (packed 5 bits/char )
         // note: little advantage to splitting chars across longs, since 3 longs at 2 unused bits each
         // allow for one additional split char (vs. the 18 unsplit chars in the three longs)
     // use extra two bits to represent:
         // 00 : final 6 (or fewer) chars (if 'a' is 0x01, zero could have special meaning)
         // 01 : not final 6 chars
         // 10 : color
         // 11 : unused, except as debugging sentinal? (could be -1 for easier test)
     // !!! the bit to end the word (last) is at the low bit for binary search
     // lookup first character in offset for quick start
@@ skipping 143 matching lines @@
     { "tomato",               0xFF6347 },
     { "turquoise",            0x40E0D0 },
     { "violet",               0xEE82EE },
     { "wheat",                0xF5DEB3 },
     { "white",                0xFFFFFF },
     { "whitesmoke",           0xF5F5F5 },
     { "yellow",               0xFFFF00 },
     { "yellowgreen",          0x9ACD32 }
 };
 
-int colorNamesSize = sizeof(colorNames) / sizeof(colorNames[0]);
+int colorNamesSize = SK_ARRAY_COUNT(colorNames);
 
-#ifdef SK_SUPPORT_UNITTEST
 static void CreateTable() {
     SkString comment;
     size_t originalSize = 0;
     int replacement = 0;
     for (int index = 0; index < colorNamesSize; index++) {
         SkNameRGB nameRGB =  colorNames[index];
         const char* name = nameRGB.name;
         size_t len = strlen(name);
         originalSize += len + 9;
         bool first = true;
@@ skipping 339 matching lines @@
     result = SK_ColorBLACK;
     SkASSERT(FindColor("#123", &result));
     SkASSERT(result == 0Xff112233);
     SkASSERT(FindColor("#abcd", &result));
     SkASSERT(result == 0Xaabbccdd);
     result = SK_ColorBLACK;
 //  SkASSERT(FindColor("71,162,253", &result));
 //  SkASSERT(result == ((0xFF << 24) | (71 << 16) | (162 << 8) | (253 << 0)));
 }
 #endif