Chromium Code Reviews| Index: src/sksl/ir/SkSLFunctionDeclaration.h |
| diff --git a/src/sksl/ir/SkSLFunctionDeclaration.h b/src/sksl/ir/SkSLFunctionDeclaration.h |
| index 32c23f545e572c5abf642ff98ee6249f3f9dc3d6..cba6a12b071c12124662295252c31c0854d7293f 100644 |
| --- a/src/sksl/ir/SkSLFunctionDeclaration.h |
| +++ b/src/sksl/ir/SkSLFunctionDeclaration.h |
| @@ -20,15 +20,14 @@ namespace SkSL { |
| */ |
| struct FunctionDeclaration : public Symbol { |
| FunctionDeclaration(Position position, std::string name, |
| - std::vector<std::shared_ptr<Variable>> parameters, |
| - std::shared_ptr<Type> returnType) |
| + std::vector<const Variable*> parameters, const Type& returnType) |
| : INHERITED(position, kFunctionDeclaration_Kind, std::move(name)) |
| , fDefined(false) |
| , fParameters(parameters) |
|
dogben
2016/07/08 19:56:40
nit: std::move
|
| , fReturnType(returnType) {} |
| std::string description() const override { |
| - std::string result = fReturnType->description() + " " + fName + "("; |
| + std::string result = fReturnType.description() + " " + fName + "("; |
| std::string separator = ""; |
| for (auto p : fParameters) { |
| result += separator; |
| @@ -39,13 +38,13 @@ struct FunctionDeclaration : public Symbol { |
| return result; |
| } |
| - bool matches(FunctionDeclaration& f) { |
| + bool matches(const FunctionDeclaration& f) const { |
| return fName == f.fName && fParameters == f.fParameters; |
|
dogben
2016/07/08 19:56:40
(Not exactly related to this CL, but...) Seems lik
|
| } |
| mutable bool fDefined; |
| - const std::vector<std::shared_ptr<Variable>> fParameters; |
| - const std::shared_ptr<Type> fReturnType; |
| + const std::vector<const Variable*> fParameters; |
| + const Type& fReturnType; |
| typedef Symbol INHERITED; |
| }; |