diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-03-30 13:45:54 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-30 18:28:47 +0000 |
commit | 7833466da45bfa1e078427c4a6db94d41c5c1535 (patch) | |
tree | d3bb49ba327f0bc3cb5cafe52d992702828031b2 /src/sksl/ast/SkSLASTParameter.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/SkSLASTParameter.h')
-rw-r--r-- | src/sksl/ast/SkSLASTParameter.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sksl/ast/SkSLASTParameter.h b/src/sksl/ast/SkSLASTParameter.h index 6bb13acf49..01227c637e 100644 --- a/src/sksl/ast/SkSLASTParameter.h +++ b/src/sksl/ast/SkSLASTParameter.h @@ -21,15 +21,15 @@ struct ASTParameter : public ASTPositionNode { // 'sizes' is a list of the array sizes appearing on a parameter, in source order. // e.g. int x[3][1] would have sizes [3, 1]. ASTParameter(Position position, Modifiers modifiers, std::unique_ptr<ASTType> type, - SkString name, std::vector<int> sizes) + String name, std::vector<int> sizes) : INHERITED(position) , fModifiers(modifiers) , fType(std::move(type)) , fName(std::move(name)) , fSizes(std::move(sizes)) {} - SkString description() const override { - SkString result = fModifiers.description() + fType->description() + " " + fName; + String description() const override { + String result = fModifiers.description() + fType->description() + " " + fName; for (int size : fSizes) { result += "[" + to_string(size) + "]"; } @@ -38,7 +38,7 @@ struct ASTParameter : public ASTPositionNode { const Modifiers fModifiers; const std::unique_ptr<ASTType> fType; - const SkString fName; + const String fName; const std::vector<int> fSizes; typedef ASTPositionNode INHERITED; |