Revert "Revert "added GrSkSLFP and converted DitherEffect to use it""

This reverts commit f2030783094e502fb74221077a5ee7cb41287fe4.

Bug: skia:
Change-Id: Icaaa8b3ea652a8f126bfbcc788a360493a7ebe3e
Reviewed-on: https://skia-review.googlesource.com/137391
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

1 files changed, 19 insertions, 2 deletions

diff --git a/src/sksl/ir/SkSLAppendStage.h b/src/sksl/ir/SkSLAppendStage.h
index 87a8210a83..268ae979d2 100644
--- a/src/sksl/ir/SkSLAppendStage.h
+++ b/src/sksl/ir/SkSLAppendStage.h
@@ -23,7 +23,16 @@ struct AppendStage : public Expression {
     , fStage(stage)
     , fArguments(std::move(arguments)) {}
 
-    String description() const {
+    std::unique_ptr<Expression> clone() const override {
+        std::vector<std::unique_ptr<Expression>> cloned;
+        for (const auto& arg : fArguments) {
+            cloned.push_back(arg->clone());
+        }
+        return std::unique_ptr<Expression>(new AppendStage(fOffset, fStage, std::move(cloned),
+                                                           &fType));
+    }
+
+    String description() const override {
         String result = "append(";
         const char* separator = "";
         for (const auto& a : fArguments) {
@@ -35,7 +44,7 @@ struct AppendStage : public Expression {
         return result;
     }
 
-    bool hasSideEffects() const {
+    bool hasSideEffects() const override {
         return true;
     }
 
@@ -44,6 +53,14 @@ struct AppendStage : public Expression {
     std::vector<std::unique_ptr<Expression>> fArguments;
 
     typedef Expression INHERITED;
+
+private:
+    AppendStage(int offset, SkRasterPipeline::StockStage stage,
+                std::vector<std::unique_ptr<Expression>> arguments, const Type* type)
+    : INHERITED(offset, kAppendStage_Kind, *type)
+    , fStage(stage)
+    , fArguments(std::move(arguments)) {}
+
 };
 
 } // namespace