commit 89cfde1dbeae2efeaf79fb44ec3769f3cee15fda
author Ethan Nicholas <ethannicholas@google.com> Mon Sep 27 11:20:34 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Mon Sep 27 19:52:08 2021 +0000
tree 3c5b5db7fd9af525c1ed04203db60698581927cd
parent 5fad2b88491f3ee76f21794f3e5189e111d39cf5

Reland "Renamed SkSL "offset" to "line""

This reverts commit cc91452f0a65f261283615db9ed3d37b1c3acd15.

Change-Id: I7eff0ddeebef4ce298893f9b3ba410b09647e9a4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/453138
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/sksl/dsl/DSLFunction.cpp

diff --git a/src/sksl/dsl/DSLFunction.cpp b/src/sksl/dsl/DSLFunction.cpp
index baf230f..80dc60f 100644
--- a/src/sksl/dsl/DSLFunction.cpp
+++ b/src/sksl/dsl/DSLFunction.cpp
@@ -52,7 +52,7 @@
     SkASSERT(paramVars.size() == params.size());
     fDecl = SkSL::FunctionDeclaration::Convert(DSLWriter::Context(),
                                                *DSLWriter::SymbolTable(),
-                                               pos.offset(),
+                                               pos.line(),
                                                DSLWriter::Modifiers(modifiers.fModifiers),
                                                name == "main" ? name : DSLWriter::Name(name),
                                                std::move(paramVars), &returnType.skslType(),
@@ -67,7 +67,7 @@
         // case the definition is delayed. If we end up defining the function immediately, we'll
         // remove the prototype in define().
         DSLWriter::ProgramElements().push_back(std::make_unique<SkSL::FunctionPrototype>(
-                pos.offset(), fDecl, DSLWriter::IsModule()));
+                pos.line(), fDecl, DSLWriter::IsModule()));
     }
 }
 
@@ -98,7 +98,7 @@
     // Append sk_Position fixup to the bottom of main() if this is a vertex program.
     DSLWriter::IRGenerator().appendRTAdjustFixupToVertexMain(*fDecl, body.get());
     std::unique_ptr<FunctionDefinition> function = FunctionDefinition::Convert(DSLWriter::Context(),
-                                                                               pos.offset(),
+                                                                               pos.line(),
                                                                                *fDecl,
                                                                                std::move(body),
                                                                                /*builtin=*/false);