Move GrProcessorSet into GrPipeline

Change-Id: Ibfa5e1adda3c32140590aa62a31d35654cef79dd
Reviewed-on: https://skia-review.googlesource.com/28187
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

1 files changed, 11 insertions, 3 deletions

diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/GrProcessorSet.h
index e3fe4c64b2..d3aaf6dd61 100644
--- a/src/gpu/GrProcessorSet.h
+++ b/src/gpu/GrProcessorSet.h
@@ -17,15 +17,18 @@
 class GrAppliedClip;
 class GrXPFactory;
 
-class GrProcessorSet : private SkNoncopyable {
+class GrProcessorSet {
 private:
     // Arbitrary constructor arg for empty set and analysis
     enum class Empty { kEmpty };
 
 public:
-    GrProcessorSet(GrPaint&& paint);
-    GrProcessorSet(SkBlendMode mode);
+    GrProcessorSet(GrPaint&&);
+    GrProcessorSet(SkBlendMode);
     GrProcessorSet(sk_sp<GrFragmentProcessor> colorFP);
+    GrProcessorSet(GrProcessorSet&&);
+    GrProcessorSet(const GrProcessorSet&) = delete;
+    GrProcessorSet& operator=(const GrProcessorSet&) = delete;
 
     ~GrProcessorSet();
 
@@ -136,6 +139,7 @@ public:
 
     /** These are valid only for non-LCD coverage. */
     static const GrProcessorSet& EmptySet();
+    static GrProcessorSet MakeEmptySet();
     static constexpr const Analysis EmptySetAnalysis() { return Analysis(Empty::kEmpty); }
 
     SkString dumpProcessors() const;
@@ -151,6 +155,10 @@ private:
     union XP {
         XP(const GrXPFactory* factory) : fFactory(factory) {}
         XP(const GrXferProcessor* processor) : fProcessor(processor) {}
+        explicit XP(XP&& that) : fProcessor(that.fProcessor) {
+            SkASSERT(fProcessor == that.fProcessor);
+            that.fProcessor = nullptr;
+        }
         const GrXPFactory* fFactory;
         const GrXferProcessor* fProcessor;
     };