<!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>[210601] 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/210601">210601</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2017-01-11 15:06:13 -0800 (Wed, 11 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: run->m_stop > 0 in *WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment
https://bugs.webkit.org/show_bug.cgi?id=166030
Reviewed by Ryosuke Niwa.
Source/WebCore:
Ordinarily, we don't process empty BiDi runs (because we filter them out).
However, when using isolates, we invoke extra machinery to create a
placeholder BiDi run, and replace it with the runs for the isolate. The
isolate's runs, though, can be empty, and rather than just deleting the
placeholder run, we will keep it around so that the m_logicallyLastRun is
still valid. This means that it is possible when all is said and done to
have empty runs, and computeInlineDirectionPositionsForSegment() needs to
not ASSERT() in this case.
Test: fast/text/bidi-isolate-empty-run.html
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):
LayoutTests:
* fast/text/bidi-isolate-empty-run-expected.txt: Added.
* fast/text/bidi-isolate-empty-run.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="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextbidiisolateemptyrunexpectedtxt">trunk/LayoutTests/fast/text/bidi-isolate-empty-run-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextbidiisolateemptyrunhtml">trunk/LayoutTests/fast/text/bidi-isolate-empty-run.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210600 => 210601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-11 22:44:51 UTC (rev 210600)
+++ trunk/LayoutTests/ChangeLog 2017-01-11 23:06:13 UTC (rev 210601)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-01-11 Myles C. Maxfield <mmaxfield@apple.com>
+
+ ASSERTION FAILED: run->m_stop > 0 in *WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment
+ https://bugs.webkit.org/show_bug.cgi?id=166030
+
+ Reviewed by Ryosuke Niwa.
+
+ * fast/text/bidi-isolate-empty-run-expected.txt: Added.
+ * fast/text/bidi-isolate-empty-run.html: Added.
+
</ins><span class="cx"> 2017-01-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Iterating over URLSearchParams does not work
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextbidiisolateemptyrunexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/bidi-isolate-empty-run-expected.txt (0 => 210601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/bidi-isolate-empty-run-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/bidi-isolate-empty-run-expected.txt 2017-01-11 23:06:13 UTC (rev 210601)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test passes if there is no ASSERT().
+f foo
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/text/bidi-isolate-empty-run-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<ins>+Author Date Id Rev URL
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkLayoutTestsfasttextbidiisolateemptyrunhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/bidi-isolate-empty-run.html (0 => 210601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/bidi-isolate-empty-run.html (rev 0)
+++ trunk/LayoutTests/fast/text/bidi-isolate-empty-run.html 2017-01-11 23:06:13 UTC (rev 210601)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+.foo {
+ unicode-bidi: -webkit-isolate;
+}
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+This test passes if there is no ASSERT().
+<div style="width: 30px;" contenteditable="true"><span>f </span><span class=foo>
+foo</span></div>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210600 => 210601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-11 22:44:51 UTC (rev 210600)
+++ trunk/Source/WebCore/ChangeLog 2017-01-11 23:06:13 UTC (rev 210601)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-01-11 Myles C. Maxfield <mmaxfield@apple.com>
+
+ ASSERTION FAILED: run->m_stop > 0 in *WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment
+ https://bugs.webkit.org/show_bug.cgi?id=166030
+
+ Reviewed by Ryosuke Niwa.
+
+ Ordinarily, we don't process empty BiDi runs (because we filter them out).
+ However, when using isolates, we invoke extra machinery to create a
+ placeholder BiDi run, and replace it with the runs for the isolate. The
+ isolate's runs, though, can be empty, and rather than just deleting the
+ placeholder run, we will keep it around so that the m_logicallyLastRun is
+ still valid. This means that it is possible when all is said and done to
+ have empty runs, and computeInlineDirectionPositionsForSegment() needs to
+ not ASSERT() in this case.
+
+ Test: fast/text/bidi-isolate-empty-run.html
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::computeInlineDirectionPositionsForSegment):
+
</ins><span class="cx"> 2017-01-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> File scheme should not allow access of a resource on a different volume.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (210600 => 210601)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2017-01-11 22:44:51 UTC (rev 210600)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2017-01-11 23:06:13 UTC (rev 210601)
</span><span class="lines">@@ -897,8 +897,9 @@
</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="cx"> totalLogicalWidth += lineStyle(*renderText.parent(), lineInfo).fontCascade().wordSpacing();
</span><del>- ASSERT(run->m_stop > 0);
- needsWordSpacing = !isSpaceOrNewline(renderText.characterAt(run->m_stop - 1)) && run->m_stop == length;
</del><ins>+ // run->m_start == run->m_stop should only be true iff the run is a replaced run for bidi: isolate.
+ ASSERT(run->m_stop > 0 || run->m_start == run->m_stop);
+ needsWordSpacing = run->m_stop == length && !isSpaceOrNewline(renderText.characterAt(run->m_stop - 1));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> setLogicalWidthForTextRun(lineBox, run, renderText, totalLogicalWidth, lineInfo, textBoxDataMap, verticalPositionCache, wordMeasurements);
</span></span></pre>
</div>
</div>
</body>
</html>