<!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>[184309] 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/184309">184309</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-13 15:06:45 -0700 (Wed, 13 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize ContainerNode::childElementCount
https://bugs.webkit.org/show_bug.cgi?id=144930
Patch by Sam Weinig <sam@webkit.org> on 2015-05-13
Reviewed by Darin Adler.
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::childElementCount):
Use std::distance to compute the number of child elements.
* dom/ElementChildIterator.h:
Add typedefs to make the child element iterators conform STL standards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementChildIteratorh">trunk/Source/WebCore/dom/ElementChildIterator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184308 => 184309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-13 21:58:41 UTC (rev 184308)
+++ trunk/Source/WebCore/ChangeLog 2015-05-13 22:06:45 UTC (rev 184309)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-05-13 Sam Weinig <sam@webkit.org>
+
+ Modernize ContainerNode::childElementCount
+ https://bugs.webkit.org/show_bug.cgi?id=144930
+
+ Reviewed by Darin Adler.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::childElementCount):
+ Use std::distance to compute the number of child elements.
+
+ * dom/ElementChildIterator.h:
+ Add typedefs to make the child element iterators conform STL standards.
+
</ins><span class="cx"> 2015-05-13 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r183770): Crash inside WebEditorClient::shouldApplyStyle when applying underline
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (184308 => 184309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2015-05-13 21:58:41 UTC (rev 184308)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2015-05-13 22:06:45 UTC (rev 184309)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> #include "SVGNames.h"
</span><span class="cx"> #include "SelectorQuery.h"
</span><span class="cx"> #include "TemplateContentDocumentFragment.h"
</span><ins>+#include <algorithm>
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -929,13 +930,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(is<Document>(*this) || is<DocumentFragment>(*this) || is<Element>(*this));
</span><span class="cx">
</span><del>- unsigned count = 0;
- Node* n = firstChild();
- while (n) {
- count += n->isElementNode();
- n = n->nextSibling();
- }
- return count;
</del><ins>+ auto children = childrenOfType<Element>(*this);
+ return std::distance(children.begin(), children.end());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementChildIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ElementChildIterator.h (184308 => 184309)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ElementChildIterator.h 2015-05-13 21:58:41 UTC (rev 184308)
+++ trunk/Source/WebCore/dom/ElementChildIterator.h 2015-05-13 22:06:45 UTC (rev 184309)
</span><span class="lines">@@ -33,6 +33,12 @@
</span><span class="cx"> template <typename ElementType>
</span><span class="cx"> class ElementChildIterator : public ElementIterator<ElementType> {
</span><span class="cx"> public:
</span><ins>+ typedef ElementType value_type;
+ typedef ptrdiff_t difference_type;
+ typedef ElementType* pointer;
+ typedef ElementType& reference;
+ typedef std::forward_iterator_tag iterator_category;
+
</ins><span class="cx"> ElementChildIterator(const ContainerNode& parent);
</span><span class="cx"> ElementChildIterator(const ContainerNode& parent, ElementType* current);
</span><span class="cx"> ElementChildIterator& operator++();
</span><span class="lines">@@ -41,6 +47,12 @@
</span><span class="cx"> template <typename ElementType>
</span><span class="cx"> class ElementChildConstIterator : public ElementConstIterator<ElementType> {
</span><span class="cx"> public:
</span><ins>+ typedef const ElementType value_type;
+ typedef ptrdiff_t difference_type;
+ typedef const ElementType* pointer;
+ typedef const ElementType& reference;
+ typedef std::forward_iterator_tag iterator_category;
+
</ins><span class="cx"> ElementChildConstIterator(const ContainerNode& parent);
</span><span class="cx"> ElementChildConstIterator(const ContainerNode& parent, const ElementType* current);
</span><span class="cx"> ElementChildConstIterator& operator++();
</span></span></pre>
</div>
</div>
</body>
</html>