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

Issue 1301523005: Update skia to test with libpng to 1.6.10 (Closed)

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

Description

Update skia to test with libpng to 1.6.10 BUG=skia: Committed: https://skia.googlesource.com/skia/+/f272bb03df9b86e7ea2cf23fb4d5cc56624e0118

Patch Set 1 #

Patch Set 2 : Spell namespace correctly #

Patch Set 3 : Made comment clearer #

Patch Set 4 : Trybots #

Total comments: 2
Unified diffs Side-by-side diffs Delta from patch set Stats (+21 lines, -3 lines) Patch
M DEPS View 1 chunk +1 line, -1 line 0 comments Download
M dm/DMSrcSink.cpp View 1 2 3 3 chunks +3 lines, -0 lines 1 comment Download
M platform_tools/android/gyp/dependencies.gypi View 1 2 3 2 chunks +16 lines, -2 lines 1 comment Download
M third_party/libpng/pngprefix.h View 1 2 3 1 chunk +1 line, -0 lines 0 comments Download

Depends on Patchset:

Messages

Total messages: 11 (4 generated)
msarett
5 years, 4 months ago (2015-08-18 17:21:10 UTC) #2
djsollen
lgtm with comment nit
5 years, 4 months ago (2015-08-18 17:28:32 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1301523005/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1301523005/60001
5 years, 4 months ago (2015-08-18 17:34:42 UTC) #7
commit-bot: I haz the power
Committed patchset #3 (id:60001) as https://skia.googlesource.com/skia/+/f272bb03df9b86e7ea2cf23fb4d5cc56624e0118
5 years, 4 months ago (2015-08-18 17:46:03 UTC) #8
msarett
A revert of this CL (patchset #3 id:60001) has been created in https://codereview.chromium.org/1298223002/ by msarett@google.com. ...
5 years, 4 months ago (2015-08-18 18:36:20 UTC) #9
scroggo
> Update skia to test with libpng to 1.6.10 Nit: I think this description is ...
5 years, 3 months ago (2015-08-26 21:53:32 UTC) #10
scroggo
5 years, 3 months ago (2015-08-27 20:21:51 UTC) #11
On 2015/08/26 21:53:32, scroggo wrote:
> > Update skia to test with libpng to 1.6.10
> 
> Nit: I think this description is a little misleading - this only updates the
> version of libpng used by SkImageDecoder on Android, correct? And it's not
truly
> being updated to 1.6.10; it is being updated to Android's forked version of
> 1.6.10
> 
> On 2015/08/18 18:36:20, msarett wrote:
> > A revert of this CL (patchset #3 id:60001) has been created in
> > https://codereview.chromium.org/1298223002/ by mailto:msarett@google.com.
> > 
> > The reason for reverting is: DM is failing on gm tests on Android bots. 
Cause
> > is not yet clear..
> 
> Any update on this? It looks like from the trybots we're failing all (?)
subset
> decodes, but only on certain devices/builds?
> 
> https://codereview.chromium.org/1301523005/diff/80001/dm/DMSrcSink.cpp
> File dm/DMSrcSink.cpp (right):
> 
>
https://codereview.chromium.org/1301523005/diff/80001/dm/DMSrcSink.cpp#newcode84
> dm/DMSrcSink.cpp:84: SkDebugf("\nCodec %s\n", fPath.c_str());
> I'm guessing we do not want these print statements checked in?
> 
>
https://codereview.chromium.org/1301523005/diff/80001/platform_tools/android/...
> File platform_tools/android/gyp/dependencies.gypi (right):
> 
>
https://codereview.chromium.org/1301523005/diff/80001/platform_tools/android/...
> platform_tools/android/gyp/dependencies.gypi:113: #
> skia/third_party/externals/libpng.
> nit: Can you explain (briefly) why there is a conflict? (I am guessing this is
> temporary, due to the two versions of libpng - the forked version used by
> SkImageDecoder and the version used by SkCodec?)

Some context: Matt wanted to update our tests to test the version of libpng used
by Android (see b/23265085). He figured out why it had to be reverted - due to
name mangling (and lack thereof), one version of libpng (the one used by
SkImageDecoder) was calling into the *other* version of libpng (the one used by
SkCodec, generally). Matt fixed this in a subsequent patch set (4, I think), but
it was still failing. It is failing because of previously unknown bugs in the
version of libpng used by Android.

Since we're actively working to remove the old version, we decided not to follow
through on this update. Closing this issue.

Powered by Google App Engine
This is Rietveld 408576698