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

Timestamp:

Oct 6, 2021, 11:08:17 AM (4 years ago)

Author:

Darin Adler

Message:

Reduce use of "using namespace": eliminate all "using namespace XPath"
​https://bugs.webkit.org/show_bug.cgi?id=231302

Reviewed by Sam Weinig.

• xml/XPathEvaluator.cpp: Removed "using namespace XPath".

(WebCore::XPathEvaluator::evaluate): Use XPath prefix explicitly.

• xml/XPathExpression.cpp: Removed "using namespace XPath".

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

• xml/XPathGrammar.y: Removed "using namespace WebCore" and

"using namespace XPath".

• xml/XPathResult.cpp: Removed "using namespace XPath".

File:

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

trunk/Source/WebCore/xml/XPathExpression.cpp

@@ -35 +35 @@
 
 namespace WebCore {
-
-using namespace XPath;
     
 inline XPathExpression::XPathExpression(std::unique_ptr<XPath::Expression> expression)
@@ -45 +43 @@
 ExceptionOr<Ref<XPathExpression>> XPathExpression::createExpression(const String& expression, RefPtr<XPathNSResolver>&& resolver)
 {
-    auto parseResult = Parser::parseStatement(expression, WTFMove(resolver));
+    auto parseResult = XPath::Parser::parseStatement(expression, WTFMove(resolver));
     if (parseResult.hasException())
         return parseResult.releaseException();
@@ -57 +55 @@
 ExceptionOr<Ref<XPathResult>> XPathExpression::evaluate(Node& contextNode, unsigned short type, XPathResult*)
 {
-    if (!isValidContextNode(contextNode))
+    if (!XPath::isValidContextNode(contextNode))
         return Exception { NotSupportedError };
 
-    EvaluationContext& evaluationContext = Expression::evaluationContext();
+    auto& evaluationContext = XPath::Expression::evaluationContext();
     evaluationContext.node = &contextNode;
     evaluationContext.size = 1;