Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Issue 964933003: Flate: fix valgrind miniz Conditional-jump-or-move-depends... error (Closed)

Created:
5 years, 9 months ago by hal.canary
Modified:
5 years, 9 months ago
Reviewers:
mtklein
CC:
reviews_skia.org, scroggo
Base URL:
https://skia.googlesource.com/skia.git@master
Target Ref:
refs/heads/master
Project:
skia
Visibility:
Public.

Description

Flate: fix valgrind miniz Conditional-jump-or-move-depends... error Committed: https://skia.googlesource.com/skia/+/e0638f8ecfb609c89cab1aa8b498ad3f368b89d3

Patch Set 1 #

Total comments: 2

Patch Set 2 : 2015-02-27 (Friday) 13:18:23 EST #

Unified diffs Side-by-side diffs Delta from patch set Stats (+12 lines, -5 lines) Patch
M src/core/SkFlate.cpp View 1 2 chunks +12 lines, -5 lines 0 comments Download

Messages

Total messages: 15 (3 generated)
hal.canary
5 years, 9 months ago (2015-02-27 18:11:09 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/964933003/1
5 years, 9 months ago (2015-02-27 18:12:41 UTC) #4
commit-bot: I haz the power
Note for Reviewers: The CQ is waiting for an approval. If you believe that the ...
5 years, 9 months ago (2015-02-27 18:12:42 UTC) #5
mtklein
https://codereview.chromium.org/964933003/diff/1/src/core/SkFlate.cpp File src/core/SkFlate.cpp (right): https://codereview.chromium.org/964933003/diff/1/src/core/SkFlate.cpp#newcode28 src/core/SkFlate.cpp:28: void* alloc = sk_calloc_throw(items * size); Do we perhaps ...
5 years, 9 months ago (2015-02-27 18:12:50 UTC) #6
hal.canary
https://codereview.chromium.org/964933003/diff/1/src/core/SkFlate.cpp File src/core/SkFlate.cpp (right): https://codereview.chromium.org/964933003/diff/1/src/core/SkFlate.cpp#newcode28 src/core/SkFlate.cpp:28: void* alloc = sk_calloc_throw(items * size); On 2015/02/27 18:12:50, ...
5 years, 9 months ago (2015-02-27 18:18:35 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/964933003/20001
5 years, 9 months ago (2015-02-27 18:19:51 UTC) #9
commit-bot: I haz the power
Note for Reviewers: The CQ is waiting for an approval. If you believe that the ...
5 years, 9 months ago (2015-02-27 18:19:52 UTC) #10
mtklein
lgtm IIRC, there are actually parts of the DEFLATE algorithm that function correctly when using ...
5 years, 9 months ago (2015-02-27 18:27:36 UTC) #11
hal.canary
On 2015/02/27 18:27:36, mtklein wrote: > IIRC, there are actually parts of the DEFLATE algorithm ...
5 years, 9 months ago (2015-02-27 18:35:51 UTC) #12
commit-bot: I haz the power
Committed patchset #2 (id:20001) as https://skia.googlesource.com/skia/+/e0638f8ecfb609c89cab1aa8b498ad3f368b89d3
5 years, 9 months ago (2015-02-27 18:39:33 UTC) #13
mtklein
On 2015/02/27 18:35:51, Hal Canary wrote: > On 2015/02/27 18:27:36, mtklein wrote: > > IIRC, ...
5 years, 9 months ago (2015-02-27 18:42:29 UTC) #14
Stephen Chennney
5 years, 9 months ago (2015-02-27 19:02:26 UTC) #15
Message was sent while issue was closed.
A revert of this CL (patchset #2 id:20001) has been created in
https://codereview.chromium.org/964953002/ by schenney@chromium.org.

The reason for reverting is: 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;
.

Powered by Google App Engine
This is Rietveld 408576698