Revert of Fix UB function problems for shaders and mask.

src/core/SkBlitMask.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 SkBlitMask_DEFINED
 #define SkBlitMask_DEFINED
 
@@ skipping 26 matching lines @@
      */
     typedef void (*BlitLCD16RowProc)(SkPMColor dst[], const uint16_t src[],
                                      SkColor color, int width,
                                      SkPMColor opaqueDst);
 
     /**
      *  Function pointer that blits a row of src colors through a row of a mask
      *  onto a row of dst colors. The RowFactory that returns this function ptr
      *  will have been told the formats for the mask and the dst.
      */
-    typedef void (*RowProc)(SkPMColor* dst, const void* mask,
+    typedef void (*RowProc)(void* dst, const void* mask,
                             const SkPMColor* src, int width);
 
     /**
      *  Public entry-point to return a blitcolor BlitLCD16RowProc.
      */
     static BlitLCD16RowProc BlitLCD16RowFactory(bool isOpaque);
 
     /**
      *  Return either platform specific optimized blitcolor BlitLCD16RowProc,
      *  or nullptr if no optimized routine is available.
@@ skipping 11 matching lines @@
     static RowProc RowFactory(SkColorType, SkMask::Format, RowFlags);
 
     /**
      *  Return either platform specific optimized blitmask RowProc,
      *  or nullptr if no optimized routine is available.
      */
     static RowProc PlatformRowProcs(SkColorType, SkMask::Format, RowFlags);
 };
 
 #endif