From 9bd301d640ff63c280b202c7dd00bc00a3315ff4 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Fri, 31 Mar 2017 16:04:34 +0000 Subject: Revert "skslc can now be compiled with no Skia dependencies, in preparation for its eventual" This reverts commit f3333c89bf05fc602d9bf8e1e24547668c660383. Reason for revert: breaking the bots Original change's description: > skslc can now be compiled with no Skia dependencies, in preparation for its eventual > role in Skia's build process. > > This reverts commit bcf35f86d50b784b165de703b404998dd4299f6a. > > BUG=skia: > > Change-Id: Id0a12dfc4d804d69a3c6bf60fed37e89ee130f02 > Reviewed-on: https://skia-review.googlesource.com/10802 > Commit-Queue: Ethan Nicholas > Reviewed-by: Ben Wagner > TBR=benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Change-Id: Ic7b50d391d25b3870acffa9764cbafc7f5c3be89 Reviewed-on: https://skia-review.googlesource.com/10962 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- src/sksl/ast/SkSLASTFloatLiteral.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sksl/ast/SkSLASTFloatLiteral.h') diff --git a/src/sksl/ast/SkSLASTFloatLiteral.h b/src/sksl/ast/SkSLASTFloatLiteral.h index 15fe836049..ea0f595abc 100644 --- a/src/sksl/ast/SkSLASTFloatLiteral.h +++ b/src/sksl/ast/SkSLASTFloatLiteral.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_ASTFLOATLITERAL #define SKSL_ASTFLOATLITERAL @@ -13,14 +13,14 @@ namespace SkSL { /** - * A literal floating point number. + * A literal floating point number. */ struct ASTFloatLiteral : public ASTExpression { ASTFloatLiteral(Position position, double value) : INHERITED(position, kFloat_Kind) , fValue(value) {} - String description() const override { + SkString description() const override { return to_string(fValue); } -- cgit v1.2.3