commit 5b5f096a038259b8d9084834f877588a0db80250
author Ethan Nicholas <ethannicholas@google.com> Mon Sep 11 13:50:14 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Sep 11 21:45:20 2017 +0000
tree 1b78aa591c578a09012b1f8f8533c3fc3d9c1372
parent 9194706e8cf1ed72f07b2ed9207d81120f2135ad

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>

src/sksl/ast/SkSLASTTernaryExpression.h

diff --git a/src/sksl/ast/SkSLASTTernaryExpression.h b/src/sksl/ast/SkSLASTTernaryExpression.h
index 07c9297..35795e9 100644
--- a/src/sksl/ast/SkSLASTTernaryExpression.h
+++ b/src/sksl/ast/SkSLASTTernaryExpression.h
@@ -19,7 +19,7 @@
     ASTTernaryExpression(std::unique_ptr<ASTExpression> test,
                          std::unique_ptr<ASTExpression> ifTrue,
                          std::unique_ptr<ASTExpression> ifFalse)
-    : INHERITED(test->fPosition, kTernary_Kind)
+    : INHERITED(test->fOffset, kTernary_Kind)
     , fTest(std::move(test))
     , fIfTrue(std::move(ifTrue))
     , fIfFalse(std::move(ifFalse)) {}