commit 6389bfaa834426daf1d78b9f053b16fbb7e79f87
author Ethan Nicholas <ethannicholas@google.com> Fri Oct 01 16:33:43 2021 -0400
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Mon Oct 04 14:39:51 2021 +0000
tree 53f0e9549fcf6cdbe54542c9681ae30864490967
parent c2a7ae5ade0e1e818fc5197159627772297ea68e

Removed useless modifiersWithDefaults method from DSLParser

This was inherited from SkSLParser, but is never called with anything
other than zero.

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

src/sksl/SkSLDSLParser.cpp

diff --git a/src/sksl/SkSLDSLParser.cpp b/src/sksl/SkSLDSLParser.cpp
index 830bac6..c3cfc32 100644
--- a/src/sksl/SkSLDSLParser.cpp
+++ b/src/sksl/SkSLDSLParser.cpp
@@ -637,7 +637,7 @@
 
 /* modifiers type IDENTIFIER (LBRACKET INT_LITERAL RBRACKET)? */
 skstd::optional<DSLWrapper<DSLParameter>> DSLParser::parameter() {
-    DSLModifiers modifiers = this->modifiersWithDefaults(0);
+    DSLModifiers modifiers = this->modifiers();
     skstd::optional<DSLType> type = this->type(&modifiers);
     if (!type) {
         return skstd::nullopt;
@@ -776,14 +776,6 @@
     return DSLModifiers(std::move(layout), flags);
 }
 
-DSLModifiers DSLParser::modifiersWithDefaults(int defaultFlags) {
-    DSLModifiers result = this->modifiers();
-    if (defaultFlags && !result.flags()) {
-        return DSLModifiers(result.layout(), defaultFlags);
-    }
-    return result;
-}
-
 /* ifStatement | forStatement | doStatement | whileStatement | block | expression */
 DSLStatement DSLParser::statement() {
     Token start = this->nextToken();