commit 5dd47e4f1565a0acfe782d442ef2d5e944cc2905
author Leon Scroggins III <scroggo@google.com> Thu Sep 27 15:26:48 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 27 20:08:06 2018 +0000
tree 17ab9d615c694b2c18cf54108bcd18915a77d6fc
parent 84ae6410b909bf3329ad457e59ee735e2e702581

Make SkCodec truly default to sRGB

Remove SkEncodedInfo::ICCProfile::MakeSRGB. Instead of creating
this object whenever there is no encoded color profile, just
treat null as sRGB, like skcms does.

This may help with crbug.com/887372. Regardless it simplifies the
code.

Also fix a bug where SkCodec could have passed a null
skcms_ICCProfile to skcms_ApproximatelyEqualProfiles (related
to b/116608007).

Bug: chromium:887372
Change-Id: I2374e8d8a1aed261f1291b7f6fd6c7ea662f26fd
Reviewed-on: https://skia-review.googlesource.com/157561
Auto-Submit: Leon Scroggins <scroggo@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/codec/SkCodec.cpp

diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp
index 2c5c3df..ecf253f 100644
--- a/src/codec/SkCodec.cpp
+++ b/src/codec/SkCodec.cpp
@@ -624,9 +624,16 @@
     bool needsColorXform = false;
     if (this->usesColorXform() && dstInfo.colorSpace()) {
         dstInfo.colorSpace()->toProfile(&fDstProfile);
-        if (kRGBA_F16_SkColorType == dstInfo.colorType()
-                || !skcms_ApproximatelyEqualProfiles(fEncodedInfo.profile(), &fDstProfile) ) {
+        if (kRGBA_F16_SkColorType == dstInfo.colorType()) {
             needsColorXform = true;
+        } else {
+            const auto* srcProfile = fEncodedInfo.profile();
+            if (!srcProfile) {
+                srcProfile = skcms_sRGB_profile();
+            }
+            if (!skcms_ApproximatelyEqualProfiles(srcProfile, &fDstProfile) ) {
+                needsColorXform = true;
+            }
         }
     }
 
@@ -653,8 +660,8 @@
 }
 
 void SkCodec::applyColorXform(void* dst, const void* src, int count) const {
+    // It is okay for srcProfile to be null. This will use sRGB.
     const auto* srcProfile = fEncodedInfo.profile();
-    SkASSERT(srcProfile);
     SkAssertResult(skcms_Transform(src, fSrcXformFormat, skcms_AlphaFormat_Unpremul, srcProfile,
                                    dst, fDstXformFormat, fDstXformAlphaFormat, &fDstProfile,
                                    count));