Revert of Flate: fix valgrind miniz Conditional-jump-or-move-depends... error (patchs...

Reason for revert:
Breaks the chrome build.

../../third_party/skia/src/core/SkFlate.cpp:37:22: error: assigning to 'MOZ_Z_alloc_func' (aka 'MOZ_Z_voidpf (*)(MOZ_Z_voidpf, MOZ_Z_uInt, MOZ_Z_uInt)') from incompatible type 'void *(*)(void *, size_t, size_t)': type mismatch at 2nd parameter ('MOZ_Z_uInt' (aka 'unsigned int') vs 'size_t' (aka 'unsigned long'))
    flateData.zalloc = &skia_alloc_func;
                     ^ ~~~~~~~~~~~~~~~~
../../third_party/skia/src/core/SkFlate.cpp:180:28: error: assigning to 'MOZ_Z_alloc_func' (aka 'MOZ_Z_voidpf (*)(MOZ_Z_voidpf, MOZ_Z_uInt, MOZ_Z_uInt)') from incompatible type 'void *(*)(void *, size_t, size_t)': type mismatch at 2nd parameter ('MOZ_Z_uInt' (aka 'unsigned int') vs 'size_t' (aka 'unsigned long'))
    fImpl->fZStream.zalloc = &skia_alloc_func;

Original issue's description:
> Flate: fix valgrind miniz Conditional-jump-or-move-depends... error
>
> Committed: https://skia.googlesource.com/skia/+/e0638f8ecfb609c89cab1aa8b498ad3f368b89d3

TBR=mtklein@google.com,halcanary@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/964953002

diff --git a/src/core/SkFlate.cpp b/src/core/SkFlate.cpp
index f990dc3..baf1c77 100644 (file)
--- a/src/core/SkFlate.cpp
+++ b/src/core/SkFlate.cpp
@@ -24,19 +24,12 @@ namespace {
 // static
 const size_t kBufferSize = 1024;
 
-static void* skia_alloc_func(void*, size_t items, size_t size) {
-    return sk_calloc_throw(items * size);
-}
-
-static void skia_free_func(void*, void* address) { sk_free(address); }
-
 bool doFlate(bool compress, SkStream* src, SkWStream* dst) {
     uint8_t inputBuffer[kBufferSize];
     uint8_t outputBuffer[kBufferSize];
     z_stream flateData;
-    flateData.zalloc = &skia_alloc_func;
-    flateData.zfree = &skia_free_func;
-    flateData.opaque = NULL;
+    flateData.zalloc = NULL;
+    flateData.zfree = NULL;
     flateData.next_in = NULL;
     flateData.avail_in = 0;
     flateData.next_out = outputBuffer;
@@ -177,9 +170,9 @@ SkDeflateWStream::SkDeflateWStream(SkWStream* out)
     if (!fImpl->fOut) {
         return;
     }
-    fImpl->fZStream.zalloc = &skia_alloc_func;
-    fImpl->fZStream.zfree = &skia_free_func;
-    fImpl->fZStream.opaque = NULL;
+    fImpl->fZStream.zalloc = Z_NULL;
+    fImpl->fZStream.zfree = Z_NULL;
+    fImpl->fZStream.opaque = Z_NULL;
     SkDEBUGCODE(int r =) deflateInit(&fImpl->fZStream, Z_DEFAULT_COMPRESSION);
     SkASSERT(Z_OK == r);
 }