Revert of De-proc Color32

include/core/SkBlitRow.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkBlitRow_DEFINED
 #define SkBlitRow_DEFINED
 
@@ skipping 46 matching lines @@
     /** Function pointer that blends 32bit colors onto a 32bit destination.
         @param dst  array of dst 32bit colors
         @param src  array of src 32bit colors (w/ or w/o alpha)
         @param count number of colors to blend
         @param alpha global alpha to be applied to all src colors
      */
     typedef void (*Proc32)(uint32_t dst[], const SkPMColor src[], int count, U8CPU alpha);
 
     static Proc32 Factory32(unsigned flags32);
 
+   /** Function pointer that blends a single color with a row of 32-bit colors
+       onto a 32-bit destination
+   */
+   typedef void (*ColorProc)(SkPMColor dst[], const SkPMColor src[], int count, SkPMColor color);
+
     /** Blend a single color onto a row of S32 pixels, writing the result
         into a row of D32 pixels. src and dst may be the same memory, but
         if they are not, they may not overlap.
      */
     static void Color32(SkPMColor dst[], const SkPMColor src[], int count, SkPMColor color);
 
+    //! Public entry-point to return a blit function ptr
+    static ColorProc ColorProcFactory();
+
     /** These static functions are called by the Factory and Factory32
         functions, and should return either NULL, or a
         platform-specific function-ptr to be used in place of the
         system default.
      */
 
     static Proc32 PlatformProcs32(unsigned flags);
+    static ColorProc PlatformColorProc();
 
     static Proc16 PlatformFactory565(unsigned flags);
     static ColorProc16 PlatformColorFactory565(unsigned flags);
 
 private:
     enum {
         kFlags16_Mask = 7,
         kFlags32_Mask = 3
     };
 };
 
 #endif