<!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>[161643] 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/161643">161643</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 09:45:19 -0800 (Fri, 10 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use element iterators more
https://bugs.webkit.org/show_bug.cgi?id=126756

Reviewed by Anders Carlsson.

* dom/VisitedLinkState.cpp:
(WebCore::VisitedLinkState::invalidateStyleForAllLinks):
(WebCore::VisitedLinkState::invalidateStyleForLink):
* html/HTMLMeterElement.cpp:
(WebCore::HTMLMeterElement::renderMeter):
* html/HTMLProgressElement.cpp:
(WebCore::HTMLProgressElement::renderProgress):
* html/shadow/ContentDistributor.cpp:
(WebCore::ContentDistributor::ensureInsertionPointList):
* style/StyleResolveTree.cpp:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomVisitedLinkStatecpp">trunk/Source/WebCore/dom/VisitedLinkState.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMeterElementcpp">trunk/Source/WebCore/html/HTMLMeterElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLProgressElementcpp">trunk/Source/WebCore/html/HTMLProgressElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowContentDistributorcpp">trunk/Source/WebCore/html/shadow/ContentDistributor.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161642 => 161643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-01-10 17:37:35 UTC (rev 161642)
+++ trunk/Source/WebCore/ChangeLog        2014-01-10 17:45:19 UTC (rev 161643)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-10  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        Use element iterators more
+        https://bugs.webkit.org/show_bug.cgi?id=126756
+
+        Reviewed by Anders Carlsson.
+
+        * dom/VisitedLinkState.cpp:
+        (WebCore::VisitedLinkState::invalidateStyleForAllLinks):
+        (WebCore::VisitedLinkState::invalidateStyleForLink):
+        * html/HTMLMeterElement.cpp:
+        (WebCore::HTMLMeterElement::renderMeter):
+        * html/HTMLProgressElement.cpp:
+        (WebCore::HTMLProgressElement::renderProgress):
+        * html/shadow/ContentDistributor.cpp:
+        (WebCore::ContentDistributor::ensureInsertionPointList):
+        * style/StyleResolveTree.cpp:
+
</ins><span class="cx"> 2014-01-10  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Attempt to fix the iOS build after &lt;http://trac.webkit.org/changeset/161589&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoredomVisitedLinkStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/VisitedLinkState.cpp (161642 => 161643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/VisitedLinkState.cpp        2014-01-10 17:37:35 UTC (rev 161642)
+++ trunk/Source/WebCore/dom/VisitedLinkState.cpp        2014-01-10 17:45:19 UTC (rev 161643)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;VisitedLinkState.h&quot;
</span><span class="cx"> 
</span><del>-#include &quot;ElementTraversal.h&quot;
</del><ins>+#include &quot;ElementIterator.h&quot;
</ins><span class="cx"> #include &quot;Frame.h&quot;
</span><span class="cx"> #include &quot;HTMLAnchorElement.h&quot;
</span><span class="cx"> #include &quot;Page.h&quot;
</span><span class="lines">@@ -67,9 +67,9 @@
</span><span class="cx"> {
</span><span class="cx">     if (m_linksCheckedForVisitedState.isEmpty())
</span><span class="cx">         return;
</span><del>-    for (Element* element = ElementTraversal::firstWithin(&amp;m_document); element; element = ElementTraversal::next(element)) {
-        if (element-&gt;isLink())
-            element-&gt;setNeedsStyleRecalc();
</del><ins>+    for (auto&amp; element : descendantsOfType&lt;Element&gt;(m_document)) {
+        if (element.isLink())
+            element.setNeedsStyleRecalc();
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -86,9 +86,9 @@
</span><span class="cx"> {
</span><span class="cx">     if (!m_linksCheckedForVisitedState.contains(linkHash))
</span><span class="cx">         return;
</span><del>-    for (Element* element = ElementTraversal::firstWithin(&amp;m_document); element; element = ElementTraversal::next(element)) {
-        if (linkHashForElement(m_document, *element) == linkHash)
-            element-&gt;setNeedsStyleRecalc();
</del><ins>+    for (auto&amp; element : descendantsOfType&lt;Element&gt;(m_document)) {
+        if (linkHashForElement(m_document, element) == linkHash)
+            element.setNeedsStyleRecalc();
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMeterElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMeterElement.cpp (161642 => 161643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMeterElement.cpp        2014-01-10 17:37:35 UTC (rev 161642)
+++ trunk/Source/WebCore/html/HTMLMeterElement.cpp        2014-01-10 17:45:19 UTC (rev 161643)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include &quot;HTMLMeterElement.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Attribute.h&quot;
</span><del>-#include &quot;ElementTraversal.h&quot;
</del><ins>+#include &quot;ElementIterator.h&quot;
</ins><span class="cx"> #include &quot;EventNames.h&quot;
</span><span class="cx"> #include &quot;ExceptionCode.h&quot;
</span><span class="cx"> #include &quot;FormDataList.h&quot;
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> {
</span><span class="cx">     if (renderer() &amp;&amp; renderer()-&gt;isMeter())
</span><span class="cx">         return toRenderMeter(renderer());
</span><del>-    return toRenderMeter(ElementTraversal::firstWithin(userAgentShadowRoot())-&gt;renderer());
</del><ins>+    return toRenderMeter(descendantsOfType&lt;Element&gt;(*userAgentShadowRoot()).first()-&gt;renderer());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void HTMLMeterElement::didAddUserAgentShadowRoot(ShadowRoot* root)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLProgressElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLProgressElement.cpp (161642 => 161643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLProgressElement.cpp        2014-01-10 17:37:35 UTC (rev 161642)
+++ trunk/Source/WebCore/html/HTMLProgressElement.cpp        2014-01-10 17:45:19 UTC (rev 161643)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include &quot;HTMLProgressElement.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Attribute.h&quot;
</span><del>-#include &quot;ElementTraversal.h&quot;
</del><ins>+#include &quot;ElementIterator.h&quot;
</ins><span class="cx"> #include &quot;EventNames.h&quot;
</span><span class="cx"> #include &quot;ExceptionCode.h&quot;
</span><span class="cx"> #include &quot;HTMLNames.h&quot;
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> {
</span><span class="cx">     if (renderer() &amp;&amp; renderer()-&gt;isProgress())
</span><span class="cx">         return toRenderProgress(renderer());
</span><del>-    return toRenderProgress(ElementTraversal::firstWithin(userAgentShadowRoot())-&gt;renderer());
</del><ins>+    return toRenderProgress(descendantsOfType&lt;Element&gt;(*userAgentShadowRoot()).first()-&gt;renderer());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void HTMLProgressElement::parseAttribute(const QualifiedName&amp; name, const AtomicString&amp; value)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowContentDistributorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/ContentDistributor.cpp (161642 => 161643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/ContentDistributor.cpp        2014-01-10 17:37:35 UTC (rev 161642)
+++ trunk/Source/WebCore/html/shadow/ContentDistributor.cpp        2014-01-10 17:45:19 UTC (rev 161643)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;ContentDistributor.h&quot;
</span><span class="cx"> 
</span><del>-#include &quot;ElementTraversal.h&quot;
</del><ins>+#include &quot;ElementIterator.h&quot;
</ins><span class="cx"> #include &quot;InsertionPoint.h&quot;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -56,9 +56,9 @@
</span><span class="cx">     m_insertionPointListIsValid = true;
</span><span class="cx">     ASSERT(m_insertionPointList.isEmpty());
</span><span class="cx"> 
</span><del>-    for (Element* element = ElementTraversal::firstWithin(shadowRoot); element; element = ElementTraversal::next(element, shadowRoot)) {
-        if (element-&gt;isInsertionPoint())
-            m_insertionPointList.append(toInsertionPoint(element));
</del><ins>+    for (auto&amp; element : descendantsOfType&lt;Element&gt;(*shadowRoot)) {
+        if (element.isInsertionPoint())
+            m_insertionPointList.append(toInsertionPoint(&amp;element));
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return m_insertionPointList;
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (161642 => 161643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp        2014-01-10 17:37:35 UTC (rev 161642)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp        2014-01-10 17:45:19 UTC (rev 161643)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include &quot;Element.h&quot;
</span><span class="cx"> #include &quot;ElementIterator.h&quot;
</span><span class="cx"> #include &quot;ElementRareData.h&quot;
</span><del>-#include &quot;ElementTraversal.h&quot;
</del><span class="cx"> #include &quot;FlowThreadController.h&quot;
</span><span class="cx"> #include &quot;InsertionPoint.h&quot;
</span><span class="cx"> #include &quot;NodeRenderStyle.h&quot;
</span></span></pre>
</div>
</div>

</body>
</html>