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, 3 insertions, 3 deletions

diff --git a/src/sksl/ir/SkSLPostfixExpression.h b/src/sksl/ir/SkSLPostfixExpression.h
index e02555db70..c53f1de507 100644
--- a/src/sksl/ir/SkSLPostfixExpression.h
+++ b/src/sksl/ir/SkSLPostfixExpression.h
@@ -9,7 +9,7 @@
 #define SKSL_POSTFIXEXPRESSION
 
 #include "SkSLExpression.h"
-#include "SkSLToken.h"
+#include "SkSLLexer.h"
 
 namespace SkSL {
 
@@ -18,7 +18,7 @@ namespace SkSL {
  */
 struct PostfixExpression : public Expression {
     PostfixExpression(std::unique_ptr<Expression> operand, Token::Kind op)
-    : INHERITED(operand->fPosition, kPostfix_Kind, operand->fType)
+    : INHERITED(operand->fOffset, kPostfix_Kind, operand->fType)
     , fOperand(std::move(operand))
     , fOperator(op) {}
 
@@ -27,7 +27,7 @@ struct PostfixExpression : public Expression {
     }
 
     String description() const override {
-        return fOperand->description() + Token::OperatorName(fOperator);
+        return fOperand->description() + Compiler::OperatorName(fOperator);
     }
 
     std::unique_ptr<Expression> fOperand;