From bcf35f86d50b784b165de703b404998dd4299f6a Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 30 Mar 2017 18:42:48 +0000 Subject: Revert "skslc can now be compiled with no Skia dependencies, in preparation for" This reverts commit 7833466da45bfa1e078427c4a6db94d41c5c1535. Reason for revert: Vulkan assertion failure Original change's description: > 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 > Reviewed-by: Ben Wagner > TBR=egdaniel@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ic64cac2395abb406116885ddd725f74a434c8c49 Reviewed-on: https://skia-review.googlesource.com/10758 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- src/sksl/ast/SkSLASTTernaryExpression.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sksl/ast/SkSLASTTernaryExpression.h') diff --git a/src/sksl/ast/SkSLASTTernaryExpression.h b/src/sksl/ast/SkSLASTTernaryExpression.h index 07c92975e0..ddf8e3d120 100644 --- a/src/sksl/ast/SkSLASTTernaryExpression.h +++ b/src/sksl/ast/SkSLASTTernaryExpression.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_ASTTERNARYEXPRESSION #define SKSL_ASTTERNARYEXPRESSION @@ -24,9 +24,9 @@ struct ASTTernaryExpression : public ASTExpression { , fIfTrue(std::move(ifTrue)) , fIfFalse(std::move(ifFalse)) {} - String description() const override { + SkString description() const override { return "(" + fTest->description() + " ? " + fIfTrue->description() + " : " + - fIfFalse->description() + ")"; + fIfFalse->description() + ")"; } const std::unique_ptr fTest; -- cgit v1.2.3