Revert "Revert "Switch to the new SkSL lexer.""

This reverts commit 358515491a0d6891e6a709688a30ad087df1beb1.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/sksl/ast/SkSLASTFunction.h b/src/sksl/ast/SkSLASTFunction.h
index 36d8a3af9f..4fa2482d8b 100644
--- a/src/sksl/ast/SkSLASTFunction.h
+++ b/src/sksl/ast/SkSLASTFunction.h
@@ -19,13 +19,13 @@ namespace SkSL {
  * A function declaration or definition. The fBody field will be null for declarations.
  */
 struct ASTFunction : public ASTDeclaration {
-    ASTFunction(Position position, Modifiers modifiers,  std::unique_ptr<ASTType> returnType,
-                String name, std::vector<std::unique_ptr<ASTParameter>> parameters,
+    ASTFunction(int offset, Modifiers modifiers,  std::unique_ptr<ASTType> returnType,
+                StringFragment name, std::vector<std::unique_ptr<ASTParameter>> parameters,
                 std::unique_ptr<ASTBlock> body)
-    : INHERITED(position, kFunction_Kind)
+    : INHERITED(offset, kFunction_Kind)
     , fModifiers(modifiers)
     , fReturnType(std::move(returnType))
-    , fName(std::move(name))
+    , fName(name)
     , fParameters(std::move(parameters))
     , fBody(std::move(body)) {}
 
@@ -47,7 +47,7 @@ struct ASTFunction : public ASTDeclaration {
 
     const Modifiers fModifiers;
     const std::unique_ptr<ASTType> fReturnType;
-    const String fName;
+    const StringFragment fName;
     const std::vector<std::unique_ptr<ASTParameter>> fParameters;
     const std::unique_ptr<ASTBlock> fBody;