SkColorSpace tweaks

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
 
 #include "SkColorSpace.h"
+#include "SkTemplates.h"
 
 struct SkGammaCurve {
     bool isValue() const {
         bool result = (0.0f != fValue);
         SkASSERT(!result || (0 == fTableSize));
         SkASSERT(!result || (0.0f == fG));
         return result;
     }
 
     bool isTable() const {
@@ skipping 84 matching lines @@
     std::unique_ptr<float[]> fTable;
 
     SkColorLookUpTable() {
         memset(this, 0, sizeof(struct SkColorLookUpTable));
     }
 };
 
 class SkColorSpace_Base : public SkColorSpace {
 public:
 
-    SkGammas* gammas() const { return fGammas.get(); }
+    const sk_sp<SkGammas>& gammas() const { return fGammas; }
 
 private:
 
     SkColorSpace_Base(sk_sp<SkGammas> gammas, const SkMatrix44& toXYZ, Named);
 
     SkColorSpace_Base(sk_sp<SkGammas> gammas, GammaNamed gammaNamed, const SkMatrix44& toXYZ,
                       Named);
 
     SkColorSpace_Base(SkColorLookUpTable* colorLUT, sk_sp<SkGammas> gammas,
                       const SkMatrix44& toXYZ);
 
     SkAutoTDelete<SkColorLookUpTable> fColorLUT;
     sk_sp<SkGammas>                   fGammas;
 
     friend class SkColorSpace;
     typedef SkColorSpace INHERITED;
 };
 
 static inline SkColorSpace_Base* as_CSB(SkColorSpace* colorSpace) {
     return static_cast<SkColorSpace_Base*>(colorSpace);
 }
 
 static inline SkColorSpace_Base* as_CSB(const sk_sp<SkColorSpace>& colorSpace) {
     return static_cast<SkColorSpace_Base*>(colorSpace.get());
 }
 
 #endif