cc: Add conversion between gfx::ColorSpace and SkColorSpace

ui/gfx/color_space.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/color_space.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/synchronization/lock.h"
+#include "third_party/skia/include/core/SkColorSpace.h"
 #include "ui/gfx/icc_profile.h"
 
 namespace gfx {
 
 ColorSpace::ColorSpace() {
   memset(custom_primary_matrix_, 0, sizeof(custom_primary_matrix_));
 }
 
 ColorSpace::ColorSpace(PrimaryID primaries,
                        TransferID transfer,
@@ skipping 31 matching lines @@
                     MatrixID::SMPTE170M, RangeID::LIMITED);
 }
 
 // static
 ColorSpace ColorSpace::CreateREC709() {
   return ColorSpace(PrimaryID::BT709, TransferID::BT709, MatrixID::BT709,
                     RangeID::LIMITED);
 }
 
 bool ColorSpace::operator==(const ColorSpace& other) const {
-  return primaries_ == other.primaries_ && transfer_ == other.transfer_ &&
-         matrix_ == other.matrix_ && range_ == other.range_;
+  if (primaries_ != other.primaries_ || transfer_ != other.transfer_ ||
+      matrix_ != other.matrix_ || range_ != other.range_)
+    return false;
+  if (primaries_ == PrimaryID::CUSTOM &&
+      memcmp(custom_primary_matrix_, other.custom_primary_matrix_,
+             sizeof(custom_primary_matrix_)))
+    return false;
+  return true;
 }
 
 bool ColorSpace::operator!=(const ColorSpace& other) const {
   return !(*this == other);
 }
 
 bool ColorSpace::operator<(const ColorSpace& other) const {
   if (primaries_ < other.primaries_)
     return true;
   if (primaries_ > other.primaries_)
     return false;
   if (transfer_ < other.transfer_)
     return true;
   if (transfer_ > other.transfer_)
     return false;
   if (matrix_ < other.matrix_)
     return true;
   if (matrix_ > other.matrix_)
     return false;
   if (range_ < other.range_)
     return true;
   if (range_ > other.range_)
-    return true;
-
-  // TODO(hubbe): For "CUSTOM" primaries or tranfer functions, compare their
-  // coefficients here
-
+    return false;
+  if (primaries_ == PrimaryID::CUSTOM) {
+    int primary_result =
+        memcmp(custom_primary_matrix_, other.custom_primary_matrix_,
+               sizeof(custom_primary_matrix_));
+    if (primary_result < 0)
+      return true;
+    if (primary_result > 0)
+      return false;
+  }
   return false;
 }
 
+sk_sp<SkColorSpace> ColorSpace::ToSkColorSpace() const {
+  // Unspecified color spaces are represented as nullptr SkColorSpaces.
+  if (*this == gfx::ColorSpace())

[Justin Novosad, 2016/09/20 19:09:50]

Just checking... in skia, unspecified colorspace means "do not color correct". 
Is this what you want here?

[ccameron, 2016/09/20 19:12:07]

Yes. The default ctor for gfx::ColorSpace also means "do not color correct".

This is the one time when we'll certainly want to return nullptr. In all other
circumstances, nullptr means something went wrong.

+    return nullptr;
+
+  // TODO(crbug.com/634102): Support more than just ICC profile based color
+  // spaces. The DCHECK here is to ensure that callers that expect a valid
+  // result are notified of this incomplete functionality.
+  std::vector<char> icc_data = gfx::ICCProfile::FromColorSpace(*this).GetData();
+  sk_sp<SkColorSpace> result =
+      SkColorSpace::NewICC(icc_data.data(), icc_data.size());
+  DCHECK(result);
+  return result;
+}
+
 }  // namespace gfx