tree 2c5ba94c6807c94d575d3c70fd3cfdd9b2cf10fb
parent 81e7bf8d6d338d944f3c5075b14c21580398aeb6
author Leon Scroggins III <scroggo@google.com> 1506969428 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> 1507057507 +0000

Bring android/o-mr1-release up to date for HEIF

Bug: b/65262488
This cherry-picks 3 commits:
========================================================================
skia: add heif decoding support -- DO NOT MERGE

Cherry-picked from https://skia-review.googlesource.com/c/35701 in skia.

Change-Id: Id9cbe6a463384ce6a0b57a32a4ba881968fe32bb
========================================================================
Initialize the swizzler if there is a subset -- DO NOT MERGE

Reviewed-on: https://skia-review.googlesource.com/37680
Change-Id: Ic6bef3f63bcda24fc3d88ce0cdcf1216441faa40
========================================================================
Use kIgnore blend behavior when encoding JPEG

Cherry-pick from upstream bb3dc768fd57956feb3947991011052b034dcb7a

This looks to have been an oversight - encoding PNG and WEBP both use
kIgnore when called through this interface.

No-Tree-Checks: true
No-Try: true
No-Presubmit: true
Change-Id: I23ba02f979210087808ee2da026a2ca0269e0fb4
Reviewed-On: https://skia-review.googlesource.com/43261
Reviewed-By: Brian Osman <brianosman@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-on: https://skia-review.googlesource.com/53902
Reviewed-by: Derek Sollenberger <djsollen@google.com>