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

Unified Diff: Source/core/xml/XPathParser.h

Issue 1099613003: Oilpan: have xml/ objects on the heap by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: simplify XPathResult dtor Created 5 years, 8 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 | « Source/core/xml/XPathNodeSet.cpp ('k') | Source/core/xml/XPathParser.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/xml/XPathParser.h
diff --git a/Source/core/xml/XPathParser.h b/Source/core/xml/XPathParser.h
index c02a019a21f4f1f1e47e47d13f5384c5af6abd01..8062985089f91e09a93ae58551b7da10cb8efb7f 100644
--- a/Source/core/xml/XPathParser.h
+++ b/Source/core/xml/XPathParser.h
@@ -67,30 +67,18 @@ public:
XPathNSResolver* resolver() const { return m_resolver.get(); }
bool expandQName(const String& qName, AtomicString& localName, AtomicString& namespaceURI);
- PassOwnPtrWillBeRawPtr<Expression> parseStatement(const String& statement, PassRefPtrWillBeRawPtr<XPathNSResolver>, ExceptionState&);
+ Expression* parseStatement(const String& statement, XPathNSResolver*, ExceptionState&);
static Parser* current() { return currentParser; }
int lex(void* yylval);
- RawPtrWillBeMember<Expression> m_topExpr;
+ Member<Expression> m_topExpr;
bool m_gotNamespaceError;
- void registerParseNode(ParseNode*);
- void unregisterParseNode(ParseNode*);
-
- void registerPredicateVector(WillBeHeapVector<OwnPtrWillBeMember<Predicate>>*);
- void deletePredicateVector(WillBeHeapVector<OwnPtrWillBeMember<Predicate>>*);
-
- void registerExpressionVector(WillBeHeapVector<OwnPtrWillBeMember<Expression>>*);
- void deleteExpressionVector(WillBeHeapVector<OwnPtrWillBeMember<Expression>>*);
-
void registerString(String*);
void deleteString(String*);
- void registerNodeTest(Step::NodeTest*);
- void deleteNodeTest(Step::NodeTest*);
-
private:
bool isBinaryOperatorContext() const;
@@ -116,14 +104,8 @@ private:
unsigned m_nextPos;
String m_data;
int m_lastTokenType;
- RefPtrWillBeMember<XPathNSResolver> m_resolver;
+ Member<XPathNSResolver> m_resolver;
-#if !ENABLE(OILPAN)
- HashSet<ParseNode*> m_parseNodes;
- HashSet<Vector<OwnPtr<Predicate>>*> m_predicateVectors;
- HashSet<Vector<OwnPtr<Expression>>*> m_expressionVectors;
- HashSet<OwnPtr<Step::NodeTest>> m_nodeTests;
-#endif
HashSet<OwnPtr<String>> m_strings;
};
« no previous file with comments | « Source/core/xml/XPathNodeSet.cpp ('k') | Source/core/xml/XPathParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698