Miscellaneous color space refactors

src/core/SkColorSpace_Base.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkColorSpace_Base_DEFINED
 #define SkColorSpace_Base_DEFINED
 
@@ skipping 111 matching lines @@
     // sk_malloc_throw and therefore must be sk_freed.  We overload new to
     // also call sk_malloc_throw so that memory can be unconditionally released
     // using sk_free in an overloaded delete. Overloading regular new means we
     // must also overload placement new.
     void* operator new(size_t size) { return sk_malloc_throw(size); }
     void* operator new(size_t, void* p) { return p; }
     void operator delete(void* p) { sk_free(p); }
 };
 
 struct SkColorLookUpTable : public SkRefCnt {
+    static constexpr uint8_t kOutputChannels = 3;
+
     uint8_t                  fInputChannels;

[mtklein, 2016/07/21 19:46:45]

Is this one ever going to be not 3?

[msarett, 2016/07/21 19:49:28]

Once we support CMYK, yes.  That's why I'm letting it live.

-    uint8_t                  fOutputChannels;
     uint8_t                  fGridPoints[3];
-    std::unique_ptr<float[]> fTable;
 
-    SkColorLookUpTable()
-        : fInputChannels(0)
-        , fOutputChannels(0)
-        , fTable(nullptr)
+    const float* table() const {
+        return SkTAddOffset<const float>(this, sizeof(SkColorLookUpTable));
+    }
+
+    SkColorLookUpTable(uint8_t inputChannels, uint8_t gridPoints[3])
+        : fInputChannels(inputChannels)
     {
-        fGridPoints[0] = fGridPoints[1] = fGridPoints[2] = 0;
+        SkASSERT(3 == inputChannels);
+        memcpy(fGridPoints, gridPoints, 3 * sizeof(uint8_t));

[mtklein, 2016/07/21 19:46:45]

a.k.a, 3

[msarett, 2016/07/21 19:49:28]

True.

     }
+
+    // Objects of this type are created in a custom fashion using sk_malloc_throw
+    // and therefore must be sk_freed.
+    void* operator new(size_t size) = delete;
+    void* operator new(size_t, void* p) { return p; }
+    void operator delete(void* p) { sk_free(p); }
 };
 
 class SkColorSpace_Base : public SkColorSpace {
 public:
 
     static sk_sp<SkColorSpace> NewRGB(float gammas[3], const SkMatrix44& toXYZD50);
 
     const SkGammas* gammas() const { return fGammas.get(); }
 
     const SkColorLookUpTable* colorLUT() const { return fColorLUT.get(); }
@@ skipping 27 matching lines @@
 
 static inline const SkColorSpace_Base* as_CSB(const SkColorSpace* colorSpace) {
     return static_cast<const SkColorSpace_Base*>(colorSpace);
 }
 
 static inline SkColorSpace_Base* as_CSB(const sk_sp<SkColorSpace>& colorSpace) {
     return static_cast<SkColorSpace_Base*>(colorSpace.get());
 }
 
 #endif