<!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>[169773] 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/169773">169773</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-06-10 15:14:46 -0700 (Tue, 10 Jun 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Modernize loop code in scrolling tree code
https://bugs.webkit.org/show_bug.cgi?id=133688

Reviewed by Anders Carlsson.

Use new loop syntax for walking children.

* page/scrolling/ScrollingStateNode.cpp:
(WebCore::ScrollingStateNode::cloneAndResetChildren):
(WebCore::ScrollingStateNode::removeChild):
(WebCore::ScrollingStateNode::willBeRemovedFromStateTree):
(WebCore::ScrollingStateNode::dump):
* page/scrolling/ScrollingTreeNode.cpp:
(WebCore::ScrollingTreeNode::removeChild):
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
(WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169772 => 169773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-06-10 22:10:04 UTC (rev 169772)
+++ trunk/Source/WebCore/ChangeLog        2014-06-10 22:14:46 UTC (rev 169773)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-06-10  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        Modernize loop code in scrolling tree code
+        https://bugs.webkit.org/show_bug.cgi?id=133688
+
+        Reviewed by Anders Carlsson.
+
+        Use new loop syntax for walking children.
+
+        * page/scrolling/ScrollingStateNode.cpp:
+        (WebCore::ScrollingStateNode::cloneAndResetChildren):
+        (WebCore::ScrollingStateNode::removeChild):
+        (WebCore::ScrollingStateNode::willBeRemovedFromStateTree):
+        (WebCore::ScrollingStateNode::dump):
+        * page/scrolling/ScrollingTreeNode.cpp:
+        (WebCore::ScrollingTreeNode::removeChild):
+        * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+        (WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition):
+
</ins><span class="cx"> 2014-06-10  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add -[WKWebView evaluateJavaScript:completionHandler:]
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp (169772 => 169773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp        2014-06-10 22:10:04 UTC (rev 169772)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp        2014-06-10 22:14:46 UTC (rev 169773)
</span><span class="lines">@@ -88,9 +88,8 @@
</span><span class="cx">     if (!m_children)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    size_t size = m_children-&gt;size();
-    for (size_t i = 0; i &lt; size; ++i)
-        clone.appendChild(m_children-&gt;at(i)-&gt;cloneAndReset(adoptiveTree));
</del><ins>+    for (auto&amp; child : *m_children)
+        clone.appendChild(child-&gt;cloneAndReset(adoptiveTree));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollingStateNode::appendChild(PassOwnPtr&lt;ScrollingStateNode&gt; childNode)
</span><span class="lines">@@ -118,9 +117,8 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    size_t size = m_children-&gt;size();
-    for (size_t i = 0; i &lt; size; ++i)
-        m_children-&gt;at(i)-&gt;removeChild(node);
</del><ins>+    for (auto&amp; child : *m_children)
+        child-&gt;removeChild(node);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollingStateNode::willBeRemovedFromStateTree()
</span><span class="lines">@@ -130,9 +128,8 @@
</span><span class="cx">     if (!m_children)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    size_t size = m_children-&gt;size();
-    for (size_t i = 0; i &lt; size; ++i)
-        m_children-&gt;at(i)-&gt;willBeRemovedFromStateTree();
</del><ins>+    for (auto&amp; child : *m_children)
+        child-&gt;willBeRemovedFromStateTree();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollingStateNode::setLayer(const LayerRepresentation&amp; layerRepresentation)
</span><span class="lines">@@ -152,11 +149,10 @@
</span><span class="cx"> 
</span><span class="cx">     if (m_children) {
</span><span class="cx">         writeIndent(ts, indent + 1);
</span><del>-        size_t size = children()-&gt;size();
-        ts &lt;&lt; &quot;(children &quot; &lt;&lt; size &lt;&lt; &quot;\n&quot;;
</del><ins>+        ts &lt;&lt; &quot;(children &quot; &lt;&lt; children()-&gt;size() &lt;&lt; &quot;\n&quot;;
</ins><span class="cx">         
</span><del>-        for (size_t i = 0; i &lt; size; i++)
-            m_children-&gt;at(i)-&gt;dump(ts, indent + 2);
</del><ins>+        for (auto&amp; child : *m_children)
+            child-&gt;dump(ts, indent + 2);
</ins><span class="cx">         writeIndent(ts, indent + 1);
</span><span class="cx">         ts &lt;&lt; &quot;)\n&quot;;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp (169772 => 169773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp        2014-06-10 22:10:04 UTC (rev 169772)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp        2014-06-10 22:14:46 UTC (rev 169773)
</span><span class="lines">@@ -68,9 +68,8 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    size_t size = m_children-&gt;size();
-    for (size_t i = 0; i &lt; size; ++i)
-        m_children-&gt;at(i)-&gt;removeChild(node);
</del><ins>+    for (auto&amp; child : *m_children)
+        child-&gt;removeChild(node);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (169772 => 169773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm        2014-06-10 22:10:04 UTC (rev 169772)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm        2014-06-10 22:14:46 UTC (rev 169773)
</span><span class="lines">@@ -411,9 +411,8 @@
</span><span class="cx"> 
</span><span class="cx">     viewportRect.setLocation(FloatPoint() + scrollOffsetForFixedChildren);
</span><span class="cx"> 
</span><del>-    size_t size = m_children-&gt;size();
-    for (size_t i = 0; i &lt; size; ++i)
-        m_children-&gt;at(i)-&gt;updateLayersAfterAncestorChange(*this, viewportRect, FloatSize());
</del><ins>+    for (auto&amp; child : *m_children)
+        child-&gt;updateLayersAfterAncestorChange(*this, viewportRect, FloatSize());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollingTreeFrameScrollingNodeMac::updateLayersAfterViewportChange(const FloatRect&amp;, double)
</span></span></pre>
</div>
</div>

</body>
</html>