clean up SkShader friends

Many SkShader subclasses are only friends to use makeColorSpace().

Our usual solution to this is to add a method on SkColorSpaceXformer
that calls makeColorSpace() for us, so that only SkColorSpaceXformer
needs to be a friend.

Just a refactor.  No image diffs.

Change-Id: Icf952b739edf45f2fb8c0c35e353ef2866f4c5cc
Reviewed-on: https://skia-review.googlesource.com/16370
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

1 files changed, 4 insertions, 9 deletions

diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 4749dc77af..cee7933d67 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -511,17 +511,12 @@ protected:
     }
 
 private:
-    // This is essentially const, but not officially so it can be modified in
-    // constructors.
+    // This is essentially const, but not officially so it can be modified in constructors.
     SkMatrix fLocalMatrix;
 
-    // So the SkLocalMatrixShader can whack fLocalMatrix in its SkReadBuffer constructor.
-    friend class SkLocalMatrixShader;
-    friend class SkBitmapProcLegacyShader;    // for computeTotalInverse()
-    friend class SkComposeShader;
-    friend class SkColorFilterShader;
-    friend class SkColorSpaceXformer;
-    friend class SkLightingShaderImpl;
+    friend class SkLocalMatrixShader;         // sets fLocalMatrix in SkReadBuffer constructor
+    friend class SkBitmapProcLegacyShader;    // calls computeTotalInverse()
+    friend class SkColorSpaceXformer;         // calls makeColorSpace()
 
     typedef SkFlattenable INHERITED;
 };