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

Issue 957323003: miniz support in SkFlate / PDF (Closed)

Created:
5 years, 10 months ago by mtklein_C
Modified:
5 years, 10 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

miniz support in SkFlate / PDF - Adds miniz.c v115_r4 (latest release) to third_party. - Merges SkDeflateWStream into SkFlate so including "miniz.c" links without duplicating symbols. The only interesting code change I've made is to remove the line fImpl->fZStream.data_type = Z_BINARY; from SkDeflateWStream::SkDeflateWStream(). miniz doesn't have Z_BINARY defined, and as far as I can tell, both zlib and miniz ignore data_type. We should be able to swap skflate.gyp's dependency between zlib.gyp:zlib and zlib.gyp:miniz at will (except of course on Windows) if we're interested in zlib itself. I've left android framework on its own zlib. I think this all means we can stop defining SK_NO_FLATE on Windows. I'll leave the possible cleanup of SK_NO_FLATE itself for another time. Might be we always want to keep this dependency optional. CQ_EXTRA_TRYBOTS=client.skia:Test-Win8-ShuttleA-HD7770-x86-Debug-Trybot BUG=skia: Committed: https://skia.googlesource.com/skia/+/e6cf9cb68511ff08156f834859db39232eb37be8

Patch Set 1 #

Patch Set 2 : reup #

Patch Set 3 : fix #

Patch Set 4 : SkToInt #

Total comments: 2

Patch Set 5 : fix alias warning #

Patch Set 6 : wno-enum-compare #

Patch Set 7 : sort #

Patch Set 8 : -w #

Total comments: 2

Patch Set 9 : class comment #

Unified diffs Side-by-side diffs Delta from patch set Stats (+5092 lines, -176 lines) Patch
M gyp/common_conditions.gypi View 1 chunk +0 lines, -1 line 0 comments Download
M gyp/pdf.gypi View 1 chunk +0 lines, -2 lines 0 comments Download
M gyp/skflate.gyp View 1 2 1 chunk +7 lines, -15 lines 0 comments Download
M gyp/zlib.gyp View 1 2 3 4 5 6 7 1 chunk +9 lines, -0 lines 0 comments Download
M src/core/SkFlate.h View 1 2 3 4 5 6 7 8 2 chunks +29 lines, -2 lines 0 comments Download
M src/core/SkFlate.cpp View 1 2 3 2 chunks +97 lines, -1 line 0 comments Download
D src/pdf/SkDeflateWStream.h View 1 chunk +0 lines, -45 lines 0 comments Download
D src/pdf/SkDeflateWStream.cpp View 1 chunk +0 lines, -106 lines 0 comments Download
M src/pdf/SkPDFBitmap.cpp View 1 chunk +1 line, -1 line 0 comments Download
M tests/DeflateWStream.cpp View 1 2 3 4 2 chunks +2 lines, -3 lines 0 comments Download
A third_party/miniz/LICENSE View 1 chunk +24 lines, -0 lines 0 comments Download
A third_party/miniz/README.google View 1 chunk +7 lines, -0 lines 0 comments Download
A third_party/miniz/miniz.c View 1 2 3 4 5 6 7 8 1 chunk +4916 lines, -0 lines 0 comments Download

Messages

Total messages: 13 (4 generated)
mtklein_C
5 years, 10 months ago (2015-02-26 17:37:49 UTC) #2
scroggo
lgtm https://codereview.chromium.org/957323003/diff/60001/src/core/SkFlate.h File src/core/SkFlate.h (right): https://codereview.chromium.org/957323003/diff/60001/src/core/SkFlate.h#newcode18 src/core/SkFlate.h:18: #include "SkStream.h" nit: Don't we typically place includes ...
5 years, 10 months ago (2015-02-26 17:56:53 UTC) #3
scroggo
I take it this replaces https://codereview.chromium.org/469813002/?
5 years, 10 months ago (2015-02-26 17:57:56 UTC) #4
mtklein
On 2015/02/26 17:57:56, scroggo wrote: > I take it this replaces https://codereview.chromium.org/469813002/ Guess so.
5 years, 10 months ago (2015-02-26 18:00:07 UTC) #5
mtklein
https://codereview.chromium.org/957323003/diff/60001/src/core/SkFlate.h File src/core/SkFlate.h (right): https://codereview.chromium.org/957323003/diff/60001/src/core/SkFlate.h#newcode18 src/core/SkFlate.h:18: #include "SkStream.h" On 2015/02/26 17:56:53, scroggo wrote: > nit: ...
5 years, 10 months ago (2015-02-26 18:00:16 UTC) #7
hal.canary
otherwise lgtm https://codereview.chromium.org/957323003/diff/140001/src/core/SkFlate.h File src/core/SkFlate.h (right): https://codereview.chromium.org/957323003/diff/140001/src/core/SkFlate.h#newcode49 src/core/SkFlate.h:49: class SkDeflateWStream : public SkWStream { /** ...
5 years, 10 months ago (2015-02-26 19:26:25 UTC) #8
mtklein
https://codereview.chromium.org/957323003/diff/140001/src/core/SkFlate.h File src/core/SkFlate.h (right): https://codereview.chromium.org/957323003/diff/140001/src/core/SkFlate.h#newcode49 src/core/SkFlate.h:49: class SkDeflateWStream : public SkWStream { On 2015/02/26 19:26:25, ...
5 years, 10 months ago (2015-02-26 19:32:51 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/957323003/160001
5 years, 10 months ago (2015-02-26 19:36:10 UTC) #12
commit-bot: I haz the power
5 years, 10 months ago (2015-02-26 21:25:11 UTC) #13
Message was sent while issue was closed.
Committed patchset #9 (id:160001) as
https://skia.googlesource.com/skia/+/e6cf9cb68511ff08156f834859db39232eb37be8

Powered by Google App Engine
This is Rietveld 408576698