<!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>[181528] releases/WebKitGTK/webkit-2.8</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/181528">181528</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-16 01:42:25 -0700 (Mon, 16 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/181387">r181387</a> - Inline block children do not have correct baselines if their children are also block elements
https://bugs.webkit.org/show_bug.cgi?id=142559
Patch by Myles C. Maxfield <mmaxfield@apple.com> on 2015-03-11
Reviewed by Darin Adler.
Source/WebCore:
Perform the same computation on child block elements as child inline elements.
Test: fast/text/baseline-inline-block-block-children.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::inlineBlockBaseline):
LayoutTests:
* fast/text/baseline-inline-block-block-children-expected.html: Added.
* fast/text/baseline-inline-block-block-children.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderBlockFlowcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfasttextbaselineinlineblockblockchildrenexpectedhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/text/baseline-inline-block-block-children-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfasttextbaselineinlineblockblockchildrenhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/text/baseline-inline-block-block-children.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (181527 => 181528)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-03-16 08:16:23 UTC (rev 181527)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-03-16 08:42:25 UTC (rev 181528)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-03-11 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Inline block children do not have correct baselines if their children are also block elements
+ https://bugs.webkit.org/show_bug.cgi?id=142559
+
+ Reviewed by Darin Adler.
+
+ * fast/text/baseline-inline-block-block-children-expected.html: Added.
+ * fast/text/baseline-inline-block-block-children.html: Added.
+
</ins><span class="cx"> 2015-03-09 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r176978): Inline-blocks with overflowing contents have ascents that are too large
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfasttextbaselineinlineblockblockchildrenexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/text/baseline-inline-block-block-children-expected.html (0 => 181528)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/text/baseline-inline-block-block-children-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/text/baseline-inline-block-block-children-expected.html 2015-03-16 08:42:25 UTC (rev 181528)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+This tests that block children of overflow: scroll have the correct baseline calculated.<br>
+<div style="display: inline-block; background: green;">
+ <div style="height: 150px; width: 200px; overflow: scroll;">
+ Overflow with<br>overflow: scroll<br>M<br>M<br>M<br>M<br>M<br>M<br>M<br>M<br>M<br>M<br>M
+ </div>
+</div>
+Baseline
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfasttextbaselineinlineblockblockchildrenhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/text/baseline-inline-block-block-children.html (0 => 181528)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/text/baseline-inline-block-block-children.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/text/baseline-inline-block-block-children.html 2015-03-16 08:42:25 UTC (rev 181528)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+This tests that block children of overflow: scroll have the correct baseline calculated.<br>
+<div style="display: inline-block; background: green;">
+ <div style="height: 150px; width: 200px; overflow: scroll;">
+ <div>Overflow with<br>overflow: scroll</div>M<br>M<br>M<br>M<br>M<br>M<br>M<br>M<br>M<br>M<br>M
+ </div>
+</div>
+Baseline
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (181527 => 181528)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 08:16:23 UTC (rev 181527)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-03-16 08:42:25 UTC (rev 181528)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-11 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Inline block children do not have correct baselines if their children are also block elements
+ https://bugs.webkit.org/show_bug.cgi?id=142559
+
+ Reviewed by Darin Adler.
+
+ Perform the same computation on child block elements as child inline elements.
+
+ Test: fast/text/baseline-inline-block-block-children.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::inlineBlockBaseline):
+
</ins><span class="cx"> 2015-03-11 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake][GStreamer] Building EFL or GTK with ENABLE_VIDEO and without ENABLE_WEB_AUDIO is broken.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlockFlow.cpp (181527 => 181528)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-03-16 08:16:23 UTC (rev 181527)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBlockFlow.cpp 2015-03-16 08:42:25 UTC (rev 181528)
</span><span class="lines">@@ -3002,27 +3002,28 @@
</span><span class="cx"> if (isWritingModeRoot() && !isRubyRun())
</span><span class="cx"> return -1;
</span><span class="cx">
</span><del>- if (!childrenInline())
- return RenderBlock::inlineBlockBaseline(lineDirection);
-
- if (!hasLines()) {
- if (!hasLineIfEmpty())
- return -1;
- const FontMetrics& fontMetrics = firstLineStyle().fontMetrics();
- return fontMetrics.ascent()
- + (lineHeight(true, lineDirection, PositionOfInteriorLineBoxes) - fontMetrics.height()) / 2
- + (lineDirection == HorizontalLine ? borderTop() + paddingTop() : borderRight() + paddingRight());
- }
-
</del><span class="cx"> // Note that here we only take the left and bottom into consideration. Our caller takes the right and top into consideration.
</span><span class="cx"> float boxHeight = lineDirection == HorizontalLine ? height() + m_marginBox.bottom() : width() + m_marginBox.left();
</span><span class="cx"> float lastBaseline;
</span><del>- if (auto simpleLineLayout = this->simpleLineLayout())
- lastBaseline = SimpleLineLayout::computeFlowLastLineBaseline(*this, *simpleLineLayout);
</del><ins>+ if (!childrenInline())
+ lastBaseline = RenderBlock::inlineBlockBaseline(lineDirection);
</ins><span class="cx"> else {
</span><del>- bool isFirstLine = lastRootBox() == firstRootBox();
- const RenderStyle& style = isFirstLine ? firstLineStyle() : this->style();
- lastBaseline = lastRootBox()->logicalTop() + style.fontMetrics().ascent(lastRootBox()->baselineType());
</del><ins>+ if (!hasLines()) {
+ if (!hasLineIfEmpty())
+ return -1;
+ const auto& fontMetrics = firstLineStyle().fontMetrics();
+ return fontMetrics.ascent()
+ + (lineHeight(true, lineDirection, PositionOfInteriorLineBoxes) - fontMetrics.height()) / 2
+ + (lineDirection == HorizontalLine ? borderTop() + paddingTop() : borderRight() + paddingRight());
+ }
+
+ if (auto simpleLineLayout = this->simpleLineLayout())
+ lastBaseline = SimpleLineLayout::computeFlowLastLineBaseline(*this, *simpleLineLayout);
+ else {
+ bool isFirstLine = lastRootBox() == firstRootBox();
+ const auto& style = isFirstLine ? firstLineStyle() : this->style();
+ lastBaseline = lastRootBox()->logicalTop() + style.fontMetrics().ascent(lastRootBox()->baselineType());
+ }
</ins><span class="cx"> }
</span><span class="cx"> // According to the CSS spec http://www.w3.org/TR/CSS21/visudet.html, we shouldn't be performing this min, but should
</span><span class="cx"> // instead be returning boxHeight directly. However, we feel that a min here is better behavior (and is consistent
</span></span></pre>
</div>
</div>
</body>
</html>