commit 595599f46261225dfc67ab4d91d326e099558239
author Matt Sarett <msarett@google.com> Thu Dec 15 13:05:53 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Dec 16 20:41:36 2016 +0000
tree ba51e94ee340db3eacdf0297df382ce5af221cd4
parent 4cd68653e32928536854769ba132db5b43b5d337

Rearrange ICC profile parsing

None of the small details have changed, just some high level
reorganization:
(1) Check for XYZ spaces before A2B.
(2) If we fail to parse the XYZ space, fallback by trying to
    parse the A2B space.

This should cause no image diffs on Gold.

There is an image from the ICC website that is *supposed* to
test that we parse the A2B tag before the XYZ tag.  Our
behavior on this image will actually not change - the XYZ
tag is invalid (non-D50 matrix), so we fall back to A2B
anyway.  I think this behavior is ok.

BUG:674584

Change-Id: I271fd990937268e03e98f5037a0837a574e775ef
Reviewed-on: https://skia-review.googlesource.com/6143
Reviewed-by: Robert Aftias <raftias@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>

src/core/SkColorSpace_A2B.h

diff --git a/src/core/SkColorSpace_A2B.h b/src/core/SkColorSpace_A2B.h
index 77f1fa2..ed90713 100644
--- a/src/core/SkColorSpace_A2B.h
+++ b/src/core/SkColorSpace_A2B.h
@@ -166,10 +166,10 @@
 
     InputColorFormat inputColorFormat() const { return fInputColorFormat; }
 
-private:
     SkColorSpace_A2B(InputColorFormat inputColorFormat, std::vector<Element> elements, PCS pcs,
                      sk_sp<SkData> profileData);
 
+private:
     InputColorFormat     fInputColorFormat;
     std::vector<Element> fElements;
     PCS                  fPCS;