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

Side by Side Diff: Source/core/xml/XPathParser.h

Issue 26763004: Vector stores Expression object as OwnPtr instead of raw pointer in XPath. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Change XPathGrammar.y also Created 7 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2005 Maksim Orlovich <maksim@kde.org> 2 * Copyright 2005 Maksim Orlovich <maksim@kde.org>
3 * Copyright (C) 2006 Apple Computer, Inc. 3 * Copyright (C) 2006 Apple Computer, Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 72
73 Expression* m_topExpr; 73 Expression* m_topExpr;
74 bool m_gotNamespaceError; 74 bool m_gotNamespaceError;
75 75
76 void registerParseNode(ParseNode*); 76 void registerParseNode(ParseNode*);
77 void unregisterParseNode(ParseNode*); 77 void unregisterParseNode(ParseNode*);
78 78
79 void registerPredicateVector(Vector<Predicate*>*); 79 void registerPredicateVector(Vector<Predicate*>*);
80 void deletePredicateVector(Vector<Predicate*>*); 80 void deletePredicateVector(Vector<Predicate*>*);
81 81
82 void registerExpressionVector(Vector<Expression*>*); 82 void registerExpressionVector(Vector<OwnPtr<Expression> >*);
83 void deleteExpressionVector(Vector<Expression*>*); 83 void deleteExpressionVector(Vector<OwnPtr<Expression> >*);
84 84
85 void registerString(String*); 85 void registerString(String*);
86 void deleteString(String*); 86 void deleteString(String*);
87 87
88 void registerNodeTest(Step::NodeTest*); 88 void registerNodeTest(Step::NodeTest*);
89 void deleteNodeTest(Step::NodeTest*); 89 void deleteNodeTest(Step::NodeTest*);
90 90
91 private: 91 private:
92 bool isBinaryOperatorContext() const; 92 bool isBinaryOperatorContext() const;
93 93
(...skipping 16 matching lines...) Expand all
110 110
111 static Parser* currentParser; 111 static Parser* currentParser;
112 112
113 unsigned m_nextPos; 113 unsigned m_nextPos;
114 String m_data; 114 String m_data;
115 int m_lastTokenType; 115 int m_lastTokenType;
116 RefPtr<XPathNSResolver> m_resolver; 116 RefPtr<XPathNSResolver> m_resolver;
117 117
118 HashSet<ParseNode*> m_parseNodes; 118 HashSet<ParseNode*> m_parseNodes;
119 HashSet<Vector<Predicate*>*> m_predicateVectors; 119 HashSet<Vector<Predicate*>*> m_predicateVectors;
120 HashSet<Vector<Expression*>*> m_expressionVectors; 120 HashSet<Vector<OwnPtr<Expression> >*> m_expressionVectors;
121 HashSet<String*> m_strings; 121 HashSet<String*> m_strings;
122 HashSet<Step::NodeTest*> m_nodeTests; 122 HashSet<Step::NodeTest*> m_nodeTests;
123 }; 123 };
124 124
125 } // XPath 125 } // XPath
126 126
127 } // WebCore 127 } // WebCore
128 128
129 #endif 129 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698