Enable flattening and unflattening of SkColorSpace

src/core/SkColorSpace.cpp

Index: src/core/SkColorSpace.cpp
diff --git a/src/core/SkColorSpace.cpp b/src/core/SkColorSpace.cpp
index 5df45fff4126d7e9a08a1251e9b9cde029ae7de8..2f2e36f98e39612bce7a5d978735e472ccba4c35 100644
--- a/src/core/SkColorSpace.cpp
+++ b/src/core/SkColorSpace.cpp
@@ -9,6 +9,8 @@
 #include "SkColorSpace_Base.h"
 #include "SkEndian.h"
 #include "SkOnce.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
 
 #define SkColorSpacePrintf(...)
 
@@ -24,11 +26,10 @@ SkColorSpace::SkColorSpace(GammaNamed gammaNamed, const SkMatrix44& toXYZD50, Na
     , fNamed(named)
 {}
 
-SkColorSpace_Base::SkColorSpace_Base(GammaNamed gammaNamed, const SkMatrix44& toXYZD50, Named named,
-                                     sk_sp<SkData> profileData)
+SkColorSpace_Base::SkColorSpace_Base(GammaNamed gammaNamed, const SkMatrix44& toXYZD50, Named named)
     : INHERITED(gammaNamed, toXYZD50, named)
     , fGammas(nullptr)
-    , fProfileData(std::move(profileData))
+    , fProfileData(nullptr)

[msarett, 2016/06/20 22:41:59]

The decision here is to only hold onto the profile data if we'll need it to
flatten the SkColorSpace object...

 {}
 
 SkColorSpace_Base::SkColorSpace_Base(SkColorLookUpTable* colorLUT, sk_sp<SkGammas> gammas,
@@ -102,11 +103,10 @@ sk_sp<SkColorSpace> SkColorSpace_Base::NewRGB(float values[3], const SkMatrix44&
         return sk_sp<SkColorSpace>(new SkColorSpace_Base(nullptr, gammas, toXYZD50, nullptr));
     }
 
-    return SkColorSpace_Base::NewRGB(gammaNamed, toXYZD50, nullptr);
+    return SkColorSpace_Base::NewRGB(gammaNamed, toXYZD50);
 }
 
-sk_sp<SkColorSpace> SkColorSpace_Base::NewRGB(GammaNamed gammaNamed, const SkMatrix44& toXYZD50,
-                                              sk_sp<SkData> profileData) {
+sk_sp<SkColorSpace> SkColorSpace_Base::NewRGB(GammaNamed gammaNamed, const SkMatrix44& toXYZD50) {
     switch (gammaNamed) {
         case kSRGB_GammaNamed:
             if (xyz_almost_equal(toXYZD50, gSRGB_toXYZD50)) {
@@ -125,12 +125,11 @@ sk_sp<SkColorSpace> SkColorSpace_Base::NewRGB(GammaNamed gammaNamed, const SkMat
             break;
     }
 
-    return sk_sp<SkColorSpace>(new SkColorSpace_Base(gammaNamed, toXYZD50, kUnknown_Named,
-                                                     profileData));
+    return sk_sp<SkColorSpace>(new SkColorSpace_Base(gammaNamed, toXYZD50, kUnknown_Named));
 }
 
 sk_sp<SkColorSpace> SkColorSpace::NewRGB(GammaNamed gammaNamed, const SkMatrix44& toXYZD50) {
-    return SkColorSpace_Base::NewRGB(gammaNamed, toXYZD50, nullptr);
+    return SkColorSpace_Base::NewRGB(gammaNamed, toXYZD50);
 }
 
 sk_sp<SkColorSpace> SkColorSpace::NewNamed(Named named) {
@@ -144,7 +143,7 @@ sk_sp<SkColorSpace> SkColorSpace::NewNamed(Named named) {
             sRGBOnce([] {
                 SkMatrix44 srgbToxyzD50(SkMatrix44::kUninitialized_Constructor);
                 srgbToxyzD50.set3x3ColMajorf(gSRGB_toXYZD50);
-                sRGB = new SkColorSpace_Base(kSRGB_GammaNamed, srgbToxyzD50, kSRGB_Named, nullptr);
+                sRGB = new SkColorSpace_Base(kSRGB_GammaNamed, srgbToxyzD50, kSRGB_Named);
             });
             return sk_ref_sp(sRGB);
         }
@@ -153,7 +152,7 @@ sk_sp<SkColorSpace> SkColorSpace::NewNamed(Named named) {
                 SkMatrix44 adobergbToxyzD50(SkMatrix44::kUninitialized_Constructor);
                 adobergbToxyzD50.set3x3ColMajorf(gAdobeRGB_toXYZD50);
                 adobeRGB = new SkColorSpace_Base(k2Dot2Curve_GammaNamed, adobergbToxyzD50,
-                                                 kAdobeRGB_Named, nullptr);
+                                                 kAdobeRGB_Named);
             });
             return sk_ref_sp(adobeRGB);
         }
@@ -930,7 +929,7 @@ sk_sp<SkColorSpace> SkColorSpace::NewICC(const void* input, size_t len) {
                     return sk_sp<SkColorSpace>(new SkColorSpace_Base(nullptr, std::move(gammas),
                                                                      mat, std::move(data)));
                 } else {
-                    return SkColorSpace_Base::NewRGB(gammaNamed, mat, std::move(data));
+                    return SkColorSpace_Base::NewRGB(gammaNamed, mat);
                 }
             }
 
@@ -955,7 +954,7 @@ sk_sp<SkColorSpace> SkColorSpace::NewICC(const void* input, size_t len) {
                                                                      std::move(gammas), toXYZ,
                                                                      std::move(data)));
                 } else {
-                    return SkColorSpace_Base::NewRGB(gammaNamed, toXYZ, std::move(data));
+                    return SkColorSpace_Base::NewRGB(gammaNamed, toXYZ);
                 }
             }
         }
@@ -1208,3 +1207,101 @@ sk_sp<SkData> SkColorSpace_Base::writeToICC() const {
     //                 the client calls again?
     return SkData::MakeFromMalloc(profile.release(), kICCProfileSize);
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+static void write_matrix(SkWriteBuffer& buffer, const SkMatrix44& matrix) {
+    buffer.writeScalar(matrix.getFloat(0, 0));
+    buffer.writeScalar(matrix.getFloat(0, 1));
+    buffer.writeScalar(matrix.getFloat(0, 2));
+    buffer.writeScalar(matrix.getFloat(0, 3));
+    buffer.writeScalar(matrix.getFloat(1, 0));
+    buffer.writeScalar(matrix.getFloat(1, 1));
+    buffer.writeScalar(matrix.getFloat(1, 2));
+    buffer.writeScalar(matrix.getFloat(1, 3));
+    buffer.writeScalar(matrix.getFloat(2, 0));
+    buffer.writeScalar(matrix.getFloat(2, 1));
+    buffer.writeScalar(matrix.getFloat(2, 2));
+    buffer.writeScalar(matrix.getFloat(2, 3));
+    buffer.writeScalar(matrix.getFloat(3, 0));
+    buffer.writeScalar(matrix.getFloat(3, 1));
+    buffer.writeScalar(matrix.getFloat(3, 2));
+    buffer.writeScalar(matrix.getFloat(3, 3));
+}
+
+void SkColorSpace::flatten(SkWriteBuffer& buffer) const {
+    // If we have a named profile, only write the enum.
+    switch (fNamed) {
+        case kSRGB_Named:
+        case kAdobeRGB_Named:
+            buffer.writeInt(fNamed);
+            return;
+        default:
+            buffer.writeInt(fNamed);
+            break;
+    }
+
+    // If we have a named gamma, write the enum and the matrix.
+    switch (fGammaNamed) {
+        case kSRGB_GammaNamed:
+        case k2Dot2Curve_GammaNamed:
+        case kLinear_GammaNamed:
+            buffer.writeInt(fGammaNamed);
+            write_matrix(buffer, fToXYZD50);
+            return;
+        default:
+            buffer.writeInt(fGammaNamed);
+            break;
+    }
+
+    // If we do not have a named gamma, this must have been created from an ICC profile.
+    // Since we were unable to recognize the gamma, we will have saved the ICC data.
+    SkASSERT(as_CSB(this)->fProfileData);
+    buffer.writeDataAsByteArray(as_CSB(this)->fProfileData.get());
+}
+
+static void read_matrix(SkReadBuffer& buffer, SkMatrix44* matrix) {
+    matrix->setFloat(0, 0, buffer.readScalar());
+    matrix->setFloat(0, 1, buffer.readScalar());
+    matrix->setFloat(0, 2, buffer.readScalar());
+    matrix->setFloat(0, 3, buffer.readScalar());
+    matrix->setFloat(1, 0, buffer.readScalar());
+    matrix->setFloat(1, 1, buffer.readScalar());
+    matrix->setFloat(1, 2, buffer.readScalar());
+    matrix->setFloat(1, 3, buffer.readScalar());
+    matrix->setFloat(2, 0, buffer.readScalar());
+    matrix->setFloat(2, 1, buffer.readScalar());
+    matrix->setFloat(2, 2, buffer.readScalar());
+    matrix->setFloat(2, 3, buffer.readScalar());
+    matrix->setFloat(3, 0, buffer.readScalar());
+    matrix->setFloat(3, 1, buffer.readScalar());
+    matrix->setFloat(3, 2, buffer.readScalar());
+    matrix->setFloat(3, 3, buffer.readScalar());
+}
+
+sk_sp<SkFlattenable> SkColorSpace::CreateProc(SkReadBuffer& buffer) {
+    Named named = (Named) buffer.readInt();
+    switch (named) {
+        case kSRGB_Named:
+        case kAdobeRGB_Named:
+            return NewNamed(named);
+        default:
+            break;
+    }
+
+    GammaNamed gammaNamed = (GammaNamed) buffer.readInt();
+    switch (gammaNamed) {
+        case kSRGB_GammaNamed:
+        case k2Dot2Curve_GammaNamed:
+        case kLinear_GammaNamed: {
+            SkMatrix44 toXYZ(SkMatrix44::kUninitialized_Constructor);
+            read_matrix(buffer, &toXYZ);
+            return NewRGB(gammaNamed, toXYZ);
+        }
+        default:
+            break;
+    }
+
+    sk_sp<SkData> data = buffer.readByteArrayAsData();
+    return NewICC(data->data(), data->size());
+}