1 files changed, 5 insertions, 5 deletions
diff --git a/src/sksl/ir/SkSLBinaryExpression.h b/src/sksl/ir/SkSLBinaryExpression.h
index 789db5783b..c26994edf2 100644
--- a/src/sksl/ir/SkSLBinaryExpression.h
+++ b/src/sksl/ir/SkSLBinaryExpression.h
@@ -11,7 +11,7 @@
 #include "SkSLExpression.h"
 #include "SkSLExpression.h"
 #include "../SkSLIRGenerator.h"
-#include "../SkSLToken.h"
+#include "../SkSLLexer.h"
 
 namespace SkSL {
 
@@ -19,9 +19,9 @@ namespace SkSL {
  * A binary operation.
  */
 struct BinaryExpression : public Expression {
-    BinaryExpression(Position position, std::unique_ptr<Expression> left, Token::Kind op,
+    BinaryExpression(int offset, std::unique_ptr<Expression> left, Token::Kind op,
                      std::unique_ptr<Expression> right, const Type& type)
-    : INHERITED(position, kBinary_Kind, type)
+    : INHERITED(offset, kBinary_Kind, type)
     , fLeft(std::move(left))
     , fOperator(op)
     , fRight(std::move(right)) {}
@@ -34,12 +34,12 @@ struct BinaryExpression : public Expression {
     }
 
     bool hasSideEffects() const override {
-        return Token::IsAssignment(fOperator) || fLeft->hasSideEffects() ||
+        return Compiler::IsAssignment(fOperator) || fLeft->hasSideEffects() ||
                fRight->hasSideEffects();
     }
 
     String description() const override {
-        return "(" + fLeft->description() + " " + Token::OperatorName(fOperator) + " " +
+        return "(" + fLeft->description() + " " + Compiler::OperatorName(fOperator) + " " +
                fRight->description() + ")";
     }