<!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>[205186] 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/205186">205186</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-08-30 10:57:43 -0700 (Tue, 30 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: opportunitiesInRun <= expansionOpportunityCount in WebCore::computeExpansionForJustifiedText
https://bugs.webkit.org/show_bug.cgi?id=139393
<rdar://problem/27704243>
Reviewed by Myles C. Maxfield.
Source/WebCore:
This patch ensures that we always remove a valid 'after expansion' opportunity (even when the last entry
in the opportunities list is 0).
Test: fast/text/assert-on-expansion-opportunity.html
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):
LayoutTests:
* fast/text/assert-on-expansion-opportunity-expected.txt: Added.
* fast/text/assert-on-expansion-opportunity.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="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextassertonexpansionopportunityexpectedtxt">trunk/LayoutTests/fast/text/assert-on-expansion-opportunity-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextassertonexpansionopportunityhtml">trunk/LayoutTests/fast/text/assert-on-expansion-opportunity.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (205185 => 205186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-30 17:55:32 UTC (rev 205185)
+++ trunk/LayoutTests/ChangeLog 2016-08-30 17:57:43 UTC (rev 205186)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-30 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: opportunitiesInRun <= expansionOpportunityCount in WebCore::computeExpansionForJustifiedText
+ https://bugs.webkit.org/show_bug.cgi?id=139393
+ <rdar://problem/27704243>
+
+ Reviewed by Myles C. Maxfield.
+
+ * fast/text/assert-on-expansion-opportunity-expected.txt: Added.
+ * fast/text/assert-on-expansion-opportunity.html: Added.
+
</ins><span class="cx"> 2016-08-30 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking inspector/unit-tests/yieldable-task.html as a flaky failure.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextassertonexpansionopportunityexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/assert-on-expansion-opportunity-expected.txt (0 => 205186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/assert-on-expansion-opportunity-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/assert-on-expansion-opportunity-expected.txt 2016-08-30 17:57:43 UTC (rev 205186)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+
+
+Pass if no assert in Debug.
+aa
+
+
+
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextassertonexpansionopportunityhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/assert-on-expansion-opportunity.html (0 => 205186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/assert-on-expansion-opportunity.html (rev 0)
+++ trunk/LayoutTests/fast/text/assert-on-expansion-opportunity.html 2016-08-30 17:57:43 UTC (rev 205186)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we compute expansion opportunities properly.</title>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+:first-letter, * {
+ white-space: pre-wrap;
+}
+
+</style>
+</head>
+<body>
+Pass if no assert in Debug.
+<ruby>aa
+ <rt> </rt>
+</ruby>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205185 => 205186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-30 17:55:32 UTC (rev 205185)
+++ trunk/Source/WebCore/ChangeLog 2016-08-30 17:57:43 UTC (rev 205186)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-08-30 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: opportunitiesInRun <= expansionOpportunityCount in WebCore::computeExpansionForJustifiedText
+ https://bugs.webkit.org/show_bug.cgi?id=139393
+ <rdar://problem/27704243>
+
+ Reviewed by Myles C. Maxfield.
+
+ This patch ensures that we always remove a valid 'after expansion' opportunity (even when the last entry
+ in the opportunities list is 0).
+
+ Test: fast/text/assert-on-expansion-opportunity.html
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):
+
</ins><span class="cx"> 2016-08-30 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Exit fullscreen button in fullscreen media playback needs an accessibility string
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (205185 => 205186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-08-30 17:55:32 UTC (rev 205185)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2016-08-30 17:57:43 UTC (rev 205186)
</span><span class="lines">@@ -958,7 +958,7 @@
</span><span class="cx"> return isCJKIdeograph(c);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::pair<unsigned, bool> FontCascade::expansionOpportunityCountInternal(const LChar* characters, size_t length, TextDirection direction, ExpansionBehavior expansionBehavior)
</del><ins>+std::pair<unsigned, bool> FontCascade::expansionOpportunityCountInternal(const LChar* characters, unsigned length, TextDirection direction, ExpansionBehavior expansionBehavior)
</ins><span class="cx"> {
</span><span class="cx"> unsigned count = 0;
</span><span class="cx"> bool isAfterExpansion = (expansionBehavior & LeadingExpansionMask) == ForbidLeadingExpansion;
</span><span class="lines">@@ -967,7 +967,7 @@
</span><span class="cx"> isAfterExpansion = true;
</span><span class="cx"> }
</span><span class="cx"> if (direction == LTR) {
</span><del>- for (size_t i = 0; i < length; ++i) {
</del><ins>+ for (unsigned i = 0; i < length; ++i) {
</ins><span class="cx"> if (treatAsSpace(characters[i])) {
</span><span class="cx"> count++;
</span><span class="cx"> isAfterExpansion = true;
</span><span class="lines">@@ -975,7 +975,7 @@
</span><span class="cx"> isAfterExpansion = false;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- for (size_t i = length; i > 0; --i) {
</del><ins>+ for (unsigned i = length; i > 0; --i) {
</ins><span class="cx"> if (treatAsSpace(characters[i - 1])) {
</span><span class="cx"> count++;
</span><span class="cx"> isAfterExpansion = true;
</span><span class="lines">@@ -987,6 +987,7 @@
</span><span class="cx"> ++count;
</span><span class="cx"> isAfterExpansion = true;
</span><span class="cx"> } else if (isAfterExpansion && (expansionBehavior & TrailingExpansionMask) == ForbidTrailingExpansion) {
</span><ins>+ ASSERT(count);
</ins><span class="cx"> --count;
</span><span class="cx"> isAfterExpansion = false;
</span><span class="cx"> }
</span><span class="lines">@@ -993,7 +994,7 @@
</span><span class="cx"> return std::make_pair(count, isAfterExpansion);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::pair<unsigned, bool> FontCascade::expansionOpportunityCountInternal(const UChar* characters, size_t length, TextDirection direction, ExpansionBehavior expansionBehavior)
</del><ins>+std::pair<unsigned, bool> FontCascade::expansionOpportunityCountInternal(const UChar* characters, unsigned length, TextDirection direction, ExpansionBehavior expansionBehavior)
</ins><span class="cx"> {
</span><span class="cx"> static bool expandAroundIdeographs = canExpandAroundIdeographsInComplexText();
</span><span class="cx"> unsigned count = 0;
</span><span class="lines">@@ -1003,7 +1004,7 @@
</span><span class="cx"> isAfterExpansion = true;
</span><span class="cx"> }
</span><span class="cx"> if (direction == LTR) {
</span><del>- for (size_t i = 0; i < length; ++i) {
</del><ins>+ for (unsigned i = 0; i < length; ++i) {
</ins><span class="cx"> UChar32 character = characters[i];
</span><span class="cx"> if (treatAsSpace(character)) {
</span><span class="cx"> count++;
</span><span class="lines">@@ -1024,7 +1025,7 @@
</span><span class="cx"> isAfterExpansion = false;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- for (size_t i = length; i > 0; --i) {
</del><ins>+ for (unsigned i = length; i > 0; --i) {
</ins><span class="cx"> UChar32 character = characters[i - 1];
</span><span class="cx"> if (treatAsSpace(character)) {
</span><span class="cx"> count++;
</span><span class="lines">@@ -1049,6 +1050,7 @@
</span><span class="cx"> ++count;
</span><span class="cx"> isAfterExpansion = true;
</span><span class="cx"> } else if (isAfterExpansion && (expansionBehavior & TrailingExpansionMask) == ForbidTrailingExpansion) {
</span><ins>+ ASSERT(count);
</ins><span class="cx"> --count;
</span><span class="cx"> isAfterExpansion = false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (205185 => 205186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2016-08-30 17:55:32 UTC (rev 205185)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2016-08-30 17:57:43 UTC (rev 205186)
</span><span class="lines">@@ -239,8 +239,8 @@
</span><span class="cx"> int offsetForPositionForComplexText(const TextRun&, float position, bool includePartialGlyphs) const;
</span><span class="cx"> void adjustSelectionRectForComplexText(const TextRun&, LayoutRect& selectionRect, unsigned from, unsigned to) const;
</span><span class="cx">
</span><del>- static std::pair<unsigned, bool> expansionOpportunityCountInternal(const LChar*, size_t length, TextDirection, ExpansionBehavior);
- static std::pair<unsigned, bool> expansionOpportunityCountInternal(const UChar*, size_t length, TextDirection, ExpansionBehavior);
</del><ins>+ static std::pair<unsigned, bool> expansionOpportunityCountInternal(const LChar*, unsigned length, TextDirection, ExpansionBehavior);
+ static std::pair<unsigned, bool> expansionOpportunityCountInternal(const UChar*, unsigned length, TextDirection, ExpansionBehavior);
</ins><span class="cx">
</span><span class="cx"> friend struct WidthIterator;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (205185 => 205186)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2016-08-30 17:55:32 UTC (rev 205185)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2016-08-30 17:57:43 UTC (rev 205186)
</span><span class="lines">@@ -853,6 +853,21 @@
</span><span class="cx"> BidiRun* run = firstRun;
</span><span class="cx"> BidiRun* previousRun = nullptr;
</span><span class="cx"> for (; run; run = run->next()) {
</span><ins>+ auto computeExpansionOpportunities = [&expansionOpportunities, &expansionOpportunityCount, textAlign, &isAfterExpansion] (RenderBlockFlow& block,
+ InlineTextBox& textBox, BidiRun* previousRun, BidiRun* nextRun, const StringView& stringView, TextDirection direction)
+ {
+ if (stringView.isEmpty()) {
+ // Empty runs should still produce an entry in expansionOpportunities list so that the number of items matches the number of runs.
+ expansionOpportunities.append(0);
+ return;
+ }
+ ExpansionBehavior expansionBehavior = expansionBehaviorForInlineTextBox(block, textBox, previousRun, nextRun, textAlign, isAfterExpansion);
+ applyExpansionBehavior(textBox, expansionBehavior);
+ unsigned opportunitiesInRun;
+ std::tie(opportunitiesInRun, isAfterExpansion) = FontCascade::expansionOpportunityCount(stringView, direction, expansionBehavior);
+ expansionOpportunities.append(opportunitiesInRun);
+ expansionOpportunityCount += opportunitiesInRun;
+ };
</ins><span class="cx"> if (!run->box() || run->renderer().isOutOfFlowPositioned() || run->box()->isLineBreak()) {
</span><span class="cx"> continue; // Positioned objects are only participating to figure out their
</span><span class="cx"> // correct static x position. They have no effect on the width.
</span><span class="lines">@@ -879,14 +894,8 @@
</span><span class="cx"> canHangPunctuationAtEnd = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (textAlign == JUSTIFY && run != trailingSpaceRun) {
- ExpansionBehavior expansionBehavior = expansionBehaviorForInlineTextBox(*this, textBox, previousRun, run->next(), textAlign, isAfterExpansion);
- applyExpansionBehavior(textBox, expansionBehavior);
- unsigned opportunitiesInRun;
- std::tie(opportunitiesInRun, isAfterExpansion) = FontCascade::expansionOpportunityCount(renderText.stringView(run->m_start, run->m_stop), run->box()->direction(), expansionBehavior);
- expansionOpportunities.append(opportunitiesInRun);
- expansionOpportunityCount += opportunitiesInRun;
- }
</del><ins>+ if (textAlign == JUSTIFY && run != trailingSpaceRun)
+ computeExpansionOpportunities(*this, textBox, previousRun, run->next(), renderText.stringView(run->m_start, run->m_stop), run->box()->direction());
</ins><span class="cx">
</span><span class="cx"> if (unsigned length = renderText.textLength()) {
</span><span class="cx"> if (!run->m_start && needsWordSpacing && isSpaceOrNewline(renderText.characterAt(run->m_start)))
</span><span class="lines">@@ -906,15 +915,9 @@
</span><span class="cx"> for (auto* leafChild = rubyBase->firstRootBox()->firstLeafChild(); leafChild; leafChild = leafChild->nextLeafChild()) {
</span><span class="cx"> if (!is<InlineTextBox>(*leafChild))
</span><span class="cx"> continue;
</span><del>- auto& textBox = downcast<InlineTextBox>(*leafChild);
</del><span class="cx"> encounteredJustifiedRuby = true;
</span><del>- auto& renderText = downcast<RenderText>(leafChild->renderer());
- ExpansionBehavior expansionBehavior = expansionBehaviorForInlineTextBox(*rubyBase, textBox, nullptr, nullptr, textAlign, isAfterExpansion);
- applyExpansionBehavior(textBox, expansionBehavior);
- unsigned opportunitiesInRun;
- std::tie(opportunitiesInRun, isAfterExpansion) = FontCascade::expansionOpportunityCount(renderText.stringView(), leafChild->direction(), expansionBehavior);
- expansionOpportunities.append(opportunitiesInRun);
- expansionOpportunityCount += opportunitiesInRun;
</del><ins>+ computeExpansionOpportunities(*rubyBase, downcast<InlineTextBox>(*leafChild), nullptr, nullptr,
+ downcast<RenderText>(leafChild->renderer()).stringView(), leafChild->direction());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -936,8 +939,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isAfterExpansion && !expansionOpportunities.isEmpty()) {
</span><del>- expansionOpportunities.last()--;
- expansionOpportunityCount--;
</del><ins>+ // FIXME: see <webkit.org/b/139393#c11>
+ int lastValidExpansionOpportunitiesIndex = expansionOpportunities.size() - 1;
+ while (lastValidExpansionOpportunitiesIndex >= 0 && !expansionOpportunities.at(lastValidExpansionOpportunitiesIndex))
+ --lastValidExpansionOpportunitiesIndex;
+ if (lastValidExpansionOpportunitiesIndex >= 0) {
+ ASSERT(expansionOpportunities.at(lastValidExpansionOpportunitiesIndex));
+ expansionOpportunities.at(lastValidExpansionOpportunitiesIndex)--;
+ expansionOpportunityCount--;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (is<RenderRubyBase>(*this) && !expansionOpportunityCount)
</span></span></pre>
</div>
</div>
</body>
</html>