| commit | 9e1138d56665d13641f8805cd72ae81adc255f79 | [log] [tgz] |
|---|---|---|
| author | Ethan Nicholas <ethannicholas@google.com> | Mon Nov 21 10:39:35 2016 -0500 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Mon Nov 21 17:14:43 2016 +0000 |
| tree | 1c94ded7cff10f5f62233d1de83c3d30ad0a2893 | |
| parent | e54d4cefb7864a575c01894b2e5e0df16978c6e6 [diff] [blame] |
re-land of switched skslc from std::string to SkString BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5084 Change-Id: Ib21c30afc0d8483392b417e660b7fecfcc30e617 Reviewed-on: https://skia-review.googlesource.com/5084 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
diff --git a/src/sksl/ir/SkSLFunctionDefinition.h b/src/sksl/ir/SkSLFunctionDefinition.h index ace27a3..bae8825 100644 --- a/src/sksl/ir/SkSLFunctionDefinition.h +++ b/src/sksl/ir/SkSLFunctionDefinition.h
@@ -24,7 +24,7 @@ , fDeclaration(declaration) , fBody(std::move(body)) {} - std::string description() const override { + SkString description() const override { return fDeclaration.description() + " " + fBody->description(); }