<!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>[161583] 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/161583">161583</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-09 14:10:22 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace ElementIteratorAdapter find() with beginAt()
https://bugs.webkit.org/show_bug.cgi?id=126714
Reviewed by Andreas Kling.
ElementIteratorAdapter find() would return iterator for the argument element if it was
of correct type and in the right subtree. This is not really what you would expect from find()
so replace it with a simple beginAt() iterator construction function.
* dom/DocumentOrderedMap.cpp:
(WebCore::DocumentOrderedMap::getAllElementsById):
* dom/ElementChildIterator.h:
(WebCore::ElementChildIteratorAdapter<ElementType>::beginAt):
(WebCore::ElementChildConstIteratorAdapter<ElementType>::beginAt):
* dom/ElementDescendantIterator.h:
(WebCore::ElementDescendantIteratorAdapter<ElementType>::beginAt):
(WebCore::ElementDescendantConstIteratorAdapter<ElementType>::beginAt):
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::formElementIndex):
* html/HTMLTableRowsCollection.cpp:
(WebCore::HTMLTableRowsCollection::rowAfter):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentOrderedMapcpp">trunk/Source/WebCore/dom/DocumentOrderedMap.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementChildIteratorh">trunk/Source/WebCore/dom/ElementChildIterator.h</a></li>
<li><a href="#trunkSourceWebCoredomElementDescendantIteratorh">trunk/Source/WebCore/dom/ElementDescendantIterator.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementcpp">trunk/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTableRowsCollectioncpp">trunk/Source/WebCore/html/HTMLTableRowsCollection.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161582 => 161583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-09 22:07:31 UTC (rev 161582)
+++ trunk/Source/WebCore/ChangeLog 2014-01-09 22:10:22 UTC (rev 161583)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-01-09 Antti Koivisto <antti@apple.com>
+
+ Replace ElementIteratorAdapter find() with beginAt()
+ https://bugs.webkit.org/show_bug.cgi?id=126714
+
+ Reviewed by Andreas Kling.
+
+ ElementIteratorAdapter find() would return iterator for the argument element if it was
+ of correct type and in the right subtree. This is not really what you would expect from find()
+ so replace it with a simple beginAt() iterator construction function.
+
+ * dom/DocumentOrderedMap.cpp:
+ (WebCore::DocumentOrderedMap::getAllElementsById):
+ * dom/ElementChildIterator.h:
+ (WebCore::ElementChildIteratorAdapter<ElementType>::beginAt):
+ (WebCore::ElementChildConstIteratorAdapter<ElementType>::beginAt):
+ * dom/ElementDescendantIterator.h:
+ (WebCore::ElementDescendantIteratorAdapter<ElementType>::beginAt):
+ (WebCore::ElementDescendantConstIteratorAdapter<ElementType>::beginAt):
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::formElementIndex):
+ * html/HTMLTableRowsCollection.cpp:
+ (WebCore::HTMLTableRowsCollection::rowAfter):
+
</ins><span class="cx"> 2014-01-09 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r160152): Selection drag snapshot doesn't appear or has the wrong content on Retina
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentOrderedMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentOrderedMap.cpp (161582 => 161583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentOrderedMap.cpp 2014-01-09 22:07:31 UTC (rev 161582)
+++ trunk/Source/WebCore/dom/DocumentOrderedMap.cpp 2014-01-09 22:10:22 UTC (rev 161583)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> if (entry.orderedList.isEmpty()) {
</span><span class="cx"> entry.orderedList.reserveCapacity(entry.count);
</span><span class="cx"> auto elementDescandents = descendantsOfType<Element>(*scope.rootNode());
</span><del>- auto it = entry.element ? elementDescandents.find(*entry.element) : elementDescandents.begin();
</del><ins>+ auto it = entry.element ? elementDescandents.beginAt(*entry.element) : elementDescandents.begin();
</ins><span class="cx"> auto end = elementDescandents.end();
</span><span class="cx"> for (; it != end; ++it) {
</span><span class="cx"> auto& element = *it;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementChildIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementChildIterator.h (161582 => 161583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementChildIterator.h 2014-01-09 22:07:31 UTC (rev 161582)
+++ trunk/Source/WebCore/dom/ElementChildIterator.h 2014-01-09 22:10:22 UTC (rev 161583)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> ElementChildIterator<ElementType> begin();
</span><span class="cx"> ElementChildIterator<ElementType> end();
</span><del>- ElementChildIterator<ElementType> find(Element&);
</del><ins>+ ElementChildIterator<ElementType> beginAt(ElementType&);
</ins><span class="cx">
</span><span class="cx"> ElementType* first();
</span><span class="cx"> ElementType* last();
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> ElementChildConstIterator<ElementType> begin() const;
</span><span class="cx"> ElementChildConstIterator<ElementType> end() const;
</span><del>- ElementChildConstIterator<ElementType> find(const Element&) const;
</del><ins>+ ElementChildConstIterator<ElementType> beginAt(const ElementType&) const;
</ins><span class="cx">
</span><span class="cx"> const ElementType* first() const;
</span><span class="cx"> const ElementType* last() const;
</span><span class="lines">@@ -154,13 +154,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename ElementType>
</span><del>-inline ElementChildIterator<ElementType> ElementChildIteratorAdapter<ElementType>::find(Element& child)
</del><ins>+inline ElementChildIterator<ElementType> ElementChildIteratorAdapter<ElementType>::beginAt(ElementType& child)
</ins><span class="cx"> {
</span><del>- if (!isElementOfType<const ElementType>(child))
- return end();
- if (child.parentNode() != &m_parent)
- return end();
- return ElementChildIterator<ElementType>(m_parent, static_cast<ElementType*>(&child));
</del><ins>+ ASSERT(child.parentNode() == &m_parent);
+ return ElementChildIterator<ElementType>(m_parent, &child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ElementChildConstIteratorAdapter
</span><span class="lines">@@ -196,13 +193,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename ElementType>
</span><del>-inline ElementChildConstIterator<ElementType> ElementChildConstIteratorAdapter<ElementType>::find(const Element& child) const
</del><ins>+inline ElementChildConstIterator<ElementType> ElementChildConstIteratorAdapter<ElementType>::beginAt(const ElementType& child) const
</ins><span class="cx"> {
</span><del>- if (!isElementOfType<const ElementType>(child))
- return end();
- if (child.parentNode() != &m_parent)
- return end();
- return ElementChildConstIterator<ElementType>(m_parent, static_cast<const ElementType*>(&child));
</del><ins>+ ASSERT(child.parentNode() == &m_parent);
+ return ElementChildConstIterator<ElementType>(m_parent, &child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Standalone functions
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementDescendantIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementDescendantIterator.h (161582 => 161583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementDescendantIterator.h 2014-01-09 22:07:31 UTC (rev 161582)
+++ trunk/Source/WebCore/dom/ElementDescendantIterator.h 2014-01-09 22:10:22 UTC (rev 161583)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> ElementDescendantIteratorAdapter(ContainerNode& root);
</span><span class="cx"> ElementDescendantIterator<ElementType> begin();
</span><span class="cx"> ElementDescendantIterator<ElementType> end();
</span><del>- ElementDescendantIterator<ElementType> find(Element&);
</del><ins>+ ElementDescendantIterator<ElementType> beginAt(ElementType&);
</ins><span class="cx"> ElementDescendantIterator<ElementType> from(Element&);
</span><span class="cx">
</span><span class="cx"> ElementType* first();
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> ElementDescendantConstIteratorAdapter(const ContainerNode& root);
</span><span class="cx"> ElementDescendantConstIterator<ElementType> begin() const;
</span><span class="cx"> ElementDescendantConstIterator<ElementType> end() const;
</span><del>- ElementDescendantConstIterator<ElementType> find(const Element&) const;
</del><ins>+ ElementDescendantConstIterator<ElementType> beginAt(const ElementType&) const;
</ins><span class="cx"> ElementDescendantConstIterator<ElementType> from(const Element&) const;
</span><span class="cx">
</span><span class="cx"> const ElementType* first() const;
</span><span class="lines">@@ -143,12 +143,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename ElementType>
</span><del>-inline ElementDescendantIterator<ElementType> ElementDescendantIteratorAdapter<ElementType>::find(Element& descendant)
</del><ins>+inline ElementDescendantIterator<ElementType> ElementDescendantIteratorAdapter<ElementType>::beginAt(ElementType& descendant)
</ins><span class="cx"> {
</span><del>- if (!isElementOfType<const ElementType>(descendant))
- return end();
- if (!descendant.isDescendantOf(&m_root))
- return end();
</del><ins>+ ASSERT(descendant.isDescendantOf(&m_root));
</ins><span class="cx"> return ElementDescendantIterator<ElementType>(m_root, static_cast<ElementType*>(&descendant));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -195,13 +192,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename ElementType>
</span><del>-inline ElementDescendantConstIterator<ElementType> ElementDescendantConstIteratorAdapter<ElementType>::find(const Element& descendant) const
</del><ins>+inline ElementDescendantConstIterator<ElementType> ElementDescendantConstIteratorAdapter<ElementType>::beginAt(const ElementType& descendant) const
</ins><span class="cx"> {
</span><del>- if (!isElementOfType<const ElementType>(descendant))
- return end();
- if (!descendant.isDescendantOf(&m_root))
- return end();
- return ElementDescendantConstIterator<ElementType>(m_root, static_cast<const ElementType*>(&descendant));
</del><ins>+ ASSERT(descendant.isDescendantOf(&m_root));
+ return ElementDescendantConstIterator<ElementType>(m_root, &descendant);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename ElementType>
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (161582 => 161583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-01-09 22:07:31 UTC (rev 161582)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-01-09 22:10:22 UTC (rev 161583)
</span><span class="lines">@@ -504,14 +504,17 @@
</span><span class="cx"> unsigned currentAssociatedElementsAfterIndex = m_associatedElementsAfterIndex;
</span><span class="cx"> ++m_associatedElementsAfterIndex;
</span><span class="cx">
</span><ins>+ if (!associatedHTMLElement.isDescendantOf(this))
+ return currentAssociatedElementsAfterIndex;
+
</ins><span class="cx"> // Check for the special case where this element is the very last thing in
</span><span class="cx"> // the form's tree of children; we don't want to walk the entire tree in that
</span><span class="cx"> // common case that occurs during parsing; instead we'll just return a value
</span><span class="cx"> // that says "add this form element to the end of the array".
</span><span class="cx"> auto descendants = descendantsOfType<HTMLElement>(*this);
</span><del>- auto it = descendants.find(associatedHTMLElement);
</del><ins>+ auto it = descendants.beginAt(associatedHTMLElement);
</ins><span class="cx"> auto end = descendants.end();
</span><del>- if (it == end || ++it == end)
</del><ins>+ if (++it == end)
</ins><span class="cx"> return currentAssociatedElementsAfterIndex;
</span><span class="cx">
</span><span class="cx"> unsigned i = m_associatedElementsBeforeIndex;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTableRowsCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTableRowsCollection.cpp (161582 => 161583)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTableRowsCollection.cpp 2014-01-09 22:07:31 UTC (rev 161582)
+++ trunk/Source/WebCore/html/HTMLTableRowsCollection.cpp 2014-01-09 22:10:22 UTC (rev 161583)
</span><span class="lines">@@ -70,9 +70,9 @@
</span><span class="cx">
</span><span class="cx"> // Start by looking for the next row in this section. Continue only if there is none.
</span><span class="cx"> if (previous && previous->parentNode() != table) {
</span><del>- auto rows = childrenOfType<HTMLTableRowElement>(*previous->parentNode());
- auto row = rows.find(*previous);
- if (++row != rows.end())
</del><ins>+ auto childRows = childrenOfType<HTMLTableRowElement>(*previous->parentNode());
+ auto row = childRows.beginAt(*previous);
+ if (++row != childRows.end())
</ins><span class="cx"> return &*row;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>