diff options
author | 2017-03-31 09:33:41 -0400 | |
---|---|---|
committer | 2017-03-31 15:25:32 +0000 | |
commit | f3333c89bf05fc602d9bf8e1e24547668c660383 (patch) | |
tree | 3c0855ef8829201299ce757ecaf28bfda50a2683 /src/sksl/ast/SkSLASTFunction.h | |
parent | 66b09abdb184d843ece45a1d343fbe632075b323 (diff) |
skslc can now be compiled with no Skia dependencies, in preparation for its eventual
role in Skia's build process.
This reverts commit bcf35f86d50b784b165de703b404998dd4299f6a.
BUG=skia:
Change-Id: Id0a12dfc4d804d69a3c6bf60fed37e89ee130f02
Reviewed-on: https://skia-review.googlesource.com/10802
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'src/sksl/ast/SkSLASTFunction.h')
-rw-r--r-- | src/sksl/ast/SkSLASTFunction.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/sksl/ast/SkSLASTFunction.h b/src/sksl/ast/SkSLASTFunction.h index 32f4da71f2..d9f3067baa 100644 --- a/src/sksl/ast/SkSLASTFunction.h +++ b/src/sksl/ast/SkSLASTFunction.h @@ -4,7 +4,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - + #ifndef SKSL_ASTFUNCTION #define SKSL_ASTFUNCTION @@ -16,11 +16,11 @@ namespace SkSL { /** - * A function declaration or definition. The fBody field will be null for declarations. + * A function declaration or definition. The fBody field will be null for declarations. */ struct ASTFunction : public ASTDeclaration { - ASTFunction(Position position, std::unique_ptr<ASTType> returnType, SkString name, - std::vector<std::unique_ptr<ASTParameter>> parameters, + ASTFunction(Position position, std::unique_ptr<ASTType> returnType, String name, + std::vector<std::unique_ptr<ASTParameter>> parameters, std::unique_ptr<ASTBlock> body) : INHERITED(position, kFunction_Kind) , fReturnType(std::move(returnType)) @@ -28,8 +28,8 @@ struct ASTFunction : public ASTDeclaration { , fParameters(std::move(parameters)) , fBody(std::move(body)) {} - SkString description() const override { - SkString result = fReturnType->description() + " " + fName + "("; + String description() const override { + String result = fReturnType->description() + " " + fName + "("; for (size_t i = 0; i < fParameters.size(); i++) { if (i > 0) { result += ", "; @@ -41,11 +41,11 @@ struct ASTFunction : public ASTDeclaration { } else { result += ");"; } - return result; + return result; } const std::unique_ptr<ASTType> fReturnType; - const SkString fName; + const String fName; const std::vector<std::unique_ptr<ASTParameter>> fParameters; const std::unique_ptr<ASTBlock> fBody; |