commit 27f06eb8ef4ac6773e09620011baff337f145dee
author Ethan Nicholas <ethannicholas@google.com> Mon Jul 26 16:39:40 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Mon Jul 26 22:41:12 2021 +0000
tree 13e595e3f05eae86fbf9efae2d72cf2c547c83f0
parent 0cb587c0334e99e9360731abc8b419fb8ef64b48

Revert "Revert "Removed name string field from SkSLType""

This reverts commit 917fef7ba76b3f97d98f9bd1f99415a7e2710033.

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

src/sksl/SkSLParser.cpp

diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp
index 114b287..9936d25 100644
--- a/src/sksl/SkSLParser.cpp
+++ b/src/sksl/SkSLParser.cpp
@@ -494,8 +494,7 @@
                     "struct '" + this->text(name) + "' must contain at least one field");
         return ASTNode::ID::Invalid();
     }
-    std::unique_ptr<Type> newType = Type::MakeStructType(name.fOffset, String(this->text(name)),
-                                                         fields);
+    std::unique_ptr<Type> newType = Type::MakeStructType(name.fOffset, this->text(name), fields);
     if (struct_is_too_deeply_nested(*newType, kMaxStructDepth)) {
         this->error(name.fOffset, "struct '" + this->text(name) + "' is too deeply nested");
         return ASTNode::ID::Invalid();