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/SkSLSwizzle.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/SkSLSwizzle.h')
-rw-r--r-- | src/sksl/ir/SkSLSwizzle.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sksl/ir/SkSLSwizzle.h b/src/sksl/ir/SkSLSwizzle.h index 0803f3bc36..1725ec2b5a 100644 --- a/src/sksl/ir/SkSLSwizzle.h +++ b/src/sksl/ir/SkSLSwizzle.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_SWIZZLE #define SKSL_SWIZZLE @@ -15,7 +15,7 @@ namespace SkSL { /** - * Given a type and a swizzle component count, returns the type that will result from swizzling. For + * Given a type and a swizzle component count, returns the type that will result from swizzling. For * instance, swizzling a vec3 with two components will result in a vec2. It is possible to swizzle * with more components than the source vector, as in 'vec2(1).xxxx'. */ @@ -69,8 +69,8 @@ struct Swizzle : public Expression { ASSERT(fComponents.size() >= 1 && fComponents.size() <= 4); } - SkString description() const override { - SkString result = fBase->description() + "."; + String description() const override { + String result = fBase->description() + "."; for (int x : fComponents) { result += "xyzw"[x]; } |