<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[283636] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/283636">283636</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2021-10-06 11:08:17 -0700 (Wed, 06 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>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".</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorexmlXPathEvaluatorcpp">trunk/Source/WebCore/xml/XPathEvaluator.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXPathExpressioncpp">trunk/Source/WebCore/xml/XPathExpression.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXPathGrammary">trunk/Source/WebCore/xml/XPathGrammar.y</a></li>
<li><a href="#trunkSourceWebCorexmlXPathResultcpp">trunk/Source/WebCore/xml/XPathResult.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (283635 => 283636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-06 18:00:02 UTC (rev 283635)
+++ trunk/Source/WebCore/ChangeLog      2021-10-06 18:08:17 UTC (rev 283636)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2021-10-06  Darin Adler  <darin@apple.com>
+
+        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".
+
</ins><span class="cx"> 2021-10-06  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Don't use namespace WebCore::XPath at global scope
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathEvaluatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathEvaluator.cpp (283635 => 283636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathEvaluator.cpp      2021-10-06 18:00:02 UTC (rev 283635)
+++ trunk/Source/WebCore/xml/XPathEvaluator.cpp 2021-10-06 18:08:17 UTC (rev 283636)
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-using namespace XPath;
-
</del><span class="cx"> ExceptionOr<Ref<XPathExpression>> XPathEvaluator::createExpression(const String& expression, RefPtr<XPathNSResolver>&& resolver)
</span><span class="cx"> {
</span><span class="cx">     return XPathExpression::createExpression(expression, WTFMove(resolver));
</span><span class="lines">@@ -48,7 +46,7 @@
</span><span class="cx"> 
</span><span class="cx"> ExceptionOr<Ref<XPathResult>> XPathEvaluator::evaluate(const String& expression, Node& contextNode, RefPtr<XPathNSResolver>&& resolver, unsigned short type, XPathResult* result)
</span><span class="cx"> {
</span><del>-    if (!isValidContextNode(contextNode))
</del><ins>+    if (!XPath::isValidContextNode(contextNode))
</ins><span class="cx">         return Exception { NotSupportedError };
</span><span class="cx"> 
</span><span class="cx">     auto createResult = createExpression(expression, WTFMove(resolver));
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathExpressioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathExpression.cpp (283635 => 283636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathExpression.cpp     2021-10-06 18:00:02 UTC (rev 283635)
+++ trunk/Source/WebCore/xml/XPathExpression.cpp        2021-10-06 18:08:17 UTC (rev 283636)
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx"> #include "XPathUtil.h"
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><del>-
-using namespace XPath;
</del><span class="cx">     
</span><span class="cx"> inline XPathExpression::XPathExpression(std::unique_ptr<XPath::Expression> expression)
</span><span class="cx">     : m_topExpression(WTFMove(expression))
</span><span class="lines">@@ -44,7 +42,7 @@
</span><span class="cx"> 
</span><span class="cx"> ExceptionOr<Ref<XPathExpression>> XPathExpression::createExpression(const String& expression, RefPtr<XPathNSResolver>&& resolver)
</span><span class="cx"> {
</span><del>-    auto parseResult = Parser::parseStatement(expression, WTFMove(resolver));
</del><ins>+    auto parseResult = XPath::Parser::parseStatement(expression, WTFMove(resolver));
</ins><span class="cx">     if (parseResult.hasException())
</span><span class="cx">         return parseResult.releaseException();
</span><span class="cx"> 
</span><span class="lines">@@ -56,10 +54,10 @@
</span><span class="cx"> // FIXME: Why does this take an XPathResult that it ignores?
</span><span class="cx"> ExceptionOr<Ref<XPathResult>> XPathExpression::evaluate(Node& contextNode, unsigned short type, XPathResult*)
</span><span class="cx"> {
</span><del>-    if (!isValidContextNode(contextNode))
</del><ins>+    if (!XPath::isValidContextNode(contextNode))
</ins><span class="cx">         return Exception { NotSupportedError };
</span><span class="cx"> 
</span><del>-    EvaluationContext& evaluationContext = Expression::evaluationContext();
</del><ins>+    auto& evaluationContext = XPath::Expression::evaluationContext();
</ins><span class="cx">     evaluationContext.node = &contextNode;
</span><span class="cx">     evaluationContext.size = 1;
</span><span class="cx">     evaluationContext.position = 1;
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathGrammary"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathGrammar.y (283635 => 283636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathGrammar.y  2021-10-06 18:00:02 UTC (rev 283635)
+++ trunk/Source/WebCore/xml/XPathGrammar.y     2021-10-06 18:08:17 UTC (rev 283636)
</span><span class="lines">@@ -48,9 +48,6 @@
</span><span class="cx"> #define YYDEBUG 0
</span><span class="cx"> #define YYMAXDEPTH 10000
</span><span class="cx"> 
</span><del>-using namespace WebCore;
-using namespace XPath;
-
</del><span class="cx"> %}
</span><span class="cx"> 
</span><span class="cx"> %pure-parser
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathResult.cpp (283635 => 283636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathResult.cpp 2021-10-06 18:00:02 UTC (rev 283635)
+++ trunk/Source/WebCore/xml/XPathResult.cpp    2021-10-06 18:08:17 UTC (rev 283636)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-using namespace XPath;
-
</del><span class="cx"> XPathResult::XPathResult(Document& document, const Value& value)
</span><span class="cx">     : m_value(value)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>

</body>
</html>