<!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>[173609] 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/173609">173609</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-09-14 19:23:01 -0700 (Sun, 14 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unnecessary overloads taking a ContainerNode in Element Traversal
https://bugs.webkit.org/show_bug.cgi?id=136767
Reviewed by Darin Adler.
Remove unnecessary overloads taking a ContainerNode in Element Traversal.
Several of those don't bring any performance improvements as the needed
methods are defined on Node (not ContainerNode).
No new tests, no behavior change.
* dom/ElementTraversal.h:
(WebCore::Traversal<Element>::previous):
NodeTraversal::previous() takes a const Node* in argument so the
ContainerNode overload is not needed.
(WebCore::Traversal<ElementType>::previous):
Unnecessary now that Traversal<Element>::previous() takes a const Node*
in argument.
(WebCore::Traversal<ElementType>::nextSibling):
nextSibling() is defined on Node, not ContainerNode, so the overload
is not needed.
(WebCore::Traversal<ElementType>::previousSibling):
previousSibling() is defined on Node, not ContainerNode, so the overload
is not needed.
(WebCore::Traversal<Element>::previousTemplate): Deleted.
(WebCore::Traversal<ElementType>::previousTemplate): Deleted.
(WebCore::Traversal<ElementType>::nextSiblingTemplate): Deleted.
(WebCore::Traversal<ElementType>::previousSiblingTemplate): Deleted.
No need to have those functions templated anymore.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomElementTraversalh">trunk/Source/WebCore/dom/ElementTraversal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173608 => 173609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-15 01:51:56 UTC (rev 173608)
+++ trunk/Source/WebCore/ChangeLog 2014-09-15 02:23:01 UTC (rev 173609)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-09-14 Chris Dumez <cdumez@apple.com>
+
+ Remove unnecessary overloads taking a ContainerNode in Element Traversal
+ https://bugs.webkit.org/show_bug.cgi?id=136767
+
+ Reviewed by Darin Adler.
+
+ Remove unnecessary overloads taking a ContainerNode in Element Traversal.
+ Several of those don't bring any performance improvements as the needed
+ methods are defined on Node (not ContainerNode).
+
+ No new tests, no behavior change.
+
+ * dom/ElementTraversal.h:
+ (WebCore::Traversal<Element>::previous):
+ NodeTraversal::previous() takes a const Node* in argument so the
+ ContainerNode overload is not needed.
+
+ (WebCore::Traversal<ElementType>::previous):
+ Unnecessary now that Traversal<Element>::previous() takes a const Node*
+ in argument.
+
+ (WebCore::Traversal<ElementType>::nextSibling):
+ nextSibling() is defined on Node, not ContainerNode, so the overload
+ is not needed.
+
+ (WebCore::Traversal<ElementType>::previousSibling):
+ previousSibling() is defined on Node, not ContainerNode, so the overload
+ is not needed.
+
+ (WebCore::Traversal<Element>::previousTemplate): Deleted.
+ (WebCore::Traversal<ElementType>::previousTemplate): Deleted.
+ (WebCore::Traversal<ElementType>::nextSiblingTemplate): Deleted.
+ (WebCore::Traversal<ElementType>::previousSiblingTemplate): Deleted.
+ No need to have those functions templated anymore.
+
</ins><span class="cx"> 2014-09-14 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Attempt to fix the iOS build after <http://trac.webkit.org/changeset/173606>
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementTraversalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementTraversal.h (173608 => 173609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementTraversal.h 2014-09-15 01:51:56 UTC (rev 173608)
+++ trunk/Source/WebCore/dom/ElementTraversal.h 2014-09-15 02:23:01 UTC (rev 173609)
</span><span class="lines">@@ -52,14 +52,10 @@
</span><span class="cx"> static ElementType* next(const ContainerNode*, const Node* stayWithin);
</span><span class="cx"> static ElementType* previous(const Node*);
</span><span class="cx"> static ElementType* previous(const Node*, const Node* stayWithin);
</span><del>- static ElementType* previous(const ContainerNode*);
- static ElementType* previous(const ContainerNode*, const Node* stayWithin);
</del><span class="cx">
</span><span class="cx"> // Next or previous ElementType sibling if there is one.
</span><span class="cx"> static ElementType* nextSibling(const Node*);
</span><del>- static ElementType* nextSibling(const ContainerNode*);
</del><span class="cx"> static ElementType* previousSibling(const Node*);
</span><del>- static ElementType* previousSibling(const ContainerNode*);
</del><span class="cx">
</span><span class="cx"> // Like next, but skips children.
</span><span class="cx"> static ElementType* nextSkippingChildren(const Node*);
</span><span class="lines">@@ -72,10 +68,6 @@
</span><span class="cx"> template <typename CurrentType> static ElementType* lastWithinTemplate(CurrentType*);
</span><span class="cx"> template <typename CurrentType> static ElementType* nextTemplate(CurrentType*);
</span><span class="cx"> template <typename CurrentType> static ElementType* nextTemplate(CurrentType*, const Node* stayWithin);
</span><del>- template <typename CurrentType> static ElementType* previousTemplate(CurrentType*);
- template <typename CurrentType> static ElementType* previousTemplate(CurrentType*, const Node* stayWithin);
- template <typename CurrentType> static ElementType* nextSiblingTemplate(CurrentType*);
- template <typename CurrentType> static ElementType* previousSiblingTemplate(CurrentType*);
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class ElementTraversal : public Traversal<Element> {
</span><span class="lines">@@ -129,8 +121,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <>
</span><del>-template <typename CurrentType>
-inline Element* Traversal<Element>::previousTemplate(CurrentType* current)
</del><ins>+inline Element* Traversal<Element>::previous(const Node* current)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = NodeTraversal::previous(current);
</span><span class="cx"> while (node && !node->isElementNode())
</span><span class="lines">@@ -139,8 +130,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <>
</span><del>-template <typename CurrentType>
-inline Element* Traversal<Element>::previousTemplate(CurrentType* current, const Node* stayWithin)
</del><ins>+inline Element* Traversal<Element>::previous(const Node* current, const Node* stayWithin)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = NodeTraversal::previous(current, stayWithin);
</span><span class="cx"> while (node && !node->isElementNode())
</span><span class="lines">@@ -210,8 +200,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename ElementType>
</span><del>-template <typename CurrentType>
-inline ElementType* Traversal<ElementType>::previousTemplate(CurrentType* current)
</del><ins>+inline ElementType* Traversal<ElementType>::previous(const Node* current)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = Traversal<Element>::previous(current);
</span><span class="cx"> while (element && !isElementOfType<const ElementType>(*element))
</span><span class="lines">@@ -220,8 +209,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename ElementType>
</span><del>-template <typename CurrentType>
-inline ElementType* Traversal<ElementType>::previousTemplate(CurrentType* current, const Node* stayWithin)
</del><ins>+inline ElementType* Traversal<ElementType>::previous(const Node* current, const Node* stayWithin)
</ins><span class="cx"> {
</span><span class="cx"> Element* element = Traversal<Element>::previous(current, stayWithin);
</span><span class="cx"> while (element && !isElementOfType<const ElementType>(*element))
</span><span class="lines">@@ -230,8 +218,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename ElementType>
</span><del>-template <typename CurrentType>
-inline ElementType* Traversal<ElementType>::nextSiblingTemplate(CurrentType* current)
</del><ins>+inline ElementType* Traversal<ElementType>::nextSibling(const Node* current)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = current->nextSibling();
</span><span class="cx"> while (node && !isElementOfType<const ElementType>(*node))
</span><span class="lines">@@ -240,8 +227,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename ElementType>
</span><del>-template <typename CurrentType>
-inline ElementType* Traversal<ElementType>::previousSiblingTemplate(CurrentType* current)
</del><ins>+inline ElementType* Traversal<ElementType>::previousSibling(const Node* current)
</ins><span class="cx"> {
</span><span class="cx"> Node* node = current->previousSibling();
</span><span class="cx"> while (node && !isElementOfType<const ElementType>(*node))
</span><span class="lines">@@ -296,25 +282,6 @@
</span><span class="cx"> template <typename ElementType>
</span><span class="cx"> inline ElementType* Traversal<ElementType>::next(const Node* current, const Node* stayWithin) { return nextTemplate(current, stayWithin); }
</span><span class="cx">
</span><del>-template <typename ElementType>
-inline ElementType* Traversal<ElementType>::previous(const ContainerNode* current) { return previousTemplate(current); }
-template <typename ElementType>
-inline ElementType* Traversal<ElementType>::previous(const Node* current) { return previousTemplate(current); }
-template <typename ElementType>
-inline ElementType* Traversal<ElementType>::previous(const ContainerNode* current, const Node* stayWithin) { return previousTemplate(current, stayWithin); }
-template <typename ElementType>
-inline ElementType* Traversal<ElementType>::previous(const Node* current, const Node* stayWithin) { return previousTemplate(current, stayWithin); }
-
-template <typename ElementType>
-inline ElementType* Traversal<ElementType>::nextSibling(const ContainerNode* current) { return nextSiblingTemplate(current); }
-template <typename ElementType>
-inline ElementType* Traversal<ElementType>::nextSibling(const Node* current) { return nextSiblingTemplate(current); }
-
-template <typename ElementType>
-inline ElementType* Traversal<ElementType>::previousSibling(const ContainerNode* current) { return previousSiblingTemplate(current); }
-template <typename ElementType>
-inline ElementType* Traversal<ElementType>::previousSibling(const Node* current) { return previousSiblingTemplate(current); }
-
</del><span class="cx"> // FIXME: These should go somewhere else.
</span><span class="cx"> inline Element* ElementTraversal::previousIncludingPseudo(const Node* current, const Node* stayWithin)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>