<!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>[174962] releases/WebKitGTK/webkit-2.6</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/174962">174962</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-21 07:56:50 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174370">r174370</a> - REGRESSION (Simple Line Layout): Inline block baselines computed incorrectly
https://bugs.webkit.org/show_bug.cgi?id=137461
Reviewed by Simon Fraser.
Source/WebCore:
Added fast/inline-block/simple-line-layout.html
* rendering/SimpleLineLayoutFunctions.h:
(WebCore::SimpleLineLayout::computeFlowFirstLineBaseline):
(WebCore::SimpleLineLayout::computeFlowLastLineBaseline):
Fix the baseline computation functions in simple line layout to
use lineCount rather than runCount.
LayoutTests:
* fast/inline-block/simple-line-layout-expected.html: Added.
* fast/inline-block/simple-line-layout.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingSimpleLineLayoutFunctionsh">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/SimpleLineLayoutFunctions.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastinlineblocksimplelinelayoutexpectedhtml">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/inline-block/simple-line-layout-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastinlineblocksimplelinelayouthtml">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/inline-block/simple-line-layout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (174961 => 174962)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-10-21 14:49:56 UTC (rev 174961)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-10-21 14:56:50 UTC (rev 174962)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-10-06 David Hyatt <hyatt@apple.com>
+
+ REGRESSION (Simple Line Layout): Inline block baselines computed incorrectly
+ https://bugs.webkit.org/show_bug.cgi?id=137461
+
+ Reviewed by Simon Fraser.
+
+ * fast/inline-block/simple-line-layout-expected.html: Added.
+ * fast/inline-block/simple-line-layout.html: Added.
+
</ins><span class="cx"> 2014-10-03 Bear Travis <betravis@adobe.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r173531): Use after free in WebCore::RenderStyle::fontMetrics /
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastinlineblocksimplelinelayoutexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/inline-block/simple-line-layout-expected.html (0 => 174962)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/inline-block/simple-line-layout-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/inline-block/simple-line-layout-expected.html 2014-10-21 14:56:50 UTC (rev 174962)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+One <div style="display:inline-block">This line has multiple runs.</div> Two
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastinlineblocksimplelinelayouthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/inline-block/simple-line-layout.html (0 => 174962)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/inline-block/simple-line-layout.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/inline-block/simple-line-layout.html 2014-10-21 14:56:50 UTC (rev 174962)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+One <div style="display:inline-block">This line has multiple runs.</div> Two
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (174961 => 174962)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 14:49:56 UTC (rev 174961)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-10-21 14:56:50 UTC (rev 174962)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-10-06 David Hyatt <hyatt@apple.com>
+
+ REGRESSION (Simple Line Layout): Inline block baselines computed incorrectly
+ https://bugs.webkit.org/show_bug.cgi?id=137461
+
+ Reviewed by Simon Fraser.
+
+ Added fast/inline-block/simple-line-layout.html
+
+ * rendering/SimpleLineLayoutFunctions.h:
+ (WebCore::SimpleLineLayout::computeFlowFirstLineBaseline):
+ (WebCore::SimpleLineLayout::computeFlowLastLineBaseline):
+ Fix the baseline computation functions in simple line layout to
+ use lineCount rather than runCount.
+
</ins><span class="cx"> 2014-10-06 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Performance: Certain Web site causes Safari to hang completely while entering form data
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingSimpleLineLayoutFunctionsh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/SimpleLineLayoutFunctions.h (174961 => 174962)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2014-10-21 14:49:56 UTC (rev 174961)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2014-10-21 14:56:50 UTC (rev 174962)
</span><span class="lines">@@ -78,14 +78,14 @@
</span><span class="cx">
</span><span class="cx"> inline LayoutUnit computeFlowFirstLineBaseline(const RenderBlockFlow& flow, const Layout& layout)
</span><span class="cx"> {
</span><del>- ASSERT_UNUSED(layout, layout.runCount());
</del><ins>+ ASSERT_UNUSED(layout, layout.lineCount());
</ins><span class="cx"> return flow.borderAndPaddingBefore() + baselineFromFlow(flow);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline LayoutUnit computeFlowLastLineBaseline(const RenderBlockFlow& flow, const Layout& layout)
</span><span class="cx"> {
</span><del>- ASSERT(layout.runCount());
- return flow.borderAndPaddingBefore() + lineHeightFromFlow(flow) * (layout.runCount() - 1) + baselineFromFlow(flow);
</del><ins>+ ASSERT(layout.lineCount());
+ return flow.borderAndPaddingBefore() + lineHeightFromFlow(flow) * (layout.lineCount() - 1) + baselineFromFlow(flow);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline unsigned findTextCaretMinimumOffset(const RenderText&, const Layout& layout)
</span></span></pre>
</div>
</div>
</body>
</html>