diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-03-31 09:33:41 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 15:25:32 +0000 |
commit | f3333c89bf05fc602d9bf8e1e24547668c660383 (patch) | |
tree | 3c0855ef8829201299ce757ecaf28bfda50a2683 /src/sksl/ir/SkSLForStatement.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/ir/SkSLForStatement.h')
-rw-r--r-- | src/sksl/ir/SkSLForStatement.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sksl/ir/SkSLForStatement.h b/src/sksl/ir/SkSLForStatement.h index f2bf880ddd..b72c26b179 100644 --- a/src/sksl/ir/SkSLForStatement.h +++ b/src/sksl/ir/SkSLForStatement.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_FORSTATEMENT #define SKSL_FORSTATEMENT @@ -18,8 +18,8 @@ namespace SkSL { * A 'for' statement. */ struct ForStatement : public Statement { - ForStatement(Position position, std::unique_ptr<Statement> initializer, - std::unique_ptr<Expression> test, std::unique_ptr<Expression> next, + ForStatement(Position position, std::unique_ptr<Statement> initializer, + std::unique_ptr<Expression> test, std::unique_ptr<Expression> next, std::unique_ptr<Statement> statement, std::shared_ptr<SymbolTable> symbols) : INHERITED(position, kFor_Kind) , fSymbols(symbols) @@ -28,15 +28,15 @@ struct ForStatement : public Statement { , fNext(std::move(next)) , fStatement(std::move(statement)) {} - SkString description() const override { - SkString result("for ("); + String description() const override { + String result("for ("); if (fInitializer) { result += fInitializer->description(); - } + } result += " "; if (fTest) { result += fTest->description(); - } + } result += "; "; if (fNext) { result += fNext->description(); |