<!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>[195251] releases/WebKitGTK/webkit-2.10</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/195251">195251</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-18 23:51:45 -0800 (Mon, 18 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194867">r194867</a> - Padding added to table-cell element after font-size change.
https://bugs.webkit.org/show_bug.cgi?id=152796
Reviewed by David Hyatt.
Do not include intrinsicPaddingBefore value while figuring out the height of a row.
In RenderTableSection::calcRowLogicalHeight() we are interested in the height of the content
without the additional padding (normal padding is included).
Source/WebCore:
Test: fast/table/table-baseline-grows.html
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::calcRowLogicalHeight):
LayoutTests:
* TestExpectations: This test fails even without the patch when Ahem font is not used.
* fast/table/table-baseline-grows-expected.html: Added.
* fast/table/table-baseline-grows.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderTableSectioncpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfasttabletablebaselinegrowsexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/table/table-baseline-grows-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfasttabletablebaselinegrowshtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/table/table-baseline-grows.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195250 => 195251)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-19 07:44:38 UTC (rev 195250)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-19 07:51:45 UTC (rev 195251)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-11 Zalan Bujtas <zalan@apple.com>
+
+ Padding added to table-cell element after font-size change.
+ https://bugs.webkit.org/show_bug.cgi?id=152796
+
+ Reviewed by David Hyatt.
+
+ Do not include intrinsicPaddingBefore value while figuring out the height of a row.
+ In RenderTableSection::calcRowLogicalHeight() we are interested in the height of the content
+ without the additional padding (normal padding is included).
+
+ * TestExpectations: This test fails even without the patch when Ahem font is not used.
+ * fast/table/table-baseline-grows-expected.html: Added.
+ * fast/table/table-baseline-grows.html: Added.
+
</ins><span class="cx"> 2016-01-09 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r194426): First email field is not autofilled on amazon.com
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfasttabletablebaselinegrowsexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/table/table-baseline-grows-expected.html (0 => 195251)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/table/table-baseline-grows-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/table/table-baseline-grows-expected.html 2016-01-19 07:51:45 UTC (rev 195251)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that baseline position is reset properly after font size change.</title>
+<style>
+td {
+ font-size: 30px;
+ vertical-align: baseline;
+}
+</style>
+</head>
+<body><table><tr><td>foo</td><td>bar</td></tr></table></body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfasttabletablebaselinegrowshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/table/table-baseline-grows.html (0 => 195251)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/table/table-baseline-grows.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/table/table-baseline-grows.html 2016-01-19 07:51:45 UTC (rev 195251)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that baseline position is reset properly after font size change.</title>
+<style>
+td {
+ font-size: 30px;
+ vertical-align: baseline;
+}
+</style>
+</head>
+<body><table><tr><td id=first>foo</td><td>bar</td></tr></table></body>
+<script>
+
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+var cell = document.getElementById("first");
+setTimeout(function() {
+ cell.style.fontSize = "260px";
+ cell.offsetWidth;
+ cell.style.fontSize = "30px";
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+</script>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195250 => 195251)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-19 07:44:38 UTC (rev 195250)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-19 07:51:45 UTC (rev 195251)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-01-11 Zalan Bujtas <zalan@apple.com>
+
+ Padding added to table-cell element after font-size change.
+ https://bugs.webkit.org/show_bug.cgi?id=152796
+
+ Reviewed by David Hyatt.
+
+ Do not include intrinsicPaddingBefore value while figuring out the height of a row.
+ In RenderTableSection::calcRowLogicalHeight() we are interested in the height of the content
+ without the additional padding (normal padding is included).
+
+ Test: fast/table/table-baseline-grows.html
+
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::calcRowLogicalHeight):
+
</ins><span class="cx"> 2016-01-09 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r194426): First email field is not autofilled on amazon.com
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderTableSection.cpp (195250 => 195251)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderTableSection.cpp 2016-01-19 07:44:38 UTC (rev 195250)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderTableSection.cpp 2016-01-19 07:51:45 UTC (rev 195251)
</span><span class="lines">@@ -333,15 +333,16 @@
</span><span class="cx">
</span><span class="cx"> // Find out the baseline. The baseline is set on the first row in a rowspan.
</span><span class="cx"> if (cell->isBaselineAligned()) {
</span><del>- LayoutUnit baselinePosition = cell->cellBaselinePosition();
- if (baselinePosition > cell->borderAndPaddingBefore()) {
</del><ins>+ LayoutUnit baselinePosition = cell->cellBaselinePosition() - cell->intrinsicPaddingBefore();
+ LayoutUnit borderAndComputedPaddingBefore = cell->borderAndPaddingBefore() - cell->intrinsicPaddingBefore();
+ if (baselinePosition > borderAndComputedPaddingBefore) {
</ins><span class="cx"> m_grid[cellStartRow].baseline = std::max(m_grid[cellStartRow].baseline, baselinePosition);
</span><span class="cx"> // The descent of a cell that spans multiple rows does not affect the height of the first row it spans, so don't let it
</span><span class="cx"> // become the baseline descent applied to the rest of the row. Also we don't account for the baseline descent of
</span><span class="cx"> // non-spanning cells when computing a spanning cell's extent.
</span><span class="cx"> int cellStartRowBaselineDescent = 0;
</span><span class="cx"> if (cell->rowSpan() == 1) {
</span><del>- baselineDescent = std::max(baselineDescent, cellLogicalHeight - (baselinePosition - cell->intrinsicPaddingBefore()));
</del><ins>+ baselineDescent = std::max(baselineDescent, cellLogicalHeight - baselinePosition);
</ins><span class="cx"> cellStartRowBaselineDescent = baselineDescent;
</span><span class="cx"> }
</span><span class="cx"> m_rowPos[cellStartRow + 1] = std::max<int>(m_rowPos[cellStartRow + 1], m_rowPos[cellStartRow] + m_grid[cellStartRow].baseline + cellStartRowBaselineDescent);
</span></span></pre>
</div>
</div>
</body>
</html>