Fix compilation with SK_ENABLE_INST_COUNT=1

src/core/SkMaskGamma.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkMaskGamma_DEFINED
 #define SkMaskGamma_DEFINED
 
@@ skipping 74 matching lines @@
  * contains non-linear alpha values in an attempt to create gamma correct blits
  * in the presence of a gamma incorrect (linear) blend in the blitter.
  *
  * SkMaskGamma creates and maintains tables which convert linear alpha values
  * to gamma correcting alpha values.
  * @param R The number of luminance bits to use [1, 8] from the red channel.
  * @param G The number of luminance bits to use [1, 8] from the green channel.
  * @param B The number of luminance bits to use [1, 8] from the blue channel.
  */
 template <int R_LUM_BITS, int G_LUM_BITS, int B_LUM_BITS> class SkTMaskGamma : public SkRefCnt {
+    SK_DECLARE_INST_COUNT(SkTMaskGamma)
 public:
-    SK_DECLARE_INST_COUNT_TEMPLATE(SkTMaskGamma)
 
     /** Creates a linear SkTMaskGamma. */
     SkTMaskGamma() : fIsLinear(true) { }
 
     /**
      * Creates tables to convert linear alpha values to gamma correcting alpha
      * values.
      *
      * @param contrast A value in the range [0.0, 1.0] which indicates the
      *                 amount of artificial contrast to add.
@@ skipping 33 matching lines @@
     static const int MAX_LUM_BITS =
           B_LUM_BITS > (R_LUM_BITS > G_LUM_BITS ? R_LUM_BITS : G_LUM_BITS)
         ? B_LUM_BITS : (R_LUM_BITS > G_LUM_BITS ? R_LUM_BITS : G_LUM_BITS);
     uint8_t fGammaTables[1 << MAX_LUM_BITS][256];
     bool fIsLinear;
 
     typedef SkRefCnt INHERITED;
 };
 
 
-#define MacroComma ,
-SK_DEFINE_INST_COUNT_TEMPLATE(
-    template <int R_LUM_BITS MacroComma int G_LUM_BITS MacroComma int B_LUM_BITS>,
-    SkTMaskGamma<R_LUM_BITS MacroComma G_LUM_BITS MacroComma B_LUM_BITS>);
-
 /**
  * SkTMaskPreBlend is a tear-off of SkTMaskGamma. It provides the tables to
  * convert a linear alpha value for a given channel to a gamma correcting alpha
  * value for that channel. This class is immutable.
  *
  * If fR, fG, or fB is NULL, all of them will be. This indicates that no mask
  * pre blend should be applied. SkTMaskPreBlend::isApplicable() is provided as
  * a convenience function to test for the absence of this case.
  */
 template <int R_LUM_BITS, int G_LUM_BITS, int B_LUM_BITS> class SkTMaskPreBlend {
@@ skipping 47 matching lines @@
  */
 template<bool APPLY_LUT> static inline U8CPU sk_apply_lut_if(U8CPU component, const uint8_t*) {
     return component;
 }
 template<> /*static*/ inline U8CPU sk_apply_lut_if<true>(U8CPU component, const uint8_t* lut) {
     return lut[component];
 }
 ///@}
 
 #endif