<!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>[189806] 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/189806">189806</a></dd>
<dt>Author</dt> <dd>jfernandez@igalia.com</dd>
<dt>Date</dt> <dd>2015-09-15 07:48:41 -0700 (Tue, 15 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Grid Layout] Using {row, column}-axis terms in alignment related logic
https://bugs.webkit.org/show_bug.cgi?id=148942
Reviewed by Sergio Villar Senin.
This patch changes the names of several functions and variables
defined to implement the alignment logic. We want to use from now
on the terms row-axis and column-axis when referring to the
alignment direction the logic is applied to.
No new tests, no new functionality.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::columnAxisOffsetForChild):
(WebCore::RenderGrid::rowAxisOffsetForChild):
(WebCore::RenderGrid::findChildLogicalPosition):
* rendering/RenderGrid.h:</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>
<li><a href="#trunkSourceWebCorerenderingRenderGridh">trunk/Source/WebCore/rendering/RenderGrid.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189805 => 189806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-15 11:06:10 UTC (rev 189805)
+++ trunk/Source/WebCore/ChangeLog 2015-09-15 14:48:41 UTC (rev 189806)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-09-15 Javier Fernandez <jfernandez@igalia.com>
+
+ [CSS Grid Layout] Using {row, column}-axis terms in alignment related logic
+ https://bugs.webkit.org/show_bug.cgi?id=148942
+
+ Reviewed by Sergio Villar Senin.
+
+ This patch changes the names of several functions and variables
+ defined to implement the alignment logic. We want to use from now
+ on the terms row-axis and column-axis when referring to the
+ alignment direction the logic is applied to.
+
+ No new tests, no new functionality.
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::columnAxisOffsetForChild):
+ (WebCore::RenderGrid::rowAxisOffsetForChild):
+ (WebCore::RenderGrid::findChildLogicalPosition):
+ * rendering/RenderGrid.h:
+
</ins><span class="cx"> 2015-09-14 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove all uses of PassRefPtr in WebCore/xml
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (189805 => 189806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-09-15 11:06:10 UTC (rev 189805)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2015-09-15 14:48:41 UTC (rev 189806)
</span><span class="lines">@@ -1526,7 +1526,7 @@
</span><span class="cx"> return GridAxisStart;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutUnit RenderGrid::rowPositionForChild(const RenderBox& child) const
</del><ins>+LayoutUnit RenderGrid::columnAxisOffsetForChild(const RenderBox& child) const
</ins><span class="cx"> {
</span><span class="cx"> const GridCoordinate& coordinate = cachedGridCoordinate(child);
</span><span class="cx"> LayoutUnit startOfRow = m_rowPositions[coordinate.rows.resolvedInitialPosition.toInt()];
</span><span class="lines">@@ -1550,7 +1550,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-LayoutUnit RenderGrid::columnPositionForChild(const RenderBox& child) const
</del><ins>+LayoutUnit RenderGrid::rowAxisOffsetForChild(const RenderBox& child) const
</ins><span class="cx"> {
</span><span class="cx"> const GridCoordinate& coordinate = cachedGridCoordinate(child);
</span><span class="cx"> LayoutUnit startOfColumn = m_columnPositions[coordinate.columns.resolvedInitialPosition.toInt()];
</span><span class="lines">@@ -1575,14 +1575,17 @@
</span><span class="cx">
</span><span class="cx"> LayoutPoint RenderGrid::findChildLogicalPosition(const RenderBox& child) const
</span><span class="cx"> {
</span><del>- LayoutUnit columnPosition = columnPositionForChild(child);
</del><ins>+ LayoutUnit rowAxisOffset = rowAxisOffsetForChild(child);
</ins><span class="cx"> // We stored m_columnPositions's data ignoring the direction, hence we might need now
</span><span class="cx"> // to translate positions from RTL to LTR, as it's more convenient for painting.
</span><del>- if (!style().isLeftToRightDirection())
- columnPosition = (m_columnPositions[m_columnPositions.size() - 1] + borderAndPaddingLogicalLeft()) - columnPosition - child.logicalWidth();
</del><ins>+ if (!style().isLeftToRightDirection()) {
+ LayoutUnit alignmentOffset = m_columnPositions[0] - borderAndPaddingStart();
+ LayoutUnit rightGridEdgePosition = m_columnPositions[m_columnPositions.size() - 1] + alignmentOffset + borderAndPaddingLogicalLeft();
+ rowAxisOffset = rightGridEdgePosition - (rowAxisOffset + child.logicalWidth());
+ }
</ins><span class="cx">
</span><span class="cx"> // The grid items should be inside the grid container's border box, that's why they need to be shifted.
</span><del>- return LayoutPoint(columnPosition, rowPositionForChild(child));
</del><ins>+ return LayoutPoint(rowAxisOffset, columnAxisOffsetForChild(child));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderGrid::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset, PaintInfo& forChild, bool usePrintRect)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (189805 => 189806)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h 2015-09-15 11:06:10 UTC (rev 189805)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2015-09-15 14:48:41 UTC (rev 189806)
</span><span class="lines">@@ -120,8 +120,8 @@
</span><span class="cx"> LayoutUnit maxContentForChild(RenderBox&, GridTrackSizingDirection, Vector<GridTrack>& columnTracks);
</span><span class="cx"> GridAxisPosition columnAxisPositionForChild(const RenderBox&) const;
</span><span class="cx"> GridAxisPosition rowAxisPositionForChild(const RenderBox&) const;
</span><del>- LayoutUnit rowPositionForChild(const RenderBox&) const;
- LayoutUnit columnPositionForChild(const RenderBox&) const;
</del><ins>+ LayoutUnit columnAxisOffsetForChild(const RenderBox&) const;
+ LayoutUnit rowAxisOffsetForChild(const RenderBox&) const;
</ins><span class="cx"> LayoutPoint findChildLogicalPosition(const RenderBox&) const;
</span><span class="cx"> GridCoordinate cachedGridCoordinate(const RenderBox&) const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>