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

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

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/XPathPredicate.h ('k') | Source/core/xml/XPathResult.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/xml/XPathPredicate.cpp
diff --git a/Source/core/xml/XPathPredicate.cpp b/Source/core/xml/XPathPredicate.cpp
index e3da0cad5901e5f1dbb966c4da5459b98b69c95e..37daa6d76b23212b4cbb5c567644048809189a0f 100644
--- a/Source/core/xml/XPathPredicate.cpp
+++ b/Source/core/xml/XPathPredicate.cpp
@@ -75,7 +75,7 @@ Value Negative::evaluate(EvaluationContext& context) const
return -p.toNumber();
}
-NumericOp::NumericOp(Opcode opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRawPtr<Expression> rhs)
+NumericOp::NumericOp(Opcode opcode, Expression* lhs, Expression* rhs)
: m_opcode(opcode)
{
addSubExpression(lhs);
@@ -106,7 +106,7 @@ Value NumericOp::evaluate(EvaluationContext& context) const
return 0.0;
}
-EqTestOp::EqTestOp(Opcode opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRawPtr<Expression> rhs)
+EqTestOp::EqTestOp(Opcode opcode, Expression* lhs, Expression* rhs)
: m_opcode(opcode)
{
addSubExpression(lhs);
@@ -224,7 +224,7 @@ Value EqTestOp::evaluate(EvaluationContext& context) const
return compare(context, lhs, rhs);
}
-LogicalOp::LogicalOp(Opcode opcode, PassOwnPtrWillBeRawPtr<Expression> lhs, PassOwnPtrWillBeRawPtr<Expression> rhs)
+LogicalOp::LogicalOp(Opcode opcode, Expression* lhs, Expression* rhs)
: m_opcode(opcode)
{
addSubExpression(lhs);
@@ -274,13 +274,11 @@ Value Union::evaluate(EvaluationContext& context) const
return lhsResult;
}
-Predicate::Predicate(PassOwnPtrWillBeRawPtr<Expression> expr)
+Predicate::Predicate(Expression* expr)
: m_expr(expr)
{
}
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(Predicate);
-
DEFINE_TRACE(Predicate)
{
visitor->trace(m_expr);
@@ -294,10 +292,11 @@ bool Predicate::evaluate(EvaluationContext& context) const
// foo[3] means foo[position()=3]
if (result.isNumber())
- return EqTestOp(EqTestOp::OpcodeEqual, adoptPtrWillBeNoop(createFunction("position")), adoptPtrWillBeNoop(new Number(result.toNumber()))).evaluate(context).toBoolean();
+ return EqTestOp(EqTestOp::OpcodeEqual, createFunction("position"), new Number(result.toNumber())).evaluate(context).toBoolean();
return result.toBoolean();
}
-}
-}
+} // namespace XPath
+
+} // namespace blink
« no previous file with comments | « Source/core/xml/XPathPredicate.h ('k') | Source/core/xml/XPathResult.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698