commit 36f7e3298e9d8e21d095197db0ec72c155f7d61f
author Leon Scroggins III <scroggo@google.com> Mon Aug 27 11:55:46 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Aug 27 16:16:14 2018 +0000
tree 2f8a51fcdcfcc3d90016d90850e7ca75397fb0f8
parent 1db86c7cf56c64df2ed42842ef3db49b336ac34d

Reland "Switch SkCodec to use skcms plus fixes""

This reverts commit 83988edfd3256dc822b961362aad7fbc3e0cdabc.

The CTS failure was actually due to another CL.

TBR=brianosman@google.com
TBR=djsollen@google.com

Bug: skia:6839
Bug: skia:8052
Bug: skia:8278
Change-Id: Id9f152ec2c66467d90f49df223cb9b7c168ac2ac
Reviewed-on: https://skia-review.googlesource.com/149483
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 9019cea..3369a9a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -863,6 +863,7 @@
     "src/codec/SkCodec.cpp",
     "src/codec/SkCodecImageGenerator.cpp",
     "src/codec/SkColorTable.cpp",
+    "src/codec/SkEncodedInfo.cpp",
     "src/codec/SkGifCodec.cpp",
     "src/codec/SkMaskSwizzler.cpp",
     "src/codec/SkMasks.cpp",