Revert of Fix UB function problems for shaders and mask.

src/core/SkBitmapProcShader.cpp

Index: src/core/SkBitmapProcShader.cpp
diff --git a/src/core/SkBitmapProcShader.cpp b/src/core/SkBitmapProcShader.cpp
index 6c9410ee3288b9f98a1fa782b4d56a19576704c1..dd97380bbdb88eab9f9bef78ec38fe315733bbe3 100644
--- a/src/core/SkBitmapProcShader.cpp
+++ b/src/core/SkBitmapProcShader.cpp
@@ -174,7 +174,7 @@
                                                             int count) {
     const SkBitmapProcState& state = *fState;
     if (state.getShaderProc32()) {
-        state.getShaderProc32()(&state, x, y, dstC, count);
+        state.getShaderProc32()(state, x, y, dstC, count);
         return;
     }
 
@@ -225,7 +225,7 @@
                                                               int count) {
     const SkBitmapProcState& state = *fState;
     if (state.getShaderProc16()) {
-        state.getShaderProc16()(&state, x, y, dstC, count);
+        state.getShaderProc16()(state, x, y, dstC, count);
         return;
     }