SkColorSpace tweaks

include/core/SkColorSpace.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_DEFINED
 #define SkColorSpace_DEFINED
 
 #include "SkMatrix44.h"
 #include "SkRefCnt.h"
-#include "../private/SkTemplates.h"
 
 class SkColorSpace : public SkRefCnt {
 public:
 
     /**
      *  Common, named profiles that we can recognize.
      */
     enum Named {
         kUnknown_Named,
         kSRGB_Named,
         kAdobeRGB_Named,
     };
 
     /**
      *  Create an SkColorSpace from the src gamma and a transform from src gamut to D50 XYZ.
      */
-    static sk_sp<SkColorSpace> NewRGB(float gammas[3], const SkMatrix44& toXYZD50);
+    static sk_sp<SkColorSpace> NewRGB(const float gammas[3], const SkMatrix44& toXYZD50);
 
     /**
      *  Create a common, named SkColorSpace.
      */
     static sk_sp<SkColorSpace> NewNamed(Named);
 
     /**
      *  Create an SkColorSpace from an ICC profile.
      */
     static sk_sp<SkColorSpace> NewICC(const void*, size_t);
@@ skipping 13 matching lines @@
          *  applying the gamma.
          */
         kNonStandard_GammaNamed,
     };
 
     GammaNamed gammaNamed() const { return fGammaNamed; }
 
     /**
      *  Returns the matrix used to transform src gamut to XYZ D50.
      */
-    SkMatrix44 xyz() const { return fToXYZD50; }
+    const SkMatrix44& xyz() const { return fToXYZD50; }
 
 protected:
 
     SkColorSpace(GammaNamed gammaNamed, const SkMatrix44& toXYZD50, Named named);
 
-    const GammaNamed                  fGammaNamed;
-    const SkMatrix44                  fToXYZD50;
-    const Named                       fNamed;
+    const GammaNamed fGammaNamed;
+    const SkMatrix44 fToXYZD50;
+    const Named      fNamed;
 };
 
 #endif