<!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>[213828] releases/WebKitGTK/webkit-2.16</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/213828">213828</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-13 04:39:12 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213534">r213534</a> - Simple line layout: Do not use invalid m_lastNonWhitespaceFragment while removing trailing whitespace.
https://bugs.webkit.org/show_bug.cgi?id=169288
rdar://problem/30576976
Reviewed by Antti Koivisto.
Source/WebCore:
When the current line has nothing but whitespace, m_lastNonWhitespaceFragment is invalid so
we should not use the start/end values to decide how many characters we need to revert.
This patch makes m_lastNonWhitespaceFragment optional. When it's invalid we just remove
all the runs from the current line since they are all considered whitespace runs.
Test: fast/text/simple-line-layout-line-is-all-whitespace.html
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::revertAllRunsOnCurrentLine):
(WebCore::SimpleLineLayout::LineState::removeTrailingWhitespace):
LayoutTests:
* fast/text/simple-line-layout-line-is-all-whitespace-expected.txt: Added.
* fast/text/simple-line-layout-line-is-all-whitespace.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingSimpleLineLayoutcpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfasttextsimplelinelayoutlineisallwhitespaceexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/text/simple-line-layout-line-is-all-whitespace-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsfasttextsimplelinelayoutlineisallwhitespacehtml">releases/WebKitGTK/webkit-2.16/LayoutTests/fast/text/simple-line-layout-line-is-all-whitespace.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (213827 => 213828)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-03-13 11:38:29 UTC (rev 213827)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-03-13 11:39:12 UTC (rev 213828)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-03-07 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Do not use invalid m_lastNonWhitespaceFragment while removing trailing whitespace.
+ https://bugs.webkit.org/show_bug.cgi?id=169288
+ rdar://problem/30576976
+
+ Reviewed by Antti Koivisto.
+
+ * fast/text/simple-line-layout-line-is-all-whitespace-expected.txt: Added.
+ * fast/text/simple-line-layout-line-is-all-whitespace.html: Added.
+
</ins><span class="cx"> 2017-03-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Align initEvent / initCustomEvent / initMessageEvent with the latest specification
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfasttextsimplelinelayoutlineisallwhitespaceexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/text/simple-line-layout-line-is-all-whitespace-expected.txt (0 => 213828)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/text/simple-line-layout-line-is-all-whitespace-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/text/simple-line-layout-line-is-all-whitespace-expected.txt 2017-03-13 11:39:12 UTC (rev 213828)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+PASS if no crash.
+f bar f bar foo bar foo bar
+f bar
+foobar foobar foobar
+bar
+f
+
+
+
+fo
+o
+f bar foo foobar foobar fo
+o
+
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsfasttextsimplelinelayoutlineisallwhitespacehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/text/simple-line-layout-line-is-all-whitespace.html (0 => 213828)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/text/simple-line-layout-line-is-all-whitespace.html (rev 0)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/text/simple-line-layout-line-is-all-whitespace.html 2017-03-13 11:39:12 UTC (rev 213828)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE HTML>
+<pre>
+PASS if no crash.
+f bar f bar foo bar foo bar
+f bar
+foobar foobar foobar
+f bar foo foobar foobar foobar
+f
+
+foo
+ <script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+document.designMode = "on";
+document.execCommand("SelectAll");
+document.execCommand("JustifyRight");
+document.execCommand("JustifyLeft");
+</script>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213827 => 213828)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 11:38:29 UTC (rev 213827)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 11:39:12 UTC (rev 213828)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-03-07 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Do not use invalid m_lastNonWhitespaceFragment while removing trailing whitespace.
+ https://bugs.webkit.org/show_bug.cgi?id=169288
+ rdar://problem/30576976
+
+ Reviewed by Antti Koivisto.
+
+ When the current line has nothing but whitespace, m_lastNonWhitespaceFragment is invalid so
+ we should not use the start/end values to decide how many characters we need to revert.
+ This patch makes m_lastNonWhitespaceFragment optional. When it's invalid we just remove
+ all the runs from the current line since they are all considered whitespace runs.
+
+ Test: fast/text/simple-line-layout-line-is-all-whitespace.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::revertAllRunsOnCurrentLine):
+ (WebCore::SimpleLineLayout::LineState::removeTrailingWhitespace):
+
</ins><span class="cx"> 2017-03-07 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> ShadowBlur::calculateLayerBoundingRect doesn't need to return the enclosingIntRect of layerRect
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.cpp (213827 => 213828)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-03-13 11:38:29 UTC (rev 213827)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-03-13 11:39:12 UTC (rev 213828)
</span><span class="lines">@@ -344,6 +344,12 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void revertAllRunsOnCurrentLine(Layout::RunVector& runs)
+{
+ while (!runs.isEmpty() && !runs.last().isEndOfLine)
+ runs.removeLast();
+}
+
</ins><span class="cx"> static void revertRuns(Layout::RunVector& runs, unsigned positionToRevertTo, float width)
</span><span class="cx"> {
</span><span class="cx"> while (runs.size()) {
</span><span class="lines">@@ -489,11 +495,26 @@
</span><span class="cx">
</span><span class="cx"> void removeTrailingWhitespace(Layout::RunVector& runs)
</span><span class="cx"> {
</span><del>- if (m_lastFragment.type() != TextFragmentIterator::TextFragment::Whitespace || m_lastFragment.end() == m_lastNonWhitespaceFragment.end())
</del><ins>+ if (m_lastFragment.type() != TextFragmentIterator::TextFragment::Whitespace)
</ins><span class="cx"> return;
</span><del>- revertRuns(runs, m_lastNonWhitespaceFragment.end(), m_trailingWhitespaceWidth);
- m_runsWidth -= m_trailingWhitespaceWidth;
- m_lastFragment = m_lastNonWhitespaceFragment;
</del><ins>+ if (m_lastNonWhitespaceFragment) {
+ auto needsReverting = m_lastNonWhitespaceFragment->end() != m_lastFragment.end();
+ // Trailing whitespace fragment might actually have zero length.
+ ASSERT(needsReverting || !m_trailingWhitespaceWidth);
+ if (needsReverting) {
+ revertRuns(runs, m_lastNonWhitespaceFragment->end(), m_trailingWhitespaceWidth);
+ m_runsWidth -= m_trailingWhitespaceWidth;
+ }
+ m_trailingWhitespaceWidth = 0;
+ m_lastFragment = *m_lastNonWhitespaceFragment;
+ return;
+ }
+ // This line is all whitespace.
+ revertAllRunsOnCurrentLine(runs);
+ m_runsWidth = 0;
+ m_trailingWhitespaceWidth = 0;
+ // FIXME: Make m_lastFragment optional.
+ m_lastFragment = TextFragmentIterator::TextFragment();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -508,7 +529,7 @@
</span><span class="cx"> float m_runsWidth { 0 };
</span><span class="cx"> TextFragmentIterator::TextFragment m_overflowedFragment;
</span><span class="cx"> TextFragmentIterator::TextFragment m_lastFragment;
</span><del>- TextFragmentIterator::TextFragment m_lastNonWhitespaceFragment;
</del><ins>+ std::optional<TextFragmentIterator::TextFragment> m_lastNonWhitespaceFragment;
</ins><span class="cx"> TextFragmentIterator::TextFragment m_lastCompleteFragment;
</span><span class="cx"> float m_uncompletedWidth { 0 };
</span><span class="cx"> float m_trailingWhitespaceWidth { 0 }; // Use this to remove trailing whitespace without re-mesuring the text.
</span></span></pre>
</div>
</div>
</body>
</html>