<!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>[199655] 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/199655">199655</a></dd>
<dt>Author</dt> <dd>rego@igalia.com</dd>
<dt>Date</dt> <dd>2016-04-18 01:03:24 -0700 (Mon, 18 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[css-grid] Add method to translate RTL coordinates
https://bugs.webkit.org/show_bug.cgi?id=156589
Reviewed by Antonio Gomes.
This is just a small refactoring adding a new function
LayoutGrid::translateRTLCoordinate().
This method translates to physical coordinates the information
stored in m_columnPositions when you're using RTL direction.
No new tests, no change of behavior.
* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::offsetAndBreadthForPositionedChild): Use the new
method translateRTLCoordinate().
(WebCore::RenderGrid::translateRTLCoordinate): New method that converts
a coordinate from m_columnPositions in RTL into a physical coordinate.
(WebCore::RenderGrid::findChildLogicalPosition): Use the new method
translateRTLCoordinate().
* rendering/RenderGrid.h: Add method signature.</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 (199654 => 199655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-18 08:01:07 UTC (rev 199654)
+++ trunk/Source/WebCore/ChangeLog 2016-04-18 08:03:24 UTC (rev 199655)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-04-18 Manuel Rego Casasnovas <rego@igalia.com>
+
+ [css-grid] Add method to translate RTL coordinates
+ https://bugs.webkit.org/show_bug.cgi?id=156589
+
+ Reviewed by Antonio Gomes.
+
+ This is just a small refactoring adding a new function
+ LayoutGrid::translateRTLCoordinate().
+ This method translates to physical coordinates the information
+ stored in m_columnPositions when you're using RTL direction.
+
+ No new tests, no change of behavior.
+
+ * rendering/RenderGrid.cpp:
+ (WebCore::RenderGrid::offsetAndBreadthForPositionedChild): Use the new
+ method translateRTLCoordinate().
+ (WebCore::RenderGrid::translateRTLCoordinate): New method that converts
+ a coordinate from m_columnPositions in RTL into a physical coordinate.
+ (WebCore::RenderGrid::findChildLogicalPosition): Use the new method
+ translateRTLCoordinate().
+ * rendering/RenderGrid.h: Add method signature.
+
</ins><span class="cx"> 2016-04-18 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [Fetch] Use @isArray instead of `instanceof @Array`
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (199654 => 199655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-04-18 08:01:07 UTC (rev 199654)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp 2016-04-18 08:03:24 UTC (rev 199655)
</span><span class="lines">@@ -1547,9 +1547,7 @@
</span><span class="cx"> if (endIsAuto)
</span><span class="cx"> offset = LayoutUnit();
</span><span class="cx"> else {
</span><del>- LayoutUnit alignmentOffset = m_columnPositions[0] - borderAndPaddingStart();
- LayoutUnit offsetFromLastLine = m_columnPositions[m_columnPositions.size() - 1] - m_columnPositions[endLine];
- offset = paddingLeft() + alignmentOffset + offsetFromLastLine;
</del><ins>+ offset = translateRTLCoordinate(m_columnPositions[endLine]) - borderLeft();
</ins><span class="cx">
</span><span class="cx"> if (endLine > firstExplicitLine && endLine < lastExplicitLine)
</span><span class="cx"> offset += guttersSize(direction, 2);
</span><span class="lines">@@ -2049,16 +2047,22 @@
</span><span class="cx"> return {0, 0};
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+LayoutUnit RenderGrid::translateRTLCoordinate(LayoutUnit coordinate) const
+{
+ ASSERT(!style().isLeftToRightDirection());
+
+ LayoutUnit alignmentOffset = m_columnPositions[0] - borderAndPaddingStart();
+ LayoutUnit rightGridEdgePosition = m_columnPositions[m_columnPositions.size() - 1];
+ return borderAndPaddingLogicalLeft() + rightGridEdgePosition + alignmentOffset - coordinate;
+}
+
</ins><span class="cx"> LayoutPoint RenderGrid::findChildLogicalPosition(const RenderBox& child) const
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit rowAxisOffset = rowAxisOffsetForChild(child);
</span><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()) {
- LayoutUnit alignmentOffset = m_columnPositions[0] - borderAndPaddingStart();
- LayoutUnit rightGridEdgePosition = m_columnPositions[m_columnPositions.size() - 1] + alignmentOffset + borderAndPaddingLogicalLeft();
- rowAxisOffset = rightGridEdgePosition - (rowAxisOffset + child.logicalWidth());
- }
</del><ins>+ if (!style().isLeftToRightDirection())
+ rowAxisOffset = translateRTLCoordinate(rowAxisOffset) - child.logicalWidth();
</ins><span class="cx">
</span><span class="cx"> return LayoutPoint(rowAxisOffset, columnAxisOffsetForChild(child));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderGrid.h (199654 => 199655)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderGrid.h 2016-04-18 08:01:07 UTC (rev 199654)
+++ trunk/Source/WebCore/rendering/RenderGrid.h 2016-04-18 08:03:24 UTC (rev 199655)
</span><span class="lines">@@ -181,6 +181,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool hasDefiniteLogicalSize(GridTrackSizingDirection) const;
</span><ins>+ LayoutUnit translateRTLCoordinate(LayoutUnit) const;
</ins><span class="cx">
</span><span class="cx"> Vector<Vector<Vector<RenderBox*, 1>>> m_grid;
</span><span class="cx"> Vector<LayoutUnit> m_columnPositions;
</span></span></pre>
</div>
</div>
</body>
</html>