<!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>[199777] trunk</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/199777">199777</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-04-20 11:01:40 -0700 (Wed, 20 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Hangable punctuation measurement using the wrong indices.
https://bugs.webkit.org/show_bug.cgi?id=155899
Reviewed by Simon Fraser.
Source/WebCore:
New tests in fast/text.
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths):
* rendering/RenderText.cpp:
(WebCore::RenderText::hangablePunctuationStartWidth):
(WebCore::RenderText::hangablePunctuationEndWidth):
(WebCore::RenderText::isHangableStopOrComma):
LayoutTests:
* fast/text/hanging-punctuation-variable-font-size-expected.html: Added.
* fast/text/hanging-punctuation-variable-font-size.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttexthangingpunctuationvariablefontsizeexpectedhtml">trunk/LayoutTests/fast/text/hanging-punctuation-variable-font-size-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttexthangingpunctuationvariablefontsizehtml">trunk/LayoutTests/fast/text/hanging-punctuation-variable-font-size.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199776 => 199777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-20 17:40:02 UTC (rev 199776)
+++ trunk/LayoutTests/ChangeLog 2016-04-20 18:01:40 UTC (rev 199777)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-04-20 Dave Hyatt <hyatt@apple.com>
+
+ Hangable punctuation measurement using the wrong indices.
+ https://bugs.webkit.org/show_bug.cgi?id=155899
+
+ Reviewed by Simon Fraser.
+
+ * fast/text/hanging-punctuation-variable-font-size-expected.html: Added.
+ * fast/text/hanging-punctuation-variable-font-size.html: Added.
+
</ins><span class="cx"> 2016-04-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop [UsePointersEvenForNonNullableObjectArguments] from several Canvas interfaces
</span></span></pre></div>
<a id="trunkLayoutTestsfasttexthangingpunctuationvariablefontsizeexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/hanging-punctuation-variable-font-size-expected.html (0 => 199777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/hanging-punctuation-variable-font-size-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/hanging-punctuation-variable-font-size-expected.html 2016-04-20 18:01:40 UTC (rev 199777)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<head>
+<style>
+ body { font-family: 'Ahem'; color:green }
+ .hang { white-space: nowrap; margin:1em; border:1px solid black; float:left }
+</style>
+</head>
+<body>
+
+<div class="hang" style="font-size:32px"><span style="font-size:16px; margin-left:-1em">(</span>1234</div>
+
+<div class="hang" style="font-size:32px">1234<span style="font-size:16px; margin-right:-1em">)</span></div>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttexthangingpunctuationvariablefontsizehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/hanging-punctuation-variable-font-size.html (0 => 199777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/hanging-punctuation-variable-font-size.html (rev 0)
+++ trunk/LayoutTests/fast/text/hanging-punctuation-variable-font-size.html 2016-04-20 18:01:40 UTC (rev 199777)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<head>
+<style>
+ body { font-family: 'Ahem'; color:green }
+ .hang { hanging-punctuation: first last; margin:1em; border:1px solid black; float:left }
+</style>
+</head>
+<body>
+
+<div class="hang" style="font-size:32px"><span style="font-size:16px">(</span>1234</div>
+
+<div class="hang" style="font-size:32px">1234<span style="font-size:16px">)</span></div>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199776 => 199777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-20 17:40:02 UTC (rev 199776)
+++ trunk/Source/WebCore/ChangeLog 2016-04-20 18:01:40 UTC (rev 199777)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-04-20 Dave Hyatt <hyatt@apple.com>
+
+ Hangable punctuation measurement using the wrong indices.
+ https://bugs.webkit.org/show_bug.cgi?id=155899
+
+ Reviewed by Simon Fraser.
+
+ New tests in fast/text.
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::computeInlinePreferredLogicalWidths):
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::hangablePunctuationStartWidth):
+ (WebCore::RenderText::hangablePunctuationEndWidth):
+ (WebCore::RenderText::isHangableStopOrComma):
+
</ins><span class="cx"> 2016-04-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop [UsePointersEvenForNonNullableObjectArguments] from several Canvas interfaces
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (199776 => 199777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-04-20 17:40:02 UTC (rev 199776)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-04-20 18:01:40 UTC (rev 199777)
</span><span class="lines">@@ -4114,7 +4114,6 @@
</span><span class="cx"> float childMax = 0;
</span><span class="cx">
</span><span class="cx"> if (!child->isText()) {
</span><del>- lastText = nullptr;
</del><span class="cx"> if (child->isLineBreakOpportunity()) {
</span><span class="cx"> minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
</span><span class="cx"> inlineMin = 0;
</span><span class="lines">@@ -4134,6 +4133,8 @@
</span><span class="cx"> child->setPreferredLogicalWidthsDirty(false);
</span><span class="cx"> } else {
</span><span class="cx"> // Inline replaced elts add in their margins to their min/max values.
</span><ins>+ if (!child->isFloating())
+ lastText = nullptr;
</ins><span class="cx"> LayoutUnit margins = 0;
</span><span class="cx"> Length startMargin = childStyle.marginStart();
</span><span class="cx"> Length endMargin = childStyle.marginEnd();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (199776 => 199777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2016-04-20 17:40:02 UTC (rev 199776)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2016-04-20 18:01:40 UTC (rev 199777)
</span><span class="lines">@@ -514,9 +514,10 @@
</span><span class="cx">
</span><span class="cx"> float RenderText::hangablePunctuationStartWidth(unsigned index) const
</span><span class="cx"> {
</span><del>- if (!textLength())
</del><ins>+ unsigned len = textLength();
+ if (!len || index >= len)
</ins><span class="cx"> return 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> ASSERT(m_text);
</span><span class="cx"> StringImpl& text = *m_text.impl();
</span><span class="cx">
</span><span class="lines">@@ -526,12 +527,13 @@
</span><span class="cx"> const RenderStyle& style = this->style();
</span><span class="cx"> const FontCascade& font = style.fontCascade();
</span><span class="cx">
</span><del>- return widthFromCache(font, 0, 1, 0, 0, 0, style);
</del><ins>+ return widthFromCache(font, index, 1, 0, 0, 0, style);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> float RenderText::hangablePunctuationEndWidth(unsigned index) const
</span><span class="cx"> {
</span><del>- if (!textLength())
</del><ins>+ unsigned len = textLength();
+ if (!len || index >= len)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> ASSERT(m_text);
</span><span class="lines">@@ -543,7 +545,7 @@
</span><span class="cx"> const RenderStyle& style = this->style();
</span><span class="cx"> const FontCascade& font = style.fontCascade();
</span><span class="cx">
</span><del>- return widthFromCache(font, 0, 1, 0, 0, 0, style);
</del><ins>+ return widthFromCache(font, index, 1, 0, 0, 0, style);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderText::isHangableStopOrComma(UChar c) const
</span></span></pre>
</div>
</div>
</body>
</html>