diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/xml/XPathEvaluator.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/xml/XPathEvaluator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chromium/third_party/WebKit/Source/core/xml/XPathEvaluator.cpp b/chromium/third_party/WebKit/Source/core/xml/XPathEvaluator.cpp index f87cc76b6d6..8c2d6f53698 100644 --- a/chromium/third_party/WebKit/Source/core/xml/XPathEvaluator.cpp +++ b/chromium/third_party/WebKit/Source/core/xml/XPathEvaluator.cpp @@ -39,32 +39,32 @@ namespace WebCore { using namespace XPath; -PassRefPtr<XPathExpression> XPathEvaluator::createExpression(const String& expression, PassRefPtr<XPathNSResolver> resolver, ExceptionState& exceptionState) +PassRefPtrWillBeRawPtr<XPathExpression> XPathEvaluator::createExpression(const String& expression, PassRefPtrWillBeRawPtr<XPathNSResolver> resolver, ExceptionState& exceptionState) { return XPathExpression::createExpression(expression, resolver, exceptionState); } -PassRefPtr<XPathNSResolver> XPathEvaluator::createNSResolver(Node* nodeResolver) +PassRefPtrWillBeRawPtr<XPathNSResolver> XPathEvaluator::createNSResolver(Node* nodeResolver) { return NativeXPathNSResolver::create(nodeResolver); } -PassRefPtr<XPathResult> XPathEvaluator::evaluate(const String& expression, Node* contextNode, - PassRefPtr<XPathNSResolver> resolver, unsigned short type, XPathResult* result, ExceptionState& exceptionState) +PassRefPtrWillBeRawPtr<XPathResult> XPathEvaluator::evaluate(const String& expression, Node* contextNode, + PassRefPtrWillBeRawPtr<XPathNSResolver> resolver, unsigned short type, XPathResult* result, ExceptionState& exceptionState) { if (!contextNode) { exceptionState.throwDOMException(NotSupportedError, "The context node provided is null."); - return 0; + return nullptr; } if (!isValidContextNode(contextNode)) { exceptionState.throwDOMException(NotSupportedError, "The node provided is '" + contextNode->nodeName() + "', which is not a valid context node type."); - return 0; + return nullptr; } - RefPtr<XPathExpression> expr = createExpression(expression, resolver, exceptionState); + RefPtrWillBeRawPtr<XPathExpression> expr = createExpression(expression, resolver, exceptionState); if (exceptionState.hadException()) - return 0; + return nullptr; return expr->evaluate(contextNode, type, result, exceptionState); } |