<!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>[174038] 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/174038">174038</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-09-27 21:13:59 -0700 (Sat, 27 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the new is<>() / downcast<>() for Attr Nodes
https://bugs.webkit.org/show_bug.cgi?id=137183
Reviewed by Ryosuke Niwa.
Use the new is<>() / downcast<>() for Attr Nodes instead of isAttr() /
toAttr().
No new tests, no behavior change.
* dom/Attr.h:
(WebCore::isAttr):
* dom/Document.cpp:
(WebCore::Document::importNode):
(WebCore::Document::adoptNode):
* dom/NamedNodeMap.cpp:
(WebCore::NamedNodeMap::setNamedItem):
* dom/Node.cpp:
(WebCore::Node::compareDocumentPosition):
* inspector/InspectorDOMAgent.cpp:
(WebCore::InspectorDOMAgent::buildObjectForNode):
* inspector/InspectorNodeFinder.cpp:
(WebCore::InspectorNodeFinder::searchUsingXPath):
* xml/XPathNodeSet.cpp:
(WebCore::XPath::sortBlock):
(WebCore::XPath::NodeSet::sort):
(WebCore::XPath::findRootNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomAttrh">trunk/Source/WebCore/dom/Attr.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNamedNodeMapcpp">trunk/Source/WebCore/dom/NamedNodeMap.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorNodeFindercpp">trunk/Source/WebCore/inspector/InspectorNodeFinder.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXPathNodeSetcpp">trunk/Source/WebCore/xml/XPathNodeSet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174037 => 174038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-27 22:17:29 UTC (rev 174037)
+++ trunk/Source/WebCore/ChangeLog 2014-09-28 04:13:59 UTC (rev 174038)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-09-27 Christophe Dumez <cdumez@apple.com>
+
+ Use the new is<>() / downcast<>() for Attr Nodes
+ https://bugs.webkit.org/show_bug.cgi?id=137183
+
+ Reviewed by Ryosuke Niwa.
+
+ Use the new is<>() / downcast<>() for Attr Nodes instead of isAttr() /
+ toAttr().
+
+ No new tests, no behavior change.
+
+ * dom/Attr.h:
+ (WebCore::isAttr):
+ * dom/Document.cpp:
+ (WebCore::Document::importNode):
+ (WebCore::Document::adoptNode):
+ * dom/NamedNodeMap.cpp:
+ (WebCore::NamedNodeMap::setNamedItem):
+ * dom/Node.cpp:
+ (WebCore::Node::compareDocumentPosition):
+ * inspector/InspectorDOMAgent.cpp:
+ (WebCore::InspectorDOMAgent::buildObjectForNode):
+ * inspector/InspectorNodeFinder.cpp:
+ (WebCore::InspectorNodeFinder::searchUsingXPath):
+ * xml/XPathNodeSet.cpp:
+ (WebCore::XPath::sortBlock):
+ (WebCore::XPath::NodeSet::sort):
+ (WebCore::XPath::findRootNode):
+
</ins><span class="cx"> 2014-09-27 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Replay: Playback position updates should be sent before the next event loop input is dispatched
</span></span></pre></div>
<a id="trunkSourceWebCoredomAttrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Attr.h (174037 => 174038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Attr.h 2014-09-27 22:17:29 UTC (rev 174037)
+++ trunk/Source/WebCore/dom/Attr.h 2014-09-28 04:13:59 UTC (rev 174038)
</span><span class="lines">@@ -99,11 +99,10 @@
</span><span class="cx"> unsigned m_ignoreChildrenChanged;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline bool isAttr(const Node& node) { return node.isAttributeNode(); }
-void isAttr(const Attr&); // Catch unnecessary runtime check of type known at compile time.
</del><ins>+SPECIALIZE_TYPE_TRAITS_BEGIN(Attr)
+ static bool isAttr(const Node& node) { return node.isAttributeNode(); }
+SPECIALIZE_TYPE_TRAITS_END()
</ins><span class="cx">
</span><del>-NODE_TYPE_CASTS(Attr)
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // Attr_h
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (174037 => 174038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-09-27 22:17:29 UTC (rev 174037)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-09-28 04:13:59 UTC (rev 174038)
</span><span class="lines">@@ -966,7 +966,7 @@
</span><span class="cx"> return newElement.release();
</span><span class="cx"> }
</span><span class="cx"> case ATTRIBUTE_NODE:
</span><del>- return Attr::create(*this, QualifiedName(nullAtom, toAttr(*importedNode).name(), nullAtom), toAttr(*importedNode).value());
</del><ins>+ return Attr::create(*this, QualifiedName(nullAtom, downcast<Attr>(*importedNode).name(), nullAtom), downcast<Attr>(*importedNode).value());
</ins><span class="cx"> case DOCUMENT_FRAGMENT_NODE: {
</span><span class="cx"> if (importedNode->isShadowRoot()) {
</span><span class="cx"> // ShadowRoot nodes should not be explicitly importable.
</span><span class="lines">@@ -1025,7 +1025,7 @@
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span><span class="cx"> return nullptr;
</span><span class="cx"> case ATTRIBUTE_NODE: {
</span><del>- Attr& attr = toAttr(*source);
</del><ins>+ Attr& attr = downcast<Attr>(*source);
</ins><span class="cx"> if (attr.ownerElement())
</span><span class="cx"> attr.ownerElement()->removeAttributeNode(&attr, ec);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoredomNamedNodeMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NamedNodeMap.cpp (174037 => 174038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NamedNodeMap.cpp 2014-09-27 22:17:29 UTC (rev 174037)
+++ trunk/Source/WebCore/dom/NamedNodeMap.cpp 2014-09-28 04:13:59 UTC (rev 174038)
</span><span class="lines">@@ -82,16 +82,16 @@
</span><span class="cx"> {
</span><span class="cx"> if (!node) {
</span><span class="cx"> ec = NOT_FOUND_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Not mentioned in spec: throw a HIERARCHY_REQUEST_ERROR if the user passes in a non-attribute node
</span><del>- if (!node->isAttributeNode()) {
</del><ins>+ if (!is<Attr>(node)) {
</ins><span class="cx"> ec = HIERARCHY_REQUEST_ERR;
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return m_element.setAttributeNode(toAttr(node), ec);
</del><ins>+ return m_element.setAttributeNode(downcast<Attr>(node), ec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Node> NamedNodeMap::setNamedItemNS(Node* node, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (174037 => 174038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2014-09-27 22:17:29 UTC (rev 174037)
+++ trunk/Source/WebCore/dom/Node.cpp 2014-09-28 04:13:59 UTC (rev 174038)
</span><span class="lines">@@ -1397,15 +1397,15 @@
</span><span class="cx">
</span><span class="cx"> unsigned short Node::compareDocumentPosition(Node* otherNode)
</span><span class="cx"> {
</span><del>- // It is not clear what should be done if |otherNode| is 0.
</del><ins>+ // It is not clear what should be done if |otherNode| is nullptr.
</ins><span class="cx"> if (!otherNode)
</span><span class="cx"> return DOCUMENT_POSITION_DISCONNECTED;
</span><span class="cx">
</span><span class="cx"> if (otherNode == this)
</span><span class="cx"> return DOCUMENT_POSITION_EQUIVALENT;
</span><span class="cx">
</span><del>- Attr* attr1 = isAttributeNode() ? toAttr(this) : nullptr;
- Attr* attr2 = otherNode->isAttributeNode() ? toAttr(otherNode) : nullptr;
</del><ins>+ Attr* attr1 = is<Attr>(this) ? downcast<Attr>(this) : nullptr;
+ Attr* attr2 = is<Attr>(otherNode) ? downcast<Attr>(otherNode) : nullptr;
</ins><span class="cx">
</span><span class="cx"> Node* start1 = attr1 ? attr1->ownerElement() : this;
</span><span class="cx"> Node* start2 = attr2 ? attr2->ownerElement() : otherNode;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp (174037 => 174038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-09-27 22:17:29 UTC (rev 174037)
+++ trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp 2014-09-28 04:13:59 UTC (rev 174038)
</span><span class="lines">@@ -1311,10 +1311,10 @@
</span><span class="cx"> value->setPublicId(docType->publicId());
</span><span class="cx"> value->setSystemId(docType->systemId());
</span><span class="cx"> value->setInternalSubset(docType->internalSubset());
</span><del>- } else if (node->isAttributeNode()) {
- Attr* attribute = toAttr(node);
- value->setName(attribute->name());
- value->setValue(attribute->value());
</del><ins>+ } else if (is<Attr>(node)) {
+ Attr& attribute = downcast<Attr>(*node);
+ value->setName(attribute.name());
+ value->setValue(attribute.value());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Need to enable AX to get the computed role.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorNodeFindercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorNodeFinder.cpp (174037 => 174038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorNodeFinder.cpp 2014-09-27 22:17:29 UTC (rev 174037)
+++ trunk/Source/WebCore/inspector/InspectorNodeFinder.cpp 2014-09-28 04:13:59 UTC (rev 174038)
</span><span class="lines">@@ -146,8 +146,8 @@
</span><span class="cx"> if (ec)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (node->isAttributeNode())
- node = toAttr(node)->ownerElement();
</del><ins>+ if (is<Attr>(node))
+ node = downcast<Attr>(*node).ownerElement();
</ins><span class="cx">
</span><span class="cx"> // XPath can get out of the context node that we pass as the starting point to evaluate, so we need to filter for just the nodes we care about.
</span><span class="cx"> if (node == parentNode || node->isDescendantOf(parentNode))
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathNodeSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathNodeSet.cpp (174037 => 174038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathNodeSet.cpp 2014-09-27 22:17:29 UTC (rev 174037)
+++ trunk/Source/WebCore/xml/XPathNodeSet.cpp 2014-09-28 04:13:59 UTC (rev 174038)
</span><span class="lines">@@ -94,8 +94,8 @@
</span><span class="cx"> unsigned sortedEnd = from;
</span><span class="cx"> // FIXME: namespace nodes are not implemented.
</span><span class="cx"> for (unsigned i = sortedEnd; i < to; ++i) {
</span><del>- Node* n = parentMatrix[i][0];
- if (n->isAttributeNode() && toAttr(n)->ownerElement() == commonAncestor)
</del><ins>+ Node* node = parentMatrix[i][0];
+ if (is<Attr>(node) && downcast<Attr>(*node).ownerElement() == commonAncestor)
</ins><span class="cx"> parentMatrix[i].swap(parentMatrix[sortedEnd++]);
</span><span class="cx"> }
</span><span class="cx"> if (sortedEnd != from) {
</span><span class="lines">@@ -155,15 +155,15 @@
</span><span class="cx"> Vector<Vector<Node*>> parentMatrix(nodeCount);
</span><span class="cx"> for (unsigned i = 0; i < nodeCount; ++i) {
</span><span class="cx"> Vector<Node*>& parentsVector = parentMatrix[i];
</span><del>- Node* n = m_nodes[i].get();
- parentsVector.append(n);
- if (n->isAttributeNode()) {
- n = toAttr(n)->ownerElement();
- parentsVector.append(n);
</del><ins>+ Node* node = m_nodes[i].get();
+ parentsVector.append(node);
+ if (is<Attr>(node)) {
+ node = downcast<Attr>(*node).ownerElement();
+ parentsVector.append(node);
</ins><span class="cx"> containsAttributeNodes = true;
</span><span class="cx"> }
</span><del>- while ((n = n->parentNode()))
- parentsVector.append(n);
</del><ins>+ while ((node = node->parentNode()))
+ parentsVector.append(node);
</ins><span class="cx"> }
</span><span class="cx"> sortBlock(0, nodeCount, parentMatrix, containsAttributeNodes);
</span><span class="cx">
</span><span class="lines">@@ -179,8 +179,8 @@
</span><span class="cx">
</span><span class="cx"> static Node* findRootNode(Node* node)
</span><span class="cx"> {
</span><del>- if (node->isAttributeNode())
- node = toAttr(node)->ownerElement();
</del><ins>+ if (is<Attr>(node))
+ node = downcast<Attr>(*node).ownerElement();
</ins><span class="cx"> if (node->inDocument())
</span><span class="cx"> node = &node->document();
</span><span class="cx"> else {
</span></span></pre>
</div>
</div>
</body>
</html>