<!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>[199222] 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/199222">199222</a></dd>
<dt>Author</dt> <dd>jfernandez@igalia.com</dd>
<dt>Date</dt> <dd>2016-04-08 01:01:04 -0700 (Fri, 08 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Remove unnecessary iteration in populateGridPositions loop
https://bugs.webkit.org/show_bug.cgi?id=156376
Reviewed by Darin Adler.
The populateGridPositions loop limit was set to 'lastLine'. However, the
the position of last track's start line is updated after the loop, since
it does not follow the same pattern; it does not have a content
distribution offset.
So, since we are essentially overwriting the value stored in the last
iteration, we can just lower the loop limit.
No new tests added, because there is no change in the functionality.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::populateGridPositions):</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 (199221 => 199222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-08 07:17:50 UTC (rev 199221)
+++ trunk/Source/WebCore/ChangeLog 2016-04-08 08:01:04 UTC (rev 199222)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-04-08 Javier Fernandez <jfernandez@igalia.com>
+
+ [css-grid] Remove unnecessary iteration in populateGridPositions loop
+ https://bugs.webkit.org/show_bug.cgi?id=156376
+
+ Reviewed by Darin Adler.
+
+ The populateGridPositions loop limit was set to 'lastLine'. However, the
+ the position of last track's start line is updated after the loop, since
+ it does not follow the same pattern; it does not have a content
+ distribution offset.
+
+ So, since we are essentially overwriting the value stored in the last
+ iteration, we can just lower the loop limit.
+
+ No new tests added, because there is no change in the functionality.
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::populateGridPositions):
+
</ins><span class="cx"> 2016-04-08 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> CSP: Block XHR when calling XMLHttpRequest.send() and throw network error.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (199221 => 199222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-04-08 07:17:50 UTC (rev 199221)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-04-08 08:01:04 UTC (rev 199222)
</span><span class="lines">@@ -1606,6 +1606,9 @@
</span><span class="cx"> // FIXME: This will affect the computed style value of grid tracks size, since we are
</span><span class="cx"> // using these positions to compute them.
</span><span class="cx">
</span><ins>+ // The grid container's frame elements (border, padding and <content-position> offset) are sensible to the
+ // inline-axis flow direction. However, column lines positions are 'direction' unaware. This simplification
+ // allows us to use the same indexes to identify the columns independently on the inline-axis direction.
</ins><span class="cx"> unsigned numberOfTracks = sizingData.columnTracks.size();
</span><span class="cx"> unsigned numberOfLines = numberOfTracks + 1;
</span><span class="cx"> unsigned lastLine = numberOfLines - 1;
</span><span class="lines">@@ -1614,7 +1617,7 @@
</span><span class="cx"> LayoutUnit trackGap = guttersSize(ForColumns, 2);
</span><span class="cx"> m_columnPositions.resize(numberOfLines);
</span><span class="cx"> m_columnPositions[0] = borderAndPaddingStart() + offset.positionOffset;
</span><del>- for (unsigned i = 0; i < lastLine; ++i)
</del><ins>+ for (unsigned i = 0; i < nextToLastLine; ++i)
</ins><span class="cx"> m_columnPositions[i + 1] = m_columnPositions[i] + offset.distributionOffset + sizingData.columnTracks[i].baseSize() + trackGap;
</span><span class="cx"> m_columnPositions[lastLine] = m_columnPositions[nextToLastLine] + sizingData.columnTracks[nextToLastLine].baseSize();
</span><span class="cx">
</span><span class="lines">@@ -1626,7 +1629,7 @@
</span><span class="cx"> trackGap = guttersSize(ForRows, 2);
</span><span class="cx"> m_rowPositions.resize(numberOfLines);
</span><span class="cx"> m_rowPositions[0] = borderAndPaddingBefore() + offset.positionOffset;
</span><del>- for (unsigned i = 0; i < lastLine; ++i)
</del><ins>+ for (unsigned i = 0; i < nextToLastLine; ++i)
</ins><span class="cx"> m_rowPositions[i + 1] = m_rowPositions[i] + offset.distributionOffset + sizingData.rowTracks[i].baseSize() + trackGap;
</span><span class="cx"> m_rowPositions[lastLine] = m_rowPositions[nextToLastLine] + sizingData.rowTracks[nextToLastLine].baseSize();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>