Another trivial cleanup

TBR=bsalomon@google.com
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/52e7657cd850f95e66eb23c6d138ee45149a1039

Review URL: https://codereview.chromium.org/1229303003

5 files changed, 12 insertions, 41 deletions

diff --git a/src/gpu/GrPendingFragmentStage.h b/src/gpu/GrPendingFragmentStage.h
index 0bf984ab7d..dfa5688663 100644
--- a/src/gpu/GrPendingFragmentStage.h
+++ b/src/gpu/GrPendingFragmentStage.h
@@ -5,49 +5,23 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrPendingProcessorStage_DEFINED
-#define GrPendingProcessorStage_DEFINED
+#ifndef GrPendingFragmentStage_DEFINED
+#define GrPendingFragmentStage_DEFINED
 
-#include "GrFragmentStage.h"
-#include "GrCoordTransform.h"
-#include "GrFragmentProcessor.h"
+#include "GrStagedProcessor.h"
 #include "GrPendingProgramElement.h"
 
 /**
- * This a baked variant of GrFragmentStage, as recorded in GrOptDrawState.
+ * This a baked variant of GrFragmentStage, as recorded in GrPipeline
  */
-class GrPendingFragmentStage {
+class GrPendingFragmentStage : public GrStagedProcessor<GrPendingProgramElement> {
 public:
-    GrPendingFragmentStage(const GrFragmentStage& stage) : fProc(stage.processor()) {}
-
-    GrPendingFragmentStage(const GrPendingFragmentStage& that) { *this = that; }
-
-    GrPendingFragmentStage& operator=(const GrPendingFragmentStage& that) {
-        fProc.reset(that.fProc.get());
-        return *this;
-    }
-
-    bool operator==(const GrPendingFragmentStage& that) const {
-        return this->processor()->isEqual(*that.processor());
-    }
-
-    bool operator!=(const GrPendingFragmentStage& that) const { return !(*this == that); }
-
-    /**
-     * For a coord transform on the fragment processor, does it or the coord change matrix (if
-     * relevant) contain perspective?
-     */
-    bool isPerspectiveCoordTransform(int matrixIndex) const {
-        const GrCoordTransform& coordTransform = this->processor()->coordTransform(matrixIndex);
-        uint32_t type = coordTransform.getMatrix().getType();
-        return SkToBool(SkMatrix::kPerspective_Mask & type);
+    GrPendingFragmentStage(const GrFragmentStage& stage) {
+        INHERITED::fProc.reset(stage.processor());
     }
 
-    const char* name() const { return fProc->name(); }
-
-    const GrFragmentProcessor* processor() const { return fProc.get(); }
-
-protected:
-    GrPendingProgramElement<const GrFragmentProcessor>  fProc;
+private:
+    typedef GrStagedProcessor<GrPendingProgramElement> INHERITED;
 };
+
 #endif
diff --git a/src/gpu/GrPipelineBuilder.h b/src/gpu/GrPipelineBuilder.h
index dd3db6e092..209845461d 100644
--- a/src/gpu/GrPipelineBuilder.h
+++ b/src/gpu/GrPipelineBuilder.h
@@ -12,7 +12,7 @@
 #include "GrCaps.h"
 #include "GrClip.h"
 #include "GrGpuResourceRef.h"
-#include "GrFragmentStage.h"
+#include "GrStagedProcessor.h"
 #include "GrProcOptInfo.h"
 #include "GrProcessorDataManager.h"
 #include "GrRenderTarget.h"
diff --git a/src/gpu/GrProcOptInfo.cpp b/src/gpu/GrProcOptInfo.cpp
index dc499fa337..53f2e02451 100644
--- a/src/gpu/GrProcOptInfo.cpp
+++ b/src/gpu/GrProcOptInfo.cpp
@@ -8,8 +8,6 @@
 #include "GrProcOptInfo.h"
 
 #include "GrBatch.h"
-#include "GrFragmentProcessor.h"
-#include "GrFragmentStage.h"
 #include "GrGeometryProcessor.h"
 
 void GrProcOptInfo::calcColorWithBatch(const GrBatch* batch,
diff --git a/src/gpu/GrProcOptInfo.h b/src/gpu/GrProcOptInfo.h
index f518172e22..0430916405 100644
--- a/src/gpu/GrProcOptInfo.h
+++ b/src/gpu/GrProcOptInfo.h
@@ -10,9 +10,9 @@
 
 #include "GrColor.h"
 #include "GrInvariantOutput.h"
+#include "GrStagedProcessor.h"
 
 class GrBatch;
-class GrFragmentStage;
 class GrFragmentProcessor;
 class GrPrimitiveProcessor;
 class GrProcessor;
diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h
index f00a284177..d87d009469 100644
--- a/src/gpu/effects/GrConfigConversionEffect.h
+++ b/src/gpu/effects/GrConfigConversionEffect.h
@@ -10,7 +10,6 @@
 
 #include "GrSingleTextureEffect.h"
 
-class GrFragmentStage;
 class GrInvariantOutput;
 
 /**