diff options
author | 2017-03-30 13:45:54 -0400 | |
---|---|---|
committer | 2017-03-30 18:28:47 +0000 | |
commit | 7833466da45bfa1e078427c4a6db94d41c5c1535 (patch) | |
tree | d3bb49ba327f0bc3cb5cafe52d992702828031b2 /src/sksl/ast/SkSLASTVarDeclaration.h | |
parent | cdc651d29d88e87ef84d5a586879db2c16ff4579 (diff) |
skslc can now be compiled with no Skia dependencies, in preparation for
its eventual role in Skia's build process.
Bug: skia:
Change-Id: Iaa9933f4fc4a64bec60aa897c509a3513f457a78
Reviewed-on: https://skia-review.googlesource.com/10282
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'src/sksl/ast/SkSLASTVarDeclaration.h')
-rw-r--r-- | src/sksl/ast/SkSLASTVarDeclaration.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sksl/ast/SkSLASTVarDeclaration.h b/src/sksl/ast/SkSLASTVarDeclaration.h index 7d50a06a50..2dcb9787ea 100644 --- a/src/sksl/ast/SkSLASTVarDeclaration.h +++ b/src/sksl/ast/SkSLASTVarDeclaration.h @@ -22,15 +22,15 @@ namespace SkSL { * instances. */ struct ASTVarDeclaration { - ASTVarDeclaration(const SkString name, + ASTVarDeclaration(const String name, std::vector<std::unique_ptr<ASTExpression>> sizes, std::unique_ptr<ASTExpression> value) : fName(name) , fSizes(std::move(sizes)) , fValue(std::move(value)) {} - SkString description() const { - SkString result = fName; + String description() const { + String result = fName; for (const auto& size : fSizes) { if (size) { result += "[" + size->description() + "]"; @@ -44,7 +44,7 @@ struct ASTVarDeclaration { return result; } - SkString fName; + String fName; // array sizes, if any. e.g. 'foo[3][]' has sizes [3, null] std::vector<std::unique_ptr<ASTExpression>> fSizes; @@ -65,9 +65,9 @@ struct ASTVarDeclarations : public ASTDeclaration { , fType(std::move(type)) , fVars(std::move(vars)) {} - SkString description() const override { - SkString result = fModifiers.description() + fType->description() + " "; - SkString separator; + String description() const override { + String result = fModifiers.description() + fType->description() + " "; + String separator; for (const auto& var : fVars) { result += separator; separator = ", "; |