Bundle SkShader::asFragmentProcessor arguments in a struct

include/core/SkShader.h

Index: include/core/SkShader.h
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 1f80ea1c09e7c1d596bfd7b626dbb1a3b128ec4a..5301f46a0ab8bede92f4eb138bee1f7fe15856c3 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -311,6 +311,25 @@ public:
     virtual bool asACompose(ComposeRec*) const { return false; }
 
 #if SK_SUPPORT_GPU
+    struct AsFPArgs {
+        AsFPArgs(GrContext* context,
+                 const SkMatrix* viewMatrix,
+                 const SkMatrix* localMatrix,
+                 SkFilterQuality filterQuality,
+                 SkSourceGammaTreatment gammaTreatment)
+            : fContext(context)
+            , fViewMatrix(viewMatrix)
+            , fLocalMatrix(localMatrix)
+            , fFilterQuality(filterQuality)
+            , fGammaTreatment(gammaTreatment) {}
+
+        GrContext*             fContext;
+        const SkMatrix*        fViewMatrix;

[Brian Osman, 2016/07/22 17:19:26]

This is the only (slightly) interesting change - we used to take viewmatrix by
const&, and localmatrix by pointer (due to required/optional). But it seems like
we really shy away from storing refs inside structs/classes, and I didn't want
to be copying the view matrix by value, so I converted them both to pointers.
That leads to some de-referencing in the implementation of asFP...

[egdaniel, 2016/07/22 17:27:59]

personally I think the use of a ref in this use case is fine, but either is fine
with me. I'll let someone who cares more make the decision.

[bsalomon, 2016/07/22 17:38:11]

I'm not opposed to ref but I think ptr is more consistent with how other similar
args struct work (e.g. path renderers).

+        const SkMatrix*        fLocalMatrix;
+        SkFilterQuality        fFilterQuality;
+        SkSourceGammaTreatment fGammaTreatment;
+    };
+
     /**
      *  Returns a GrFragmentProcessor that implements the shader for the GPU backend. NULL is
      *  returned if there is no GPU implementation.
@@ -324,11 +343,7 @@ public:
      *  The returned GrFragmentProcessor should expect an unpremultiplied input color and
      *  produce a premultiplied output.
      */
-    virtual sk_sp<GrFragmentProcessor> asFragmentProcessor(GrContext*,
-                                                           const SkMatrix& viewMatrix,
-                                                           const SkMatrix* localMatrix,
-                                                           SkFilterQuality,
-                                                           SkSourceGammaTreatment) const;
+    virtual sk_sp<GrFragmentProcessor> asFragmentProcessor(const AsFPArgs&) const;
 #endif
 
     /**