Changeset 207541 in webkit for trunk/Source/WebCore/xml/XPathExpression.cpp

Timestamp:

Oct 19, 2016, 9:57:31 AM (9 years ago)

Author:

Darin Adler

Message:

Move XPath from ExceptionCode to Exception
​https://bugs.webkit.org/show_bug.cgi?id=163656

Reviewed by Chris Dumez.

Source/WebCore:

• dom/Document.cpp:

(WebCore::Document::createExpression): Use ExceptionOr.
(WebCore::Document::createNSResolver): Return Ref.
(WebCore::Document::evaluate): Use ExceptionOr.

• dom/Document.h: Updated for above changes.
• dom/Document.idl: Use non-legacy exceptions for the functions above.

• inspector/InspectorNodeFinder.cpp:

(WebCore::InspectorNodeFinder::searchUsingXPath): Call XPath functions
with new interface.

• xml/DOMParser.cpp:

(WebCore::DOMParser::DOMParser): Marked inline.
(WebCore::DOMParser::create): Moved here from header.
(WebCore::DOMParser::parseFromString): Use ExceptionOr.

• xml/DOMParser.h: Updated for above changes.
• xml/DOMParser.idl: Use non-legacy exception.

• xml/XPathEvaluator.cpp:

(WebCore::XPathEvaluator::createExpression): Use ExceptionOr.
(WebCore::XPathEvaluator::evaluate): Ditto.

• xml/XPathEvaluator.h: Updated for above changes.
• xml/XPathEvaluator.idl: Use non-legacy exceptions.

• xml/XPathExpression.cpp:

(WebCore::XPathExpression::createExpression): Use ExceptionOr.
(WebCore::XPathExpression::evaluate): Ditto.

• xml/XPathExpression.h: Updated for above changes.
• xml/XPathExpression.idl: Use non-legacy exceptions.

• xml/XPathGrammar.y: Added include of XPathStep.h.

• xml/XPathParser.cpp:

(WebCore::XPath::Parser::Parser): Initialize three scalar data members
in the class definition rather than here.
(WebCore::XPath::Parser::parseStatement): Use ExceptionOr.

• xml/XPathParser.h: Updated for above changes.

• xml/XPathResult.cpp:

(WebCore::XPathResult::XPathResult): Use a reference rather than a
pointer for the document. Alao initialize two scalar data members
in the class definition rather than here.
(WebCore::XPathResult::convertTo): Use ExceptionOr.
(WebCore::XPathResult::numberValue): Ditto.
(WebCore::XPathResult::stringValue): Ditto.
(WebCore::XPathResult::booleanValue): Ditto.
(WebCore::XPathResult::singleNodeValue): Ditto.
(WebCore::XPathResult::snapshotLength): Ditto.
(WebCore::XPathResult::iterateNext): Ditto.
(WebCore::XPathResult::snapshotItem): Ditto.

• xml/XPathResult.h: Updated for the changes above.
• xml/XPathResult.idl: Use non-legacy exceptions.

Source/WebKit/mac:

• DOM/DOMDocument.mm:

(wrap): Added. Helper function for wrapping a resolver.
(-[DOMDocument createExpression:resolver:]): Use raiseOnDOMError.
(-[DOMDocument evaluate:contextNode:resolver:type:inResult:]): Ditto.

• DOM/DOMXPathExpression.mm:

(-[DOMXPathExpression evaluate:type:inResult:]): Ditto.

• DOM/DOMXPathResult.mm:

(-[DOMXPathResult numberValue]): Ditto.
(-[DOMXPathResult stringValue]): Ditto.
(-[DOMXPathResult booleanValue]): Ditto.
(-[DOMXPathResult singleNodeValue]): Ditto.
(-[DOMXPathResult snapshotLength]): Ditto.
(-[DOMXPathResult iterateNext]): Ditto.
(-[DOMXPathResult snapshotItem:]): Ditto.

Source/WebKit2:

• WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMDocument.cpp:

(webkit_dom_document_create_expression): Use ExceptionOr.
(webkit_dom_document_evaluate): Ditto.

• WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathExpression.cpp:

(webkit_dom_xpath_expression_evaluate): Ditto.

• WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMXPathResult.cpp:

(webkit_dom_xpath_result_iterate_next): Ditto.
(webkit_dom_xpath_result_snapshot_item): Ditto.
(webkit_dom_xpath_result_get_number_value): Ditto.
(webkit_dom_xpath_result_get_string_value): Ditto.
(webkit_dom_xpath_result_get_boolean_value): Ditto.
(webkit_dom_xpath_result_get_single_node_value): Ditto.
(webkit_dom_xpath_result_get_snapshot_length): Ditto.

File:

• trunk/Source/WebCore/xml/XPathExpression.cpp (modified) (5 diffs)

trunk/Source/WebCore/xml/XPathExpression.cpp

@@ -35 +35 @@
 #include "XPathResult.h"
 #include "XPathUtil.h"
-#include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -46 +45 @@
 }
 
-RefPtr<XPathExpression> XPathExpression::createExpression(const String& expression, RefPtr<XPathNSResolver>&& resolver, ExceptionCode& ec)
+ExceptionOr<Ref<XPathExpression>> XPathExpression::createExpression(const String& expression, RefPtr<XPathNSResolver>&& resolver)
 {
-    auto parsedExpression = Parser::parseStatement(expression, WTFMove(resolver), ec);
-    if (!parsedExpression)
-        return nullptr;
+    auto parseResult = Parser::parseStatement(expression, WTFMove(resolver));
+    if (parseResult.hasException())
+        return parseResult.releaseException();
 
-    return adoptRef(*new XPathExpression(WTFMove(parsedExpression)));
+    return adoptRef(*new XPathExpression(parseResult.releaseReturnValue()));
 }
 
@@ -59 +58 @@
 }
 
-RefPtr<XPathResult> XPathExpression::evaluate(Node* contextNode, unsigned short type, XPathResult*, ExceptionCode& ec)
+// FIXME: Why does this take an XPathResult that it ignores?
+ExceptionOr<Ref<XPathResult>> XPathExpression::evaluate(Node* contextNode, unsigned short type, XPathResult*)
 {
-    if (!isValidContextNode(contextNode)) {
-        ec = NOT_SUPPORTED_ERR;
-        return nullptr;
-    }
+    if (!isValidContextNode(contextNode))
+        return Exception { NOT_SUPPORTED_ERR };
 
     EvaluationContext& evaluationContext = Expression::evaluationContext();
@@ -71 +69 @@
     evaluationContext.position = 1;
     evaluationContext.hadTypeConversionError = false;
-    RefPtr<XPathResult> result = XPathResult::create(&contextNode->document(), m_topExpression->evaluate());
+    auto result = XPathResult::create(contextNode->document(), m_topExpression->evaluate());
     evaluationContext.node = nullptr; // Do not hold a reference to the context node, as this may prevent the whole document from being destroyed in time.
 
@@ -77 +75 @@
         // It is not specified what to do if type conversion fails while evaluating an expression, and INVALID_EXPRESSION_ERR is not exactly right
         // when the failure happens in an otherwise valid expression because of a variable. But XPathEvaluator does not support variables, so it's close enough.
-        ec = XPathException::INVALID_EXPRESSION_ERR;
-        return nullptr;
+        return Exception { XPathException::INVALID_EXPRESSION_ERR };
     }
 
     if (type != XPathResult::ANY_TYPE) {
-        ec = 0;
-        result->convertTo(type, ec);
-        if (ec)
-            return nullptr;
+        auto convertToResult = result->convertTo(type);
+        if (convertToResult.hasException())
+            return convertToResult.releaseException();
     }
 
-    return result;
+    return WTFMove(result);
 }