diff options
Diffstat (limited to 'Source/WebCore/xml/XPathEvaluator.cpp')
| -rw-r--r-- | Source/WebCore/xml/XPathEvaluator.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/WebCore/xml/XPathEvaluator.cpp b/Source/WebCore/xml/XPathEvaluator.cpp index 68f29fa41..de0aa0d17 100644 --- a/Source/WebCore/xml/XPathEvaluator.cpp +++ b/Source/WebCore/xml/XPathEvaluator.cpp @@ -1,6 +1,6 @@ /* * Copyright 2005 Frerich Raabe <raabe@kde.org> - * Copyright (C) 2006 Apple Computer, Inc. + * Copyright (C) 2006 Apple Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,7 +29,6 @@ #include "ExceptionCode.h" #include "NativeXPathNSResolver.h" -#include "Node.h" #include "XPathExpression.h" #include "XPathResult.h" #include "XPathUtil.h" @@ -38,19 +37,19 @@ namespace WebCore { using namespace XPath; -PassRefPtr<XPathExpression> XPathEvaluator::createExpression(const String& expression, +RefPtr<XPathExpression> XPathEvaluator::createExpression(const String& expression, XPathNSResolver* resolver, ExceptionCode& ec) { return XPathExpression::createExpression(expression, resolver, ec); } -PassRefPtr<XPathNSResolver> XPathEvaluator::createNSResolver(Node* nodeResolver) +Ref<XPathNSResolver> XPathEvaluator::createNSResolver(Node* nodeResolver) { return NativeXPathNSResolver::create(nodeResolver); } -PassRefPtr<XPathResult> XPathEvaluator::evaluate(const String& expression, +RefPtr<XPathResult> XPathEvaluator::evaluate(const String& expression, Node* contextNode, XPathNSResolver* resolver, unsigned short type, @@ -59,13 +58,13 @@ PassRefPtr<XPathResult> XPathEvaluator::evaluate(const String& expression, { if (!isValidContextNode(contextNode)) { ec = NOT_SUPPORTED_ERR; - return 0; + return nullptr; } ec = 0; RefPtr<XPathExpression> expr = createExpression(expression, resolver, ec); if (ec) - return 0; + return nullptr; return expr->evaluate(contextNode, type, result, ec); } |