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

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

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 side-by-side diff with in-line comments
Download patch
Index: Source/core/xml/XPathParser.cpp
diff --git a/Source/core/xml/XPathParser.cpp b/Source/core/xml/XPathParser.cpp
index 2427539edb596ec65b1edab1f56e050e64a59612..332b8c3e730142ac889d41f8bfadfd9d3dfb297f 100644
--- a/Source/core/xml/XPathParser.cpp
+++ b/Source/core/xml/XPathParser.cpp
@@ -486,11 +486,9 @@ Expression* Parser::parseStatement(const String& statement, PassRefPtr<XPathNSRe
}
m_predicateVectors.clear();
- HashSet<Vector<Expression*>*>::iterator eend = m_expressionVectors.end();
- for (HashSet<Vector<Expression*>*>::iterator it = m_expressionVectors.begin(); it != eend; ++it) {
- deleteAllValues(**it);
+ HashSet<Vector<OwnPtr<Expression> >*>::iterator eend = m_expressionVectors.end();
+ for (HashSet<Vector<OwnPtr<Expression> >*>::iterator it = m_expressionVectors.begin(); it != eend; ++it)
delete *it;
- }
m_expressionVectors.clear();
deleteAllValues(m_strings);
@@ -564,7 +562,7 @@ void Parser::deletePredicateVector(Vector<Predicate*>* vector)
}
-void Parser::registerExpressionVector(Vector<Expression*>* vector)
+void Parser::registerExpressionVector(Vector<OwnPtr<Expression> >* vector)
{
if (vector == 0)
return;
@@ -574,7 +572,7 @@ void Parser::registerExpressionVector(Vector<Expression*>* vector)
m_expressionVectors.add(vector);
}
-void Parser::deleteExpressionVector(Vector<Expression*>* vector)
+void Parser::deleteExpressionVector(Vector<OwnPtr<Expression> >* vector)
{
if (vector == 0)
return;

Powered by Google App Engine
This is Rietveld 408576698