Flate: skia_alloc_func works on both miniz and zlib

Flate: skia_alloc_func works on both miniz and zlib

Also, Revert "Revert of Flate: fix valgrind miniz 
Conditional-jump-or-move-depends... error"

This reverts commit 6dc4ef01a656a9f7c3087eec2ff5142c707ceb7f.

The alloc functions really do have different types depending 
on zlib implementation.

CQ_INCLUDE_TRYBOTS=client.skia:Linux Builder-Trybot

Committed: https://skia.googlesource.com/skia/+/394ce76992e2e8349af64ab99d6e2e702bae735d

[hal.canary, 2015-02-27 19:32:59]

halcanary@google.com changed reviewers:
+ mtklein@google.com

[hal.canary, 2015-02-27 19:32:59]

or this

[mtklein, 2015-02-27 19:36:16]

lgtm too

https://codereview.chromium.org/963853002/diff/1/src/core/SkFlate.cpp
File src/core/SkFlate.cpp (right):

https://codereview.chromium.org/963853002/diff/1/src/core/SkFlate.cpp#newcode27
src/core/SkFlate.cpp:27: template <typename T> void* skia_alloc_func(void*, T
items, T size) {
Shall we add // Different zlib implementations use different T.  We've seen
size_t and unsigned.  ?

[mtklein, 2015-02-27 19:38:09]

On 2015/02/27 19:36:16, mtklein wrote:
> lgtm too
> 
> https://codereview.chromium.org/963853002/diff/1/src/core/SkFlate.cpp
> File src/core/SkFlate.cpp (right):
> 
>
https://codereview.chromium.org/963853002/diff/1/src/core/SkFlate.cpp#newcode27
> src/core/SkFlate.cpp:27: template <typename T> void* skia_alloc_func(void*, T
> items, T size) {
> Shall we add // Different zlib implementations use different T.  We've seen
> size_t and unsigned.  ?

I like yours better.  Let's land it if the trybot passes.

[hal.canary, 2015-02-27 19:40:41]

https://codereview.chromium.org/963853002/diff/1/src/core/SkFlate.cpp
File src/core/SkFlate.cpp (right):

https://codereview.chromium.org/963853002/diff/1/src/core/SkFlate.cpp#newcode27
src/core/SkFlate.cpp:27: template <typename T> void* skia_alloc_func(void*, T
items, T size) {
On 2015/02/27 19:36:16, mtklein wrote:
> Shall we add // Different zlib implementations use different T.  We've seen
> size_t and unsigned.  ?

Done.

[hal.canary, 2015-02-27 19:50:44]

The CQ bit was checked by halcanary@google.com

[hal.canary, 2015-02-27 19:50:44]

The patchset sent to the CQ was uploaded after l-g-t-m from mtklein@google.com
Link to the patchset: https://codereview.chromium.org/963853002/#ps40001 (title:
"2015-02-27 (Friday) 14:47:34 EST")

[commit-bot: I haz the power, 2015-02-27 19:51:04]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/963853002/40001

[commit-bot: I haz the power, 2015-02-27 21:09:12]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/394ce76992e2e8349af64ab99d6e2e702bae735d