diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2016-11-21 10:39:35 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-21 17:14:43 +0000 |
| commit | 9e1138d56665d13641f8805cd72ae81adc255f79 (patch) | |
| tree | 1c94ded7cff10f5f62233d1de83c3d30ad0a2893 /src/sksl/ir/SkSLIfStatement.h | |
| parent | e54d4cefb7864a575c01894b2e5e0df16978c6e6 (diff) | |
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>
Diffstat (limited to 'src/sksl/ir/SkSLIfStatement.h')
| -rw-r--r-- | src/sksl/ir/SkSLIfStatement.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sksl/ir/SkSLIfStatement.h b/src/sksl/ir/SkSLIfStatement.h index 8ab5c00fd7..f8beded9e8 100644 --- a/src/sksl/ir/SkSLIfStatement.h +++ b/src/sksl/ir/SkSLIfStatement.h @@ -24,8 +24,8 @@ struct IfStatement : public Statement { , fIfTrue(std::move(ifTrue)) , fIfFalse(std::move(ifFalse)) {} - std::string description() const override { - std::string result = "if (" + fTest->description() + ") " + fIfTrue->description(); + SkString description() const override { + SkString result = "if (" + fTest->description() + ") " + fIfTrue->description(); if (fIfFalse) { result += " else " + fIfFalse->description(); } |