rename inner AsFPArgs to stand-alone GrFPArgs

This prepares us to share this with other effects (most notably maskfilters)

Bug: skia:
Change-Id: I12530fdf10c4e5f2a9ab6d394bf9e87c54ea60c4
Reviewed-on: https://skia-review.googlesource.com/97062
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

1 files changed, 5 insertions, 21 deletions

diff --git a/src/shaders/SkShaderBase.h b/src/shaders/SkShaderBase.h
index 85c08fe75d..8831878602 100644
--- a/src/shaders/SkShaderBase.h
+++ b/src/shaders/SkShaderBase.h
@@ -12,6 +12,10 @@
 #include "SkMatrix.h"
 #include "SkShader.h"
 
+#if SK_SUPPORT_GPU
+#include "GrFPArgs.h"
+#endif
+
 class GrContext;
 class GrColorSpaceInfo;
 class GrFragmentProcessor;
@@ -135,26 +139,6 @@ public:
     Context* makeBurstPipelineContext(const ContextRec&, SkArenaAlloc*) const;
 
 #if SK_SUPPORT_GPU
-    struct AsFPArgs {
-        AsFPArgs() {}
-        AsFPArgs(GrContext* context,
-                 const SkMatrix* viewMatrix,
-                 const SkMatrix* localMatrix,
-                 SkFilterQuality filterQuality,
-                 const GrColorSpaceInfo* dstColorSpaceInfo)
-                : fContext(context)
-                , fViewMatrix(viewMatrix)
-                , fLocalMatrix(localMatrix)
-                , fFilterQuality(filterQuality)
-                , fDstColorSpaceInfo(dstColorSpaceInfo) {}
-
-        GrContext* fContext;
-        const SkMatrix* fViewMatrix;
-        const SkMatrix* fLocalMatrix;
-        SkFilterQuality fFilterQuality;
-        const GrColorSpaceInfo* fDstColorSpaceInfo;
-    };
-
     /**
      *  Returns a GrFragmentProcessor that implements the shader for the GPU backend. NULL is
      *  returned if there is no GPU implementation.
@@ -168,7 +152,7 @@ public:
      *  The returned GrFragmentProcessor should expect an unpremultiplied input color and
      *  produce a premultiplied output.
      */
-    virtual std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const AsFPArgs&) const;
+    virtual std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const;
 #endif
 
     /**