Index: Source/core/xml/XPathExpression.cpp |
diff --git a/Source/core/xml/XPathExpression.cpp b/Source/core/xml/XPathExpression.cpp |
index 6025274a49f9705b905739f6cb9ed9bda3a4b70d..94f24a4bbbab0268362aba0279b5d2be42926965 100644 |
--- a/Source/core/xml/XPathExpression.cpp |
+++ b/Source/core/xml/XPathExpression.cpp |
@@ -40,22 +40,20 @@ namespace blink { |
using namespace XPath; |
-DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(XPathExpression); |
- |
XPathExpression::XPathExpression() |
{ |
} |
-PassRefPtrWillBeRawPtr<XPathExpression> XPathExpression::createExpression(const String& expression, PassRefPtrWillBeRawPtr<XPathNSResolver> resolver, ExceptionState& exceptionState) |
+XPathExpression* XPathExpression::createExpression(const String& expression, XPathNSResolver* resolver, ExceptionState& exceptionState) |
{ |
- RefPtrWillBeRawPtr<XPathExpression> expr = XPathExpression::create(); |
+ XPathExpression* expr = XPathExpression::create(); |
Parser parser; |
expr->m_topExpression = parser.parseStatement(expression, resolver, exceptionState); |
if (!expr->m_topExpression) |
return nullptr; |
- return expr.release(); |
+ return expr; |
} |
DEFINE_TRACE(XPathExpression) |
@@ -63,7 +61,7 @@ DEFINE_TRACE(XPathExpression) |
visitor->trace(m_topExpression); |
} |
-PassRefPtrWillBeRawPtr<XPathResult> XPathExpression::evaluate(Node* contextNode, unsigned short type, const ScriptValue&, ExceptionState& exceptionState) |
+XPathResult* XPathExpression::evaluate(Node* contextNode, unsigned short type, const ScriptValue&, ExceptionState& exceptionState) |
{ |
if (!isValidContextNode(contextNode)) { |
exceptionState.throwDOMException(NotSupportedError, "The node provided is '" + contextNode->nodeName() + "', which is not a valid context node type."); |
@@ -71,7 +69,7 @@ PassRefPtrWillBeRawPtr<XPathResult> XPathExpression::evaluate(Node* contextNode, |
} |
EvaluationContext evaluationContext(*contextNode); |
- RefPtrWillBeRawPtr<XPathResult> result = XPathResult::create(evaluationContext, m_topExpression->evaluate(evaluationContext)); |
+ XPathResult* result = XPathResult::create(evaluationContext, m_topExpression->evaluate(evaluationContext)); |
if (evaluationContext.hadTypeConversionError) { |
// It is not specified what to do if type conversion fails while evaluating an expression. |
@@ -88,4 +86,4 @@ PassRefPtrWillBeRawPtr<XPathResult> XPathExpression::evaluate(Node* contextNode, |
return result; |
} |
-} |
+} // namespace blink |