diff options
author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-04-10 09:28:39 +0000 |
---|---|---|
committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-04-10 09:28:39 +0000 |
commit | 32761a6cee1d0dee366b885b7b9c777e67885688 (patch) | |
tree | d6bec92bebfb216f4126356e55518842c2f476a1 /Source/WebCore/xml/XPathExpression.cpp | |
parent | a4e969f4965059196ca948db781e52f7cfebf19e (diff) | |
download | WebKitGtk-tarball-32761a6cee1d0dee366b885b7b9c777e67885688.tar.gz |
webkitgtk-2.4.11webkitgtk-2.4.11
Diffstat (limited to 'Source/WebCore/xml/XPathExpression.cpp')
-rw-r--r-- | Source/WebCore/xml/XPathExpression.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/xml/XPathExpression.cpp b/Source/WebCore/xml/XPathExpression.cpp index 1449093af..c659c829a 100644 --- a/Source/WebCore/xml/XPathExpression.cpp +++ b/Source/WebCore/xml/XPathExpression.cpp @@ -41,28 +41,28 @@ namespace WebCore { using namespace XPath; inline XPathExpression::XPathExpression(std::unique_ptr<XPath::Expression> expression) - : m_topExpression(WTFMove(expression)) + : m_topExpression(std::move(expression)) { } -RefPtr<XPathExpression> XPathExpression::createExpression(const String& expression, XPathNSResolver* resolver, ExceptionCode& ec) +PassRefPtr<XPathExpression> XPathExpression::createExpression(const String& expression, XPathNSResolver* resolver, ExceptionCode& ec) { auto parsedExpression = Parser::parseStatement(expression, resolver, ec); if (!parsedExpression) return nullptr; - return adoptRef(*new XPathExpression(WTFMove(parsedExpression))); + return adoptRef(new XPathExpression(std::move(parsedExpression))); } XPathExpression::~XPathExpression() { } -RefPtr<XPathResult> XPathExpression::evaluate(Node* contextNode, unsigned short type, XPathResult*, ExceptionCode& ec) +PassRefPtr<XPathResult> XPathExpression::evaluate(Node* contextNode, unsigned short type, XPathResult*, ExceptionCode& ec) { if (!isValidContextNode(contextNode)) { ec = NOT_SUPPORTED_ERR; - return nullptr; + return 0; } EvaluationContext& evaluationContext = Expression::evaluationContext(); |