commit 98e8b6de04e4c20451fbe3353645e3e384a76550
author rileya@google.com <rileya@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 31 20:38:06 2012 +0000
committer rileya@google.com <rileya@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 31 20:38:06 2012 +0000
tree 9624d661efd1ee633ce4d28f1e762ef625c6cf71
parent c41149e6d8b587bb851f9a0d9b2f7bec7f9596c4

Remove old constructors from GrGradientEffect subclasses, and moved their declarations into source files.
Review URL: https://codereview.appspot.com/6449067

git-svn-id: http://skia.googlecode.com/svn/trunk@4870 2bbb7eff-a529-9590-31e7-b0007b416f81

src/effects/gradients/SkSweepGradient.cpp

diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index 963485c..b4e013a 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -39,15 +39,6 @@
     return kSweep_GradientType;
 }
 
-GrCustomStage* SkSweepGradient::asNewCustomStage(GrContext* context,
-    GrSamplerState* sampler) const {
-    sampler->matrix()->preConcat(fPtsToUnit);
-    sampler->textureParams()->setTileModeX(fTileMode);
-    sampler->textureParams()->setTileModeY(kClamp_TileMode);
-    sampler->textureParams()->setBilerp(true);
-    return SkNEW_ARGS(GrSweepGradient, (context, *this, sampler));
-}
-
 SkSweepGradient::SkSweepGradient(SkFlattenableReadBuffer& buffer)
     : INHERITED(buffer),
       fCenter(buffer.readPoint()) {
@@ -390,7 +381,6 @@
 /////////////////////////////////////////////////////////////////////
 
 class GrGLSweepGradient : public GrGLGradientStage {
-
 public:
 
     GrGLSweepGradient(const GrProgramStageFactory& factory,
@@ -412,6 +402,31 @@
 
 };
 
+/////////////////////////////////////////////////////////////////////
+
+class GrSweepGradient : public GrGradientEffect {
+public:
+
+    GrSweepGradient(GrContext* ctx, 
+                    const SkSweepGradient& shader,
+                    GrSamplerState* sampler) 
+    : INHERITED(ctx, shader, sampler) { }
+    virtual ~GrSweepGradient() { }
+
+    static const char* Name() { return "Sweep Gradient"; }
+    virtual const GrProgramStageFactory& getFactory() const SK_OVERRIDE {
+        return GrTProgramStageFactory<GrSweepGradient>::getInstance();
+    }
+
+    typedef GrGLSweepGradient GLProgramStage;
+
+protected:
+
+    typedef GrGradientEffect INHERITED;
+};
+
+/////////////////////////////////////////////////////////////////////
+
 void GrGLSweepGradient::emitFS(GrGLShaderBuilder* builder,
                               const char* outputColor,
                               const char* inputColor,
@@ -424,22 +439,12 @@
 
 /////////////////////////////////////////////////////////////////////
 
-GrSweepGradient::GrSweepGradient(GrTexture* texture)
-    : INHERITED(texture) {
-
-}
-
-GrSweepGradient::GrSweepGradient(GrContext* ctx, 
-                                 const SkSweepGradient& shader,
-                                 GrSamplerState* sampler) 
-                                 : INHERITED(ctx, shader, sampler) {
-}
-
-GrSweepGradient::~GrSweepGradient() {
-
-}
-
-const GrProgramStageFactory& GrSweepGradient::getFactory() const {
-    return GrTProgramStageFactory<GrSweepGradient>::getInstance();
+GrCustomStage* SkSweepGradient::asNewCustomStage(GrContext* context,
+    GrSamplerState* sampler) const {
+    sampler->matrix()->preConcat(fPtsToUnit);
+    sampler->textureParams()->setTileModeX(fTileMode);
+    sampler->textureParams()->setTileModeY(kClamp_TileMode);
+    sampler->textureParams()->setBilerp(true);
+    return SkNEW_ARGS(GrSweepGradient, (context, *this, sampler));
 }