diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-03-31 13:56:23 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-31 18:49:51 +0000 |
commit | 0df1b04db87c3d86ee0b0bd6aa2cb5b6be32cac2 (patch) | |
tree | 12e72247e1d2f4a66d2045cc6a6a62a3505d82ab /src/sksl/ir/SkSLFunctionDefinition.h | |
parent | f809fef8280e3d6ad9d95697cd234560b49962ab (diff) |
skslc can now be compiled with no Skia dependencies, in preparation for its eventual
This reverts commit 9bd301d640ff63c280b202c7dd00bc00a3315ff4.
Bug: skia:
Change-Id: I5ad3f77ef33aa5ce2fd27fe383c9339c571663a1
Reviewed-on: https://skia-review.googlesource.com/10964
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLFunctionDefinition.h')
-rw-r--r-- | src/sksl/ir/SkSLFunctionDefinition.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sksl/ir/SkSLFunctionDefinition.h b/src/sksl/ir/SkSLFunctionDefinition.h index bae882525a..e87ee63e7a 100644 --- a/src/sksl/ir/SkSLFunctionDefinition.h +++ b/src/sksl/ir/SkSLFunctionDefinition.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_FUNCTIONDEFINITION #define SKSL_FUNCTIONDEFINITION @@ -18,13 +18,13 @@ namespace SkSL { * A function definition (a declaration plus an associated block of code). */ struct FunctionDefinition : public ProgramElement { - FunctionDefinition(Position position, const FunctionDeclaration& declaration, + FunctionDefinition(Position position, const FunctionDeclaration& declaration, std::unique_ptr<Block> body) : INHERITED(position, kFunction_Kind) , fDeclaration(declaration) , fBody(std::move(body)) {} - SkString description() const override { + String description() const override { return fDeclaration.description() + " " + fBody->description(); } |