From f3333c89bf05fc602d9bf8e1e24547668c660383 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Fri, 31 Mar 2017 09:33:41 -0400 Subject: 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 --- src/sksl/ir/SkSLVarDeclarationsStatement.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sksl/ir/SkSLVarDeclarationsStatement.h') diff --git a/src/sksl/ir/SkSLVarDeclarationsStatement.h b/src/sksl/ir/SkSLVarDeclarationsStatement.h index 66b570f853..50365decc1 100644 --- a/src/sksl/ir/SkSLVarDeclarationsStatement.h +++ b/src/sksl/ir/SkSLVarDeclarationsStatement.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_VARDECLARATIONSSTATEMENT #define SKSL_VARDECLARATIONSSTATEMENT @@ -21,7 +21,7 @@ struct VarDeclarationsStatement : public Statement { : INHERITED(decl->fPosition, kVarDeclarations_Kind) , fDeclaration(std::move(decl)) {} - SkString description() const override { + String description() const override { return fDeclaration->description(); } -- cgit v1.2.3