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

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

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

Description

Revert of Flate: fix valgrind miniz Conditional-jump-or-move-depends... error (patchset #2 id:20001 of https://codereview.chromium.org/964933003/) 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 Committed: https://skia.googlesource.com/skia/+/6dc4ef01a656a9f7c3087eec2ff5142c707ceb7f

Patch Set 1 #

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

Messages

Total messages: 8 (0 generated)
Stephen Chennney
Created Revert of Flate: fix valgrind miniz Conditional-jump-or-move-depends... error
5 years, 9 months ago (2015-02-27 19:02:27 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/964953002/1
5 years, 9 months ago (2015-02-27 19:03:11 UTC) #2
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 19:03:12 UTC) #3
scroggo
On 2015/02/27 19:03:12, I haz the power (commit-bot) wrote: > Note for Reviewers: > The ...
5 years, 9 months ago (2015-02-27 19:39:21 UTC) #4
commit-bot: I haz the power
Committed patchset #1 (id:1) as https://skia.googlesource.com/skia/+/6dc4ef01a656a9f7c3087eec2ff5142c707ceb7f
5 years, 9 months ago (2015-02-27 19:40:03 UTC) #5
scroggo
On 2015/02/27 19:39:21, scroggo wrote: > On 2015/02/27 19:03:12, I haz the power (commit-bot) wrote: ...
5 years, 9 months ago (2015-02-27 19:40:19 UTC) #6
hal.canary
http://crrev.com/963853002
5 years, 9 months ago (2015-02-27 19:42:42 UTC) #7
mtklein
5 years, 9 months ago (2015-02-27 19:45:53 UTC) #8
Message was sent while issue was closed.
> Why did Chenney need an LGTM to revert?

He's not in CQ_COMMITTERS?

Powered by Google App Engine
This is Rietveld 408576698