From 9bd301d640ff63c280b202c7dd00bc00a3315ff4 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Fri, 31 Mar 2017 16:04:34 +0000 Subject: 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 > Reviewed-by: Ben Wagner > 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 Commit-Queue: Ethan Nicholas --- src/sksl/ast/SkSLASTInterfaceBlock.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/sksl/ast/SkSLASTInterfaceBlock.h') 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> declarations, - String instanceName, + SkString instanceName, std::vector> 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> fDeclarations; - const String fInstanceName; + const SkString fInstanceName; const std::vector> fSizes; typedef ASTDeclaration INHERITED; -- cgit v1.2.3