commit 58d47fa1ec2c2e7dd77ad48194801375275a401c
author Ethan Nicholas <ethannicholas@google.com> Fri Sep 24 09:25:02 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Fri Sep 24 14:23:15 2021 +0000
tree eb95511e12498e9b02f15d4e2b6dd90a4d1e3007
parent 47f76853c6266d02bfc914fe4e8160b60a1f903a

Renamed SkSL "offset" to "line"

https://skia-review.googlesource.com/c/skia/+/451419 changed the meaning
of "offset" throughout SkSL, so that it was actually tracking line
numbers rather than offsets (and thus had a misleading name). This
completes the transition by renaming all of the now-misnamed "offset"
fields, parameters, and variables to "line'.

Bug: skia:12459
Change-Id: I394e6441f6ddfaad6d4098352ba9b1bfeaf273be
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/450644
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>

src/sksl/codegen/SkSLGLSLCodeGenerator.cpp

diff --git a/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp b/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp
index d4479db..257c49c 100644
--- a/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp
@@ -780,7 +780,7 @@
             if (this->caps().fbFetchSupport()) {
                 this->write(this->caps().fbFetchColorName());
             } else {
-                fContext.fErrors->error(ref.fOffset,
+                fContext.fErrors->error(ref.fLine,
                                         "sk_LastFragColor requires framebuffer fetch support");
             }
             break;
@@ -909,12 +909,12 @@
     if (b.getOperator().kind() == Token::Kind::TK_LOGICALAND) {
         this->writeExpression(*b.right(), Precedence::kTernary);
     } else {
-        Literal boolTrue(/*offset=*/-1, /*value=*/1, fContext.fTypes.fBool.get());
+        Literal boolTrue(/*line=*/-1, /*value=*/1, fContext.fTypes.fBool.get());
         this->writeLiteral(boolTrue);
     }
     this->write(" : ");
     if (b.getOperator().kind() == Token::Kind::TK_LOGICALAND) {
-        Literal boolFalse(/*offset=*/-1, /*value=*/0, fContext.fTypes.fBool.get());
+        Literal boolFalse(/*line=*/-1, /*value=*/0, fContext.fTypes.fBool.get());
         this->writeLiteral(boolFalse);
     } else {
         this->writeExpression(*b.right(), Precedence::kTernary);
@@ -1284,8 +1284,8 @@
     if (f.test()) {
         if (this->caps().addAndTrueToLoopCondition()) {
             std::unique_ptr<Expression> and_true(new BinaryExpression(
-                    /*offset=*/-1, f.test()->clone(), Token::Kind::TK_LOGICALAND,
-                    Literal::MakeBool(fContext, /*offset=*/-1, /*value=*/true),
+                    /*line=*/-1, f.test()->clone(), Token::Kind::TK_LOGICALAND,
+                    Literal::MakeBool(fContext, /*line=*/-1, /*value=*/true),
                     fContext.fTypes.fBool.get()));
             this->writeExpression(*and_true, Precedence::kTopLevel);
         } else {
@@ -1356,7 +1356,7 @@
 void GLSLCodeGenerator::writeSwitchStatement(const SwitchStatement& s) {
     if (fProgram.fConfig->strictES2Mode()) {
         // TODO(skia:12450): write switch compatibility code
-        fContext.fErrors->error(s.fOffset, "switch statements are not supported");
+        fContext.fErrors->error(s.fLine, "switch statements are not supported");
     }
 
     this->write("switch (");