<!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>[190210] trunk/Source</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/190210">190210</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-24 11:17:08 -0700 (Thu, 24 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop XPATH_NAMESPACE_NODE from Node::NodeType enum
https://bugs.webkit.org/show_bug.cgi?id=149532
Reviewed by Ryosuke Niwa.
Drop XPATH_NAMESPACE_NODE from Node::NodeType enum as there is currently
no way to construct such Node in WebKit. This avoid having to handle this
Node type everywhere.
Source/WebCore:
* bindings/gobject/WebKitDOMPrivate.cpp:
(WebKit::wrap): Deleted.
* bindings/objc/DOM.mm:
(kitClass): Deleted.
* dom/Document.cpp:
(WebCore::Document::importNode):
(WebCore::Document::adoptNode): Deleted.
(WebCore::Document::childTypeAllowed): Deleted.
(WebCore::Document::canAcceptChild): Deleted.
* dom/Node.cpp:
(WebCore::Node::dumpStatistics): Deleted.
(WebCore::Node::textContent): Deleted.
(WebCore::Node::ancestorElement): Deleted.
* dom/Node.h:
* dom/Range.cpp:
(WebCore::Range::checkNodeWOffset):
(WebCore::lengthOfContentsInNode): Deleted.
(WebCore::Range::processContentsBetweenOffsets): Deleted.
(WebCore::Range::surroundContents): Deleted.
* editing/MarkupAccumulator.cpp:
(WebCore::MarkupAccumulator::appendStartMarkup): Deleted.
* xml/XPathFunctions.cpp:
(WebCore::XPath::expandedNameLocalPart): Deleted.
* xml/XPathStep.cpp:
(WebCore::XPath::Step::nodesInAxis):
(WebCore::XPath::primaryNodeType): Deleted.
* xml/XPathUtil.cpp:
(WebCore::XPath::stringValue): Deleted.
(WebCore::XPath::isValidContextNode): Deleted.
Source/WebKit2:
* WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm:
(WebKit::WKDOMNodeClass): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMPrivatecpp">trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMmm">trunk/Source/WebCore/bindings/objc/DOM.mm</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCoredomRangecpp">trunk/Source/WebCore/dom/Range.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingMarkupAccumulatorcpp">trunk/Source/WebCore/editing/MarkupAccumulator.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXPathFunctionscpp">trunk/Source/WebCore/xml/XPathFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXPathStepcpp">trunk/Source/WebCore/xml/XPathStep.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXPathUtilcpp">trunk/Source/WebCore/xml/XPathUtil.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKDOMInternalsmm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebCore/ChangeLog 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2015-09-24 Chris Dumez <cdumez@apple.com>
+
+ Drop XPATH_NAMESPACE_NODE from Node::NodeType enum
+ https://bugs.webkit.org/show_bug.cgi?id=149532
+
+ Reviewed by Ryosuke Niwa.
+
+ Drop XPATH_NAMESPACE_NODE from Node::NodeType enum as there is currently
+ no way to construct such Node in WebKit. This avoid having to handle this
+ Node type everywhere.
+
+ * bindings/gobject/WebKitDOMPrivate.cpp:
+ (WebKit::wrap): Deleted.
+ * bindings/objc/DOM.mm:
+ (kitClass): Deleted.
+ * dom/Document.cpp:
+ (WebCore::Document::importNode):
+ (WebCore::Document::adoptNode): Deleted.
+ (WebCore::Document::childTypeAllowed): Deleted.
+ (WebCore::Document::canAcceptChild): Deleted.
+ * dom/Node.cpp:
+ (WebCore::Node::dumpStatistics): Deleted.
+ (WebCore::Node::textContent): Deleted.
+ (WebCore::Node::ancestorElement): Deleted.
+ * dom/Node.h:
+ * dom/Range.cpp:
+ (WebCore::Range::checkNodeWOffset):
+ (WebCore::lengthOfContentsInNode): Deleted.
+ (WebCore::Range::processContentsBetweenOffsets): Deleted.
+ (WebCore::Range::surroundContents): Deleted.
+ * editing/MarkupAccumulator.cpp:
+ (WebCore::MarkupAccumulator::appendStartMarkup): Deleted.
+ * xml/XPathFunctions.cpp:
+ (WebCore::XPath::expandedNameLocalPart): Deleted.
+ * xml/XPathStep.cpp:
+ (WebCore::XPath::Step::nodesInAxis):
+ (WebCore::XPath::primaryNodeType): Deleted.
+ * xml/XPathUtil.cpp:
+ (WebCore::XPath::stringValue): Deleted.
+ (WebCore::XPath::isValidContextNode): Deleted.
+
</ins><span class="cx"> 2015-09-24 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Add support for CSS Custom Properties (in preparation for implementing CSS Variables).
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -104,8 +104,6 @@
</span><span class="cx"> return WEBKIT_DOM_NODE(wrapDocumentType(static_cast<DocumentType*>(node)));
</span><span class="cx"> case Node::DOCUMENT_FRAGMENT_NODE:
</span><span class="cx"> return WEBKIT_DOM_NODE(wrapDocumentFragment(static_cast<DocumentFragment*>(node)));
</span><del>- case Node::XPATH_NAMESPACE_NODE:
- break;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return wrapNode(node);
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOM.mm (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOM.mm 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebCore/bindings/objc/DOM.mm 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -323,10 +323,6 @@
</span><span class="cx"> return [DOMDocumentType class];
</span><span class="cx"> case WebCore::Node::DOCUMENT_FRAGMENT_NODE:
</span><span class="cx"> return [DOMDocumentFragment class];
</span><del>- case WebCore::Node::XPATH_NAMESPACE_NODE:
- // FIXME: Create an XPath objective C wrapper
- // See http://bugs.webkit.org/show_bug.cgi?id=8755
- return nil;
</del><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nil;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -952,11 +952,8 @@
</span><span class="cx"> case DOCUMENT_NODE: // Can't import a document into another document.
</span><span class="cx"> case DOCUMENT_TYPE_NODE: // FIXME: Support cloning a DocumentType node per DOM4.
</span><span class="cx"> break;
</span><del>-
- case XPATH_NAMESPACE_NODE:
- ASSERT_NOT_REACHED(); // These two types of DOM nodes are not implemented.
- break;
</del><span class="cx"> }
</span><ins>+
</ins><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -973,7 +970,6 @@
</span><span class="cx">
</span><span class="cx"> switch (source->nodeType()) {
</span><span class="cx"> case DOCUMENT_NODE:
</span><del>- case XPATH_NAMESPACE_NODE:
</del><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return nullptr;
</span><span class="cx"> case ATTRIBUTE_NODE: {
</span><span class="lines">@@ -3344,7 +3340,6 @@
</span><span class="cx"> case DOCUMENT_FRAGMENT_NODE:
</span><span class="cx"> case DOCUMENT_NODE:
</span><span class="cx"> case TEXT_NODE:
</span><del>- case XPATH_NAMESPACE_NODE:
</del><span class="cx"> return false;
</span><span class="cx"> case COMMENT_NODE:
</span><span class="cx"> case PROCESSING_INSTRUCTION_NODE:
</span><span class="lines">@@ -3371,7 +3366,6 @@
</span><span class="cx"> case CDATA_SECTION_NODE:
</span><span class="cx"> case DOCUMENT_NODE:
</span><span class="cx"> case TEXT_NODE:
</span><del>- case XPATH_NAMESPACE_NODE:
</del><span class="cx"> return false;
</span><span class="cx"> case COMMENT_NODE:
</span><span class="cx"> case PROCESSING_INSTRUCTION_NODE:
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebCore/dom/Node.cpp 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -108,7 +108,6 @@
</span><span class="cx"> size_t documentNodes = 0;
</span><span class="cx"> size_t docTypeNodes = 0;
</span><span class="cx"> size_t fragmentNodes = 0;
</span><del>- size_t xpathNSNodes = 0;
</del><span class="cx"> size_t shadowRootNodes = 0;
</span><span class="cx">
</span><span class="cx"> HashMap<String, size_t> perTagCount;
</span><span class="lines">@@ -190,10 +189,6 @@
</span><span class="cx"> ++fragmentNodes;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- case XPATH_NAMESPACE_NODE: {
- ++xpathNSNodes;
- break;
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -211,7 +206,6 @@
</span><span class="cx"> printf(" Number of Document nodes: %zu\n", documentNodes);
</span><span class="cx"> printf(" Number of DocumentType nodes: %zu\n", docTypeNodes);
</span><span class="cx"> printf(" Number of DocumentFragment nodes: %zu\n", fragmentNodes);
</span><del>- printf(" Number of XPathNS nodes: %zu\n", xpathNSNodes);
</del><span class="cx"> printf(" Number of ShadowRoot nodes: %zu\n", shadowRootNodes);
</span><span class="cx">
</span><span class="cx"> printf("Element tag name distibution:\n");
</span><span class="lines">@@ -1416,7 +1410,6 @@
</span><span class="cx">
</span><span class="cx"> case Node::DOCUMENT_NODE:
</span><span class="cx"> case Node::DOCUMENT_TYPE_NODE:
</span><del>- case Node::XPATH_NAMESPACE_NODE:
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1450,7 +1443,6 @@
</span><span class="cx"> }
</span><span class="cx"> case DOCUMENT_NODE:
</span><span class="cx"> case DOCUMENT_TYPE_NODE:
</span><del>- case XPATH_NAMESPACE_NODE:
</del><span class="cx"> // Do nothing.
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebCore/dom/Node.h 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -130,7 +130,6 @@
</span><span class="cx"> DOCUMENT_NODE = 9,
</span><span class="cx"> DOCUMENT_TYPE_NODE = 10,
</span><span class="cx"> DOCUMENT_FRAGMENT_NODE = 11,
</span><del>- XPATH_NAMESPACE_NODE = 13,
</del><span class="cx"> };
</span><span class="cx"> enum DeprecatedNodeType {
</span><span class="cx"> ENTITY_REFERENCE_NODE = 5,
</span></span></pre></div>
<a id="trunkSourceWebCoredomRangecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Range.cpp (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Range.cpp 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebCore/dom/Range.cpp 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -556,7 +556,6 @@
</span><span class="cx"> {
</span><span class="cx"> // This switch statement must be consistent with that of Range::processContentsBetweenOffsets.
</span><span class="cx"> switch (node.nodeType()) {
</span><del>- case Node::XPATH_NAMESPACE_NODE: // FIXME: Remove from NodeType as there is no way to construct such Node in WebKit.
</del><span class="cx"> case Node::DOCUMENT_TYPE_NODE:
</span><span class="cx"> return 0;
</span><span class="cx"> case Node::TEXT_NODE:
</span><span class="lines">@@ -727,7 +726,6 @@
</span><span class="cx"> case Node::DOCUMENT_NODE:
</span><span class="cx"> case Node::DOCUMENT_TYPE_NODE:
</span><span class="cx"> case Node::DOCUMENT_FRAGMENT_NODE:
</span><del>- case Node::XPATH_NAMESPACE_NODE:
</del><span class="cx"> // FIXME: Should we assert that some nodes never appear here?
</span><span class="cx"> if (action == Extract || action == Clone) {
</span><span class="cx"> if (fragment)
</span><span class="lines">@@ -1005,8 +1003,7 @@
</span><span class="cx"> case Node::ATTRIBUTE_NODE:
</span><span class="cx"> case Node::DOCUMENT_FRAGMENT_NODE:
</span><span class="cx"> case Node::DOCUMENT_NODE:
</span><del>- case Node::ELEMENT_NODE:
- case Node::XPATH_NAMESPACE_NODE: {
</del><ins>+ case Node::ELEMENT_NODE: {
</ins><span class="cx"> if (!offset)
</span><span class="cx"> return nullptr;
</span><span class="cx"> Node* childBefore = n->traverseToChildAt(offset - 1);
</span><span class="lines">@@ -1147,7 +1144,6 @@
</span><span class="cx"> case Node::ELEMENT_NODE:
</span><span class="cx"> case Node::PROCESSING_INSTRUCTION_NODE:
</span><span class="cx"> case Node::TEXT_NODE:
</span><del>- case Node::XPATH_NAMESPACE_NODE:
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingMarkupAccumulatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/MarkupAccumulator.cpp (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -573,7 +573,6 @@
</span><span class="cx"> appendCDATASection(result, downcast<CDATASection>(node).data());
</span><span class="cx"> break;
</span><span class="cx"> case Node::ATTRIBUTE_NODE:
</span><del>- case Node::XPATH_NAMESPACE_NODE:
</del><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathFunctions.cpp (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathFunctions.cpp 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebCore/xml/XPathFunctions.cpp 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -360,8 +360,6 @@
</span><span class="cx">
</span><span class="cx"> static inline String expandedNameLocalPart(Node* node)
</span><span class="cx"> {
</span><del>- // The local part of an XPath expanded-name matches DOM local name for most node types, except for namespace nodes and processing instruction nodes.
- ASSERT(node->nodeType() != Node::XPATH_NAMESPACE_NODE); // Not supported yet.
</del><span class="cx"> if (is<ProcessingInstruction>(*node))
</span><span class="cx"> return downcast<ProcessingInstruction>(*node).target();
</span><span class="cx"> return node->localName().string();
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathStepcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathStep.cpp (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathStep.cpp 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebCore/xml/XPathStep.cpp 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -153,8 +153,6 @@
</span><span class="cx"> switch (axis) {
</span><span class="cx"> case Step::AttributeAxis:
</span><span class="cx"> return Node::ATTRIBUTE_NODE;
</span><del>- case Step::NamespaceAxis:
- return Node::XPATH_NAMESPACE_NODE;
</del><span class="cx"> default:
</span><span class="cx"> return Node::ELEMENT_NODE;
</span><span class="cx"> }
</span><span class="lines">@@ -285,7 +283,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> case FollowingSiblingAxis:
</span><del>- if (context.nodeType() == Node::ATTRIBUTE_NODE || context.nodeType() == Node::XPATH_NAMESPACE_NODE)
</del><ins>+ if (context.isAttributeNode())
</ins><span class="cx"> return;
</span><span class="cx"> for (Node* node = context.nextSibling(); node; node = node->nextSibling()) {
</span><span class="cx"> if (nodeMatches(*node, FollowingSiblingAxis, m_nodeTest))
</span><span class="lines">@@ -293,7 +291,7 @@
</span><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> case PrecedingSiblingAxis:
</span><del>- if (context.nodeType() == Node::ATTRIBUTE_NODE || context.nodeType() == Node::XPATH_NAMESPACE_NODE)
</del><ins>+ if (context.isAttributeNode())
</ins><span class="cx"> return;
</span><span class="cx"> for (Node* node = context.previousSibling(); node; node = node->previousSibling()) {
</span><span class="cx"> if (nodeMatches(*node, PrecedingSiblingAxis, m_nodeTest))
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathUtilcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathUtil.cpp (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathUtil.cpp 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebCore/xml/XPathUtil.cpp 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> case Node::COMMENT_NODE:
</span><span class="cx"> case Node::TEXT_NODE:
</span><span class="cx"> case Node::CDATA_SECTION_NODE:
</span><del>- case Node::XPATH_NAMESPACE_NODE:
</del><span class="cx"> return node->nodeValue();
</span><span class="cx"> default:
</span><span class="cx"> if (isRootDomNode(node) || node->isElementNode())
</span><span class="lines">@@ -67,7 +66,6 @@
</span><span class="cx"> case Node::DOCUMENT_NODE:
</span><span class="cx"> case Node::ELEMENT_NODE:
</span><span class="cx"> case Node::PROCESSING_INSTRUCTION_NODE:
</span><del>- case Node::XPATH_NAMESPACE_NODE:
</del><span class="cx"> return true;
</span><span class="cx"> case Node::DOCUMENT_FRAGMENT_NODE:
</span><span class="cx"> case Node::DOCUMENT_TYPE_NODE:
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-09-24 Chris Dumez <cdumez@apple.com>
+
+ Drop XPATH_NAMESPACE_NODE from Node::NodeType enum
+ https://bugs.webkit.org/show_bug.cgi?id=149532
+
+ Reviewed by Ryosuke Niwa.
+
+ Drop XPATH_NAMESPACE_NODE from Node::NodeType enum as there is currently
+ no way to construct such Node in WebKit. This avoid having to handle this
+ Node type everywhere.
+
+ * WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm:
+ (WebKit::WKDOMNodeClass): Deleted.
+
</ins><span class="cx"> 2015-09-24 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Ran sort-Xcode-project-file.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKDOMInternalsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm (190209 => 190210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm 2015-09-24 18:15:52 UTC (rev 190209)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm 2015-09-24 18:17:08 UTC (rev 190210)
</span><span class="lines">@@ -80,7 +80,6 @@
</span><span class="cx"> case WebCore::Node::COMMENT_NODE:
</span><span class="cx"> case WebCore::Node::DOCUMENT_TYPE_NODE:
</span><span class="cx"> case WebCore::Node::DOCUMENT_FRAGMENT_NODE:
</span><del>- case WebCore::Node::XPATH_NAMESPACE_NODE:
</del><span class="cx"> return [WKDOMNode class];
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre>
</div>
</div>
</body>
</html>