diff options
| author |  Greg Daniel <egdaniel@google.com> | 2016-11-20 14:53:35 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-20 14:53:48 +0000 |
| commit | 792d0f13d6cb58ddf27b45e6835ba54c1d8ade77 (patch) | |
| tree | 929ba3d4638561e480bb070da4d01eec2cce21ab /src/sksl/ir/SkSLLayout.h | |
| parent | 7a5b48a75b6f5819c196d158eefa70677783554f (diff) | |
Revert "switched skslc from std::string to SkString"
This reverts commit d8df21a1e08b5b3380261f4b90acfbdc538ef93c.
Reason for revert: Breaking Roll
Original change's description:
> switched skslc from std::string to SkString
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4977
>
> Change-Id: I15e24963b09b719a2c07da67745114f5ac66cee8
> Reviewed-on: https://skia-review.googlesource.com/4977
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
>
TBR=bsalomon@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I84d5311beb9d5e607b7a4a3c138332f0c8f19648
Reviewed-on: https://skia-review.googlesource.com/5077
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLLayout.h')
| -rw-r--r-- | src/sksl/ir/SkSLLayout.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h index 7359262c96..4cfd1a2771 100644 --- a/src/sksl/ir/SkSLLayout.h +++ b/src/sksl/ir/SkSLLayout.h @@ -50,9 +50,9 @@ struct Layout { , fBlendSupportAllEquations(false) , fFormat(ASTLayout::Format::kUnspecified) {} - SkString description() const { - SkString result; - SkString separator; + std::string description() const { + std::string result; + std::string separator; if (fLocation >= 0) { result += separator + "location = " + to_string(fLocation); separator = ", "; @@ -89,7 +89,7 @@ struct Layout { result += separator + ASTLayout::FormatToStr(fFormat); separator = ", "; } - if (result.size() > 0) { + if (result.length() > 0) { result = "layout (" + result + ")"; } return result; |