Revert of Fix UB function problems for shaders and mask.

src/core/SkBitmapProcState.h

Index: src/core/SkBitmapProcState.h
diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h
index 4d7e7f32dc69602e8a7b6c078f1e7dd7f5c52863..e6e7a3f393661ff729a2abecde11d62950b5e6a6 100644
--- a/src/core/SkBitmapProcState.h
+++ b/src/core/SkBitmapProcState.h
@@ -43,9 +43,11 @@
     SkBitmapProcState(const SkBitmap&, SkShader::TileMode tmx, SkShader::TileMode tmy);
     ~SkBitmapProcState();
 
-    typedef void (*ShaderProc32)(const void* ctx, int x, int y, SkPMColor[], int count);
-
-    typedef void (*ShaderProc16)(const void* ctx, int x, int y, uint16_t[], int count);
+    typedef void (*ShaderProc32)(const SkBitmapProcState&, int x, int y,
+                                 SkPMColor[], int count);
+
+    typedef void (*ShaderProc16)(const SkBitmapProcState&, int x, int y,
+                                 uint16_t[], int count);
 
     typedef void (*MatrixProc)(const SkBitmapProcState&,
                                uint32_t bitmapXY[],