commit 0a5d096eeba2ea49d64d2ef341e4b6a8ce92af8f
author Ethan Nicholas <ethannicholas@google.com> Wed Oct 14 13:33:18 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 14 18:53:41 2020 +0000
tree a1240e62dd8a75be126dc663fd2b1d9b71563b42
parent 3172208ad0dc7c29f07d907fc050f1d69fc4980e

moved SkSL FunctionDefinition data into IRNode

Change-Id: Ia828de0793ee66301ba315f4593b4d7d69222b4e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/326717
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLDehydrator.cpp

diff --git a/src/sksl/SkSLDehydrator.cpp b/src/sksl/SkSLDehydrator.cpp
index 6bbcfd4..ea36e94 100644
--- a/src/sksl/SkSLDehydrator.cpp
+++ b/src/sksl/SkSLDehydrator.cpp
@@ -529,11 +529,11 @@
         case ProgramElement::Kind::kFunction: {
             const FunctionDefinition& f = e.as<FunctionDefinition>();
             this->writeCommand(Rehydrator::kFunctionDefinition_Command);
-            this->writeU16(this->symbolId(&f.fDeclaration));
-            this->write(f.fBody.get());
-            this->writeU8(f.fReferencedIntrinsics.size());
+            this->writeU16(this->symbolId(&f.declaration()));
+            this->write(f.body().get());
+            this->writeU8(f.referencedIntrinsics().size());
             std::set<uint16_t> ordered;
-            for (const FunctionDeclaration* ref : f.fReferencedIntrinsics) {
+            for (const FunctionDeclaration* ref : f.referencedIntrinsics()) {
                 ordered.insert(this->symbolId(ref));
             }
             for (uint16_t ref : ordered) {