aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/sksl/ir/SkSLSwizzle.h
diff options
context:
space:
mode:
authorGravatar Ethan Nicholas <ethannicholas@google.com>2017-03-30 13:45:54 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-30 18:28:47 +0000
commit7833466da45bfa1e078427c4a6db94d41c5c1535 (patch)
treed3bb49ba327f0bc3cb5cafe52d992702828031b2 /src/sksl/ir/SkSLSwizzle.h
parentcdc651d29d88e87ef84d5a586879db2c16ff4579 (diff)
skslc can now be compiled with no Skia dependencies, in preparation for
its eventual role in Skia's build process. Bug: skia: Change-Id: Iaa9933f4fc4a64bec60aa897c509a3513f457a78 Reviewed-on: https://skia-review.googlesource.com/10282 Commit-Queue: Ethan Nicholas <ethannicholas@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'src/sksl/ir/SkSLSwizzle.h')
-rw-r--r--src/sksl/ir/SkSLSwizzle.h8
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];
}