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, 5 insertions, 5 deletions

diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 77f86c5ea4..b4225db0b4 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -43,8 +43,8 @@ protected:
         this->setBounds(rect, HasAABloat::kYes, IsZeroArea::kNo);
     }
 
-    const GrPipeline* makePipeline(Target* target) const {
-        return target->makePipeline(0, &fProcessorSet);
+    const GrPipeline* makePipeline(Target* target) {
+        return target->makePipeline(0, std::move(fProcessorSet));
     }
 
     const GrGeometryProcessor* gp() const { return fGeometryProcessor.get(); }
@@ -78,7 +78,7 @@ private:
     BezierCubicTestOp(sk_sp<GrGeometryProcessor> gp, const SkRect& rect, GrColor color)
             : INHERITED(std::move(gp), rect, color, ClassID()) {}
 
-    void onPrepareDraws(Target* target) const override {
+    void onPrepareDraws(Target* target) override {
         QuadHelper helper;
         size_t vertexStride = this->gp()->getVertexStride();
         SkASSERT(vertexStride == sizeof(SkPoint));
@@ -253,7 +253,7 @@ private:
         float   fKLM[4]; // The last value is ignored. The effect expects a vec4f.
     };
 
-    void onPrepareDraws(Target* target) const override {
+    void onPrepareDraws(Target* target) override {
         QuadHelper helper;
         size_t vertexStride = this->gp()->getVertexStride();
         SkASSERT(vertexStride == sizeof(Vertex));
@@ -467,7 +467,7 @@ private:
         float   fKLM[4]; // The last value is ignored. The effect expects a vec4f.
     };
 
-    void onPrepareDraws(Target* target) const override {
+    void onPrepareDraws(Target* target) override {
         QuadHelper helper;
         size_t vertexStride = this->gp()->getVertexStride();
         SkASSERT(vertexStride == sizeof(Vertex));