Revert of Fix UB function problems for shaders and mask.

src/core/SkBitmapProcState_shaderproc.h

Index: src/core/SkBitmapProcState_shaderproc.h
diff --git a/src/core/SkBitmapProcState_shaderproc.h b/src/core/SkBitmapProcState_shaderproc.h
index b1fdc5f0562a373a399924e22f269c38a973d1cc..94b2d3b48c26b3729ad40561bde95ba52b537e8d 100644
--- a/src/core/SkBitmapProcState_shaderproc.h
+++ b/src/core/SkBitmapProcState_shaderproc.h
@@ -12,12 +12,11 @@
 
 // Can't be static in the general case because some of these implementations
 // will be defined and referenced in different object files.
-void SCALE_FILTER_NAME(const void* sIn, int x, int y,
+void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y,
                        DSTTYPE* SK_RESTRICT colors, int count);
 
-void SCALE_FILTER_NAME(const void* sIn, int x, int y,
+void SCALE_FILTER_NAME(const SkBitmapProcState& s, int x, int y,
                        DSTTYPE* SK_RESTRICT colors, int count) {
-    const SkBitmapProcState& s = *static_cast<const SkBitmapProcState*>(sIn);
     SkASSERT((s.fInvType & ~(SkMatrix::kTranslate_Mask |
                              SkMatrix::kScale_Mask)) == 0);
     SkASSERT(s.fInvKy == 0);