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>

gn/sksl.gni

diff --git a/gn/sksl.gni b/gn/sksl.gni
index c1b6aba..65913e3 100644
--- a/gn/sksl.gni
+++ b/gn/sksl.gni
@@ -9,15 +9,16 @@
 skia_sksl_sources = [
   "$_src/sksl/SkSLCFGGenerator.cpp",
   "$_src/sksl/SkSLCompiler.cpp",
-  "$_src/sksl/SkSLIRGenerator.cpp",
-  "$_src/sksl/SkSLParser.cpp",
   "$_src/sksl/SkSLCPPCodeGenerator.cpp",
-  "$_src/sksl/SkSLHCodeGenerator.cpp",
   "$_src/sksl/SkSLGLSLCodeGenerator.cpp",
+  "$_src/sksl/SkSLHCodeGenerator.cpp",
+  "$_src/sksl/SkSLIRGenerator.cpp",
+  "$_src/sksl/SkSLLexer.cpp",
+  "$_src/sksl/SkSLLayoutLexer.cpp",
+  "$_src/sksl/SkSLParser.cpp",
   "$_src/sksl/SkSLSPIRVCodeGenerator.cpp",
   "$_src/sksl/SkSLString.cpp",
   "$_src/sksl/SkSLUtil.cpp",
-  "$_src/sksl/lex.layout.cpp",
   "$_src/sksl/ir/SkSLSymbolTable.cpp",
   "$_src/sksl/ir/SkSLSetting.cpp",
   "$_src/sksl/ir/SkSLType.cpp",