diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-03-31 16:04:34 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 16:04:41 +0000 |
commit | 9bd301d640ff63c280b202c7dd00bc00a3315ff4 (patch) | |
tree | 176fcfe46fb17a8c50c145196705f4ef42a950fa /src/sksl/ast/SkSLASTInterfaceBlock.h | |
parent | 92d7ccafdf896cf19764e025873d13315a76842d (diff) |
Revert "skslc can now be compiled with no Skia dependencies, in preparation for its eventual"
This reverts commit f3333c89bf05fc602d9bf8e1e24547668c660383.
Reason for revert: breaking the bots
Original change's description:
> 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>
>
TBR=benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: Ic7b50d391d25b3870acffa9764cbafc7f5c3be89
Reviewed-on: https://skia-review.googlesource.com/10962
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/ast/SkSLASTInterfaceBlock.h')
-rw-r--r-- | src/sksl/ast/SkSLASTInterfaceBlock.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sksl/ast/SkSLASTInterfaceBlock.h b/src/sksl/ast/SkSLASTInterfaceBlock.h index e727ae9aad..7647fb5c00 100644 --- a/src/sksl/ast/SkSLASTInterfaceBlock.h +++ b/src/sksl/ast/SkSLASTInterfaceBlock.h @@ -25,9 +25,9 @@ struct ASTInterfaceBlock : public ASTDeclaration { // valueName is empty when it was not present in the source ASTInterfaceBlock(Position position, Modifiers modifiers, - String typeName, + SkString typeName, std::vector<std::unique_ptr<ASTVarDeclarations>> declarations, - String instanceName, + SkString instanceName, std::vector<std::unique_ptr<ASTExpression>> sizes) : INHERITED(position, kInterfaceBlock_Kind) , fModifiers(modifiers) @@ -36,8 +36,8 @@ struct ASTInterfaceBlock : public ASTDeclaration { , fInstanceName(std::move(instanceName)) , fSizes(std::move(sizes)) {} - String description() const override { - String result = fModifiers.description() + fTypeName + " {\n"; + SkString description() const override { + SkString result = fModifiers.description() + fTypeName + " {\n"; for (size_t i = 0; i < fDeclarations.size(); i++) { result += fDeclarations[i]->description() + "\n"; } @@ -56,9 +56,9 @@ struct ASTInterfaceBlock : public ASTDeclaration { } const Modifiers fModifiers; - const String fTypeName; + const SkString fTypeName; const std::vector<std::unique_ptr<ASTVarDeclarations>> fDeclarations; - const String fInstanceName; + const SkString fInstanceName; const std::vector<std::unique_ptr<ASTExpression>> fSizes; typedef ASTDeclaration INHERITED; |