<!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>[211353] trunk/Source/WebCore</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/211353">211353</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-01-29 12:21:08 -0800 (Sun, 29 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: PerformanceTests/Layout/simple-line-layout-innertext.html regressed at <a href="http://trac.webkit.org/projects/webkit/changeset/211108">r211108</a>
https://bugs.webkit.org/show_bug.cgi?id=167562
Reviewed by Antti Koivisto.
Apparently RunResolver::Run::constructStringForHyphenIfNeeded() is in a superhot codepath.
The Run should not have any additional members anyway, so let's construct the hyphenated
string on demand.
Progression on simple-line-layout-innertext.html is from ~34runs/sec back to ~50runs/sec.
Covered by existing text.
* rendering/RenderTreeAsText.cpp:
(WebCore::writeSimpleLine):
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::paintFlow):
* rendering/SimpleLineLayoutResolver.cpp:
(WebCore::SimpleLineLayout::RunResolver::Run::Run):
(WebCore::SimpleLineLayout::RunResolver::Run::textWithHyphen):
(WebCore::SimpleLineLayout::RunResolver::Run::text):
(WebCore::SimpleLineLayout::RunResolver::Run::constructStringForHyphenIfNeeded): Deleted.
* rendering/SimpleLineLayoutResolver.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/RenderTreeAsText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutResolvercpp">trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutResolverh">trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211352 => 211353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-29 15:13:44 UTC (rev 211352)
+++ trunk/Source/WebCore/ChangeLog 2017-01-29 20:21:08 UTC (rev 211353)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-01-29 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: PerformanceTests/Layout/simple-line-layout-innertext.html regressed at r211108
+ https://bugs.webkit.org/show_bug.cgi?id=167562
+
+ Reviewed by Antti Koivisto.
+
+ Apparently RunResolver::Run::constructStringForHyphenIfNeeded() is in a superhot codepath.
+ The Run should not have any additional members anyway, so let's construct the hyphenated
+ string on demand.
+ Progression on simple-line-layout-innertext.html is from ~34runs/sec back to ~50runs/sec.
+
+ Covered by existing text.
+
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::writeSimpleLine):
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::paintFlow):
+ * rendering/SimpleLineLayoutResolver.cpp:
+ (WebCore::SimpleLineLayout::RunResolver::Run::Run):
+ (WebCore::SimpleLineLayout::RunResolver::Run::textWithHyphen):
+ (WebCore::SimpleLineLayout::RunResolver::Run::text):
+ (WebCore::SimpleLineLayout::RunResolver::Run::constructStringForHyphenIfNeeded): Deleted.
+ * rendering/SimpleLineLayoutResolver.h:
+
</ins><span class="cx"> 2017-01-28 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't flash a tap highlight for the entirety of an editable WKWebView
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (211352 => 211353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2017-01-29 15:13:44 UTC (rev 211352)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2017-01-29 20:21:08 UTC (rev 211353)
</span><span class="lines">@@ -504,12 +504,9 @@
</span><span class="cx"> y -= floorToInt(downcast<RenderTableCell>(*renderText.containingBlock()).intrinsicPaddingBefore());
</span><span class="cx">
</span><span class="cx"> ts << "text run at (" << x << "," << y << ") width " << logicalWidth;
</span><del>- if (run.hasHyphen()) {
- ts << ": " << quoteAndEscapeNonPrintables(run.text().substring(0, run.text().length() - 1));
</del><ins>+ ts << ": " << quoteAndEscapeNonPrintables(run.text());
+ if (run.hasHyphen())
</ins><span class="cx"> ts << " + hyphen string " << quoteAndEscapeNonPrintables(renderText.style().hyphenString().string());
</span><del>- } else
- ts << ": " << quoteAndEscapeNonPrintables(run.text());
-
</del><span class="cx"> ts << "\n";
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (211352 => 211353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2017-01-29 15:13:44 UTC (rev 211352)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2017-01-29 20:21:08 UTC (rev 211353)
</span><span class="lines">@@ -118,8 +118,11 @@
</span><span class="cx"> if (paintRect.y() > visualOverflowRect.maxY() || paintRect.maxY() < visualOverflowRect.y())
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ String textWithHyphen;
+ if (run.hasHyphen())
+ textWithHyphen = run.textWithHyphen();
</ins><span class="cx"> // x position indicates the line offset from the rootbox. It's always 0 in case of simple line layout.
</span><del>- TextRun textRun(run.text(), 0, run.expansion(), run.expansionBehavior());
</del><ins>+ TextRun textRun(run.hasHyphen() ? textWithHyphen : run.text(), 0, run.expansion(), run.expansionBehavior());
</ins><span class="cx"> textRun.setTabSize(!style.collapseWhiteSpace(), style.tabSize());
</span><span class="cx"> FloatPoint textOrigin = FloatPoint(rect.x() + paintOffset.x(), roundToDevicePixel(run.baselinePosition() + paintOffset.y(), deviceScaleFactor));
</span><span class="cx"> textPainter.paintText(textRun, textRun.length(), rect, textOrigin);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp (211352 => 211353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2017-01-29 15:13:44 UTC (rev 211352)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2017-01-29 20:21:08 UTC (rev 211353)
</span><span class="lines">@@ -47,19 +47,17 @@
</span><span class="cx"> RunResolver::Run::Run(const Iterator& iterator)
</span><span class="cx"> : m_iterator(iterator)
</span><span class="cx"> {
</span><del>- constructStringForHyphenIfNeeded();
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void RunResolver::Run::constructStringForHyphenIfNeeded()
</del><ins>+String RunResolver::Run::textWithHyphen() const
</ins><span class="cx"> {
</span><span class="cx"> auto& run = m_iterator.simpleRun();
</span><del>- if (!run.hasHyphen)
- return;
</del><ins>+ ASSERT(run.hasHyphen);
</ins><span class="cx"> // Empty runs should not have hyphen.
</span><span class="cx"> ASSERT(run.start < run.end);
</span><span class="cx"> auto& segment = m_iterator.resolver().m_flowContents.segmentForRun(run.start, run.end);
</span><span class="cx"> auto text = StringView(segment.text).substring(segment.toSegmentPosition(run.start), run.end - run.start);
</span><del>- m_textWithHyphen = makeString(text, m_iterator.resolver().flow().style().hyphenString());
</del><ins>+ return makeString(text, m_iterator.resolver().flow().style().hyphenString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatRect RunResolver::Run::rect() const
</span><span class="lines">@@ -82,8 +80,6 @@
</span><span class="cx">
</span><span class="cx"> StringView RunResolver::Run::text() const
</span><span class="cx"> {
</span><del>- if (m_textWithHyphen)
- return StringView(*m_textWithHyphen);
</del><span class="cx"> auto& run = m_iterator.simpleRun();
</span><span class="cx"> ASSERT(run.start < run.end);
</span><span class="cx"> auto& segment = m_iterator.resolver().m_flowContents.segmentForRun(run.start, run.end);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h (211352 => 211353)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2017-01-29 15:13:44 UTC (rev 211352)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2017-01-29 20:21:08 UTC (rev 211353)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> ExpansionBehavior expansionBehavior() const;
</span><span class="cx"> int baselinePosition() const;
</span><span class="cx"> StringView text() const;
</span><ins>+ String textWithHyphen() const;
</ins><span class="cx"> bool isEndOfLine() const;
</span><span class="cx"> bool hasHyphen() const { return m_iterator.simpleRun().hasHyphen; }
</span><span class="cx">
</span><span class="lines">@@ -74,7 +75,6 @@
</span><span class="cx"> void constructStringForHyphenIfNeeded();
</span><span class="cx">
</span><span class="cx"> const Iterator& m_iterator;
</span><del>- std::optional<String> m_textWithHyphen;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class Iterator {
</span></span></pre>
</div>
</div>
</body>
</html>