Update our SK_ARRAY_COUNT macro to account for when pointers are passed.

include/core/SkTypes.h

 /*
  * 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.
  */
 
 #ifndef SkTypes_DEFINED
 #define SkTypes_DEFINED
 
@@ skipping 278 matching lines @@
  */
 static inline bool SkIsU16(long x) {
     return (uint16_t)x == x;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 #ifndef SK_OFFSETOF
     #define SK_OFFSETOF(type, field)    (size_t)((char*)&(((type*)1)->field) - (char*)1)
 #endif
 
+// The SK_ARRAY_COUNT(arr) macro returns the # of elements in an array arr.
+// The expression is a compile-time constant, and therefore can be
+// used in defining new arrays, for example.  If you use SK_ARRAY_COUNT on
+// a pointer by mistake, you will get a compile-time error.
+//
+// This template function declaration is used in defining SK_ARRAY_COUNT.
+// Note that the function doesn't need an implementation, as we only
+// use its type.
+template <typename T, size_t N>
+char (&ArraySizeHelper(T (&array)[N]))[N];
+
+// That gcc wants both of these prototypes seems mysterious. VC, for
+// its part, can't decide which to use (another mystery). Matching of
+// template overloads: the final frontier.
+#ifndef _MSC_VER
+template <typename T, size_t N>
+char (&ArraySizeHelper(const T (&array)[N]))[N];
+#endif
+
 /** Returns the number of entries in an array (not a pointer)
 */
-#define SK_ARRAY_COUNT(array)       (sizeof(array) / sizeof(array[0]))
+#define SK_ARRAY_COUNT(array) (sizeof(::ArraySizeHelper(array)))
 
 #define SkAlign2(x)     (((x) + 1) >> 1 << 1)
 #define SkIsAlign2(x)   (0 == ((x) & 1))
 
 #define SkAlign4(x)     (((x) + 3) >> 2 << 2)
 #define SkIsAlign4(x)   (0 == ((x) & 3))
 
 #define SkAlign8(x)     (((x) + 7) >> 3 << 3)
 #define SkIsAlign8(x)   (0 == ((x) & 7))
 
@@ skipping 363 matching lines @@
 private:
     void*       fPtr;
     size_t      fSize;  // can be larger than the requested size (see kReuse)
     uint32_t    fStorage[(kSize + 3) >> 2];
 };
 // Can't guard the constructor because it's a template class.
 
 #endif /* C++ */
 
 #endif