commit d83ded8ff4fc305ab2e5cf7ff28134dd91440f67
author Ethan Nicholas <ethannicholas@google.com> Tue Sep 29 17:05:54 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Sep 30 00:08:08 2020 +0000
tree 9cadb994adaede4ce500a2707793d6bcd36c2afa
parent 4cf00a814f7d8e6428a10441930515f5a6a527e3

Revert "Revert "moved SkSL Enum data into IRNode""

This reverts commit ff22910286a7fe9cdb2476bf2f5261bb93fd614b.

Change-Id: I86619819aae169a2cb8d59ad7ccecf26423f2aa9
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/320764
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Auto-Submit: Ethan Nicholas <ethannicholas@google.com>

src/sksl/SkSLDehydrator.cpp

diff --git a/src/sksl/SkSLDehydrator.cpp b/src/sksl/SkSLDehydrator.cpp
index 551d115..daa23c3 100644
--- a/src/sksl/SkSLDehydrator.cpp
+++ b/src/sksl/SkSLDehydrator.cpp
@@ -510,9 +510,9 @@
         case ProgramElement::Kind::kEnum: {
             const Enum& en = e.as<Enum>();
             this->writeU8(Rehydrator::kEnum_Command);
-            this->write(en.fTypeName);
-            AutoDehydratorSymbolTable symbols(this, en.fSymbols);
-            for (const std::unique_ptr<const Symbol>& s : en.fSymbols->fOwnedSymbols) {
+            this->write(en.typeName());
+            AutoDehydratorSymbolTable symbols(this, en.symbols());
+            for (const std::unique_ptr<const Symbol>& s : en.symbols()->fOwnedSymbols) {
                 SkASSERT(s->kind() == Symbol::Kind::kVariable);
                 Variable& v = (Variable&) *s;
                 SkASSERT(v.fInitialValue);