Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Unified Diff: src/sksl/ir/SkSLFunctionDeclaration.h

Issue 2143323003: Revert of SkSL performance improvements (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/sksl/ir/SkSLFunctionCall.h ('k') | src/sksl/ir/SkSLFunctionDefinition.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/sksl/ir/SkSLFunctionDeclaration.h
diff --git a/src/sksl/ir/SkSLFunctionDeclaration.h b/src/sksl/ir/SkSLFunctionDeclaration.h
index 16a184a6d79837bb4fd6de157e345a817613cd91..32c23f545e572c5abf642ff98ee6249f3f9dc3d6 100644
--- a/src/sksl/ir/SkSLFunctionDeclaration.h
+++ b/src/sksl/ir/SkSLFunctionDeclaration.h
@@ -10,7 +10,6 @@
#include "SkSLModifiers.h"
#include "SkSLSymbol.h"
-#include "SkSLSymbolTable.h"
#include "SkSLType.h"
#include "SkSLVariable.h"
@@ -21,14 +20,15 @@
*/
struct FunctionDeclaration : public Symbol {
FunctionDeclaration(Position position, std::string name,
- std::vector<const Variable*> parameters, const Type& returnType)
+ std::vector<std::shared_ptr<Variable>> parameters,
+ std::shared_ptr<Type> returnType)
: INHERITED(position, kFunctionDeclaration_Kind, std::move(name))
, fDefined(false)
- , fParameters(std::move(parameters))
+ , fParameters(parameters)
, 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,24 +39,13 @@
return result;
}
- bool matches(const FunctionDeclaration& f) const {
- if (fName != f.fName) {
- return false;
- }
- if (fParameters.size() != f.fParameters.size()) {
- return false;
- }
- for (size_t i = 0; i < fParameters.size(); i++) {
- if (fParameters[i]->fType != f.fParameters[i]->fType) {
- return false;
- }
- }
- return true;
+ bool matches(FunctionDeclaration& f) {
+ return fName == f.fName && fParameters == f.fParameters;
}
mutable bool fDefined;
- const std::vector<const Variable*> fParameters;
- const Type& fReturnType;
+ const std::vector<std::shared_ptr<Variable>> fParameters;
+ const std::shared_ptr<Type> fReturnType;
typedef Symbol INHERITED;
};
« no previous file with comments | « src/sksl/ir/SkSLFunctionCall.h ('k') | src/sksl/ir/SkSLFunctionDefinition.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698