Revert "Re-land sksl fragment processor support"

This reverts commit c070939fd1a954b7a492bc30f0cf64a664b90181.

Reason for revert: 

This has some knock-on effects in the generation of Android.bp from our GN files.  See gn/gn_to_bp.py?  We're seeing things like "tmp/tmpsBVycx/gen/" end up in the include search path in Android.bp, which obviously don't exist there...

Original change's description:
> Re-land sksl fragment processor support
> 
> This reverts commit ed50200682e0de72c3abecaa4d5324ebcd1ed9f9.
> 
> Bug: skia:
> Change-Id: I9caa7454b391450620d6989dc472abb3cf7a2cab
> Reviewed-on: https://skia-review.googlesource.com/20965
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

TBR=benjaminwagner@google.com,ethannicholas@google.com

Change-Id: I502486b5405923b322429219f4cc396a45a14cea
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20990
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

1 files changed, 5 insertions, 16 deletions

diff --git a/src/sksl/SkSLParser.h b/src/sksl/SkSLParser.h
index e820484591..2f55b34986 100644
--- a/src/sksl/SkSLParser.h
+++ b/src/sksl/SkSLParser.h
@@ -13,7 +13,6 @@
 #include <unordered_map>
 #include <unordered_set>
 #include "SkSLErrorReporter.h"
-#include "ir/SkSLLayout.h"
 #include "SkSLToken.h"
 
 struct yy_buffer_state;
@@ -43,6 +42,7 @@ struct ASTSwitchStatement;
 struct ASTType;
 struct ASTWhileStatement;
 struct ASTVarDeclarations;
+struct Layout;
 struct Modifiers;
 class SymbolTable;
 
@@ -64,12 +64,7 @@ public:
 
 private:
     /**
-     * Return the next token, including whitespace tokens, from the parse stream.
-     */
-    Token nextRawToken();
-
-    /**
-     * Return the next non-whitespace token from the parse stream.
+     * Return the next token from the parse stream.
      */
     Token nextToken();
 
@@ -81,7 +76,7 @@ private:
     void pushback(Token t);
 
     /**
-     * Returns the next non-whitespace token without consuming it from the stream.
+     * Returns the next token without consuming it from the stream.
      */
     Token peek();
 
@@ -92,8 +87,8 @@ private:
     bool checkNext(Token::Kind kind, Token* result = nullptr);
 
     /**
-     * Reads the next non-whitespace token and generates an error if it is not the expected type.
-     * The 'expected' string is part of the error message, which reads:
+     * Reads the next token and generates an error if it is not the expected type. The 'expected'
+     * string is part of the error message, which reads:
      *
      * "expected <expected>, but found '<actual text>'"
      *
@@ -120,8 +115,6 @@ private:
 
     std::unique_ptr<ASTDeclaration> directive();
 
-    std::unique_ptr<ASTDeclaration> section();
-
     std::unique_ptr<ASTDeclaration> declaration();
 
     std::unique_ptr<ASTVarDeclarations> varDeclarations();
@@ -138,10 +131,6 @@ private:
 
     int layoutInt();
 
-    String layoutCode();
-
-    Layout::Key layoutKey();
-
     Layout layout();
 
     Modifiers modifiers();