6dc4ef01a6
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
|
||
|---|---|---|
| animations | ||
| bench | ||
| bin | ||
| debugger | ||
| dm | ||
| docs | ||
| example | ||
| experimental | ||
| forth | ||
| gm | ||
| gyp | ||
| include | ||
| platform_tools | ||
| resources | ||
| samplecode | ||
| site | ||
| src | ||
| tests | ||
| third_party | ||
| tools | ||
| .gitignore | ||
| AUTHORS | ||
| codereview.settings | ||
| CONTRIBUTING | ||
| CQ_COMMITTERS | ||
| DEPS | ||
| Doxyfile | ||
| gyp_skia | ||
| gyp_skia.py | ||
| LICENSE | ||
| make.bat | ||
| make.py | ||
| Makefile | ||
| OWNERS | ||
| PRESUBMIT.py | ||
| README | ||
| README.chromium | ||
| skia.gyp | ||
| SKP_VERSION | ||
| whitespace.txt | ||
Skia is a complete 2D graphic library for drawing Text, Geometries, and Images. See full details, and build instructions, at https://skia.org.