<!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>[174101] 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/174101">174101</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-09-30 05:48:42 -0700 (Tue, 30 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid copying the iterated-over items in range-based for-loops in RenderGrid
https://bugs.webkit.org/show_bug.cgi?id=137246
Reviewed by Sergio Villar Senin.
Adjust the range-based for-loops in RenderGrid to avoid the unnecessary copying
of the items that are being iterated.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::computeNormalizedFractionBreadth):
(WebCore::RenderGrid::insertItemIntoGrid):
(WebCore::RenderGrid::gridAreaBreadthForChild):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderGridcpp">trunk/Source/WebCore/rendering/RenderGrid.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174100 => 174101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-30 12:17:04 UTC (rev 174100)
+++ trunk/Source/WebCore/ChangeLog 2014-09-30 12:48:42 UTC (rev 174101)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-30 Zan Dobersek <zdobersek@igalia.com>
+
+ Avoid copying the iterated-over items in range-based for-loops in RenderGrid
+ https://bugs.webkit.org/show_bug.cgi?id=137246
+
+ Reviewed by Sergio Villar Senin.
+
+ Adjust the range-based for-loops in RenderGrid to avoid the unnecessary copying
+ of the items that are being iterated.
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::computeNormalizedFractionBreadth):
+ (WebCore::RenderGrid::insertItemIntoGrid):
+ (WebCore::RenderGrid::gridAreaBreadthForChild):
+
</ins><span class="cx"> 2014-09-29 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] Use modern for-loops in RenderGrid
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (174100 => 174101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2014-09-30 12:17:04 UTC (rev 174100)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2014-09-30 12:48:42 UTC (rev 174101)
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> // |availableLogicalSpace| already accounts for the used breadths so no need to remove it here.
</span><span class="cx">
</span><span class="cx"> Vector<GridTrackForNormalization> tracksForNormalization;
</span><del>- for (auto position : tracksSpan) {
</del><ins>+ for (auto& position : tracksSpan) {
</ins><span class="cx"> const GridTrackSize& trackSize = gridTrackSize(direction, position.toInt());
</span><span class="cx"> if (!trackSize.maxTrackBreadth().isFlex())
</span><span class="cx"> continue;
</span><span class="lines">@@ -698,8 +698,8 @@
</span><span class="cx"> {
</span><span class="cx"> ensureGridSize(coordinate.rows.resolvedFinalPosition.toInt(), coordinate.columns.resolvedFinalPosition.toInt());
</span><span class="cx">
</span><del>- for (auto row : coordinate.rows) {
- for (auto column : coordinate.columns)
</del><ins>+ for (auto& row : coordinate.rows) {
+ for (auto& column : coordinate.columns)
</ins><span class="cx"> m_grid[row.toInt()][column.toInt()].append(&child);
</span><span class="cx"> }
</span><span class="cx"> m_gridItemCoordinate.set(&child, coordinate);
</span><span class="lines">@@ -950,7 +950,7 @@
</span><span class="cx"> const GridCoordinate& coordinate = cachedGridCoordinate(child);
</span><span class="cx"> const GridSpan& span = (direction == ForColumns) ? coordinate.columns : coordinate.rows;
</span><span class="cx"> LayoutUnit gridAreaBreadth = 0;
</span><del>- for (auto trackPosition : span)
</del><ins>+ for (auto& trackPosition : span)
</ins><span class="cx"> gridAreaBreadth += tracks[trackPosition.toInt()].m_usedBreadth;
</span><span class="cx"> return gridAreaBreadth;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>