<!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>[211531] 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/211531">211531</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2017-02-01 14:25:58 -0800 (Wed, 01 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Move TextFragmentIterator::runWidth to ::textWidth.
https://bugs.webkit.org/show_bug.cgi?id=167705
<rdar://problem/30314393>
Reviewed by Antti Koivisto.
We also don't need to compute logicalHeight for logicalLeft/right since the
cases where it matters (floating boxes) are not supported by simple line layout.
Covered by existing test.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::updateLineConstrains):
* rendering/SimpleLineLayoutTextFragmentIterator.cpp:
(WebCore::SimpleLineLayout::nextBreakablePositionInSegment):
(WebCore::SimpleLineLayout::TextFragmentIterator::textWidth):
(WebCore::SimpleLineLayout::TextFragmentIterator::runWidth): Deleted.
* rendering/SimpleLineLayoutTextFragmentIterator.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp">trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorh">trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211530 => 211531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-02-01 22:15:07 UTC (rev 211530)
+++ trunk/Source/WebCore/ChangeLog        2017-02-01 22:25:58 UTC (rev 211531)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-02-01 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Move TextFragmentIterator::runWidth to ::textWidth.
+ https://bugs.webkit.org/show_bug.cgi?id=167705
+ <rdar://problem/30314393>
+
+ Reviewed by Antti Koivisto.
+
+ We also don't need to compute logicalHeight for logicalLeft/right since the
+ cases where it matters (floating boxes) are not supported by simple line layout.
+
+ Covered by existing test.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::updateLineConstrains):
+ * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+ (WebCore::SimpleLineLayout::nextBreakablePositionInSegment):
+ (WebCore::SimpleLineLayout::TextFragmentIterator::textWidth):
+ (WebCore::SimpleLineLayout::TextFragmentIterator::runWidth): Deleted.
+ * rendering/SimpleLineLayoutTextFragmentIterator.h:
+
</ins><span class="cx"> 2017-02-01 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix compilation error under recent clang update
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (211530 => 211531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp        2017-02-01 22:15:07 UTC (rev 211530)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp        2017-02-01 22:25:58 UTC (rev 211531)
</span><span class="lines">@@ -604,10 +604,8 @@
</span><span class="cx"> {
</span><span class="cx"> bool shouldApplyTextIndent = !flow.isAnonymous() || flow.parent()->firstChild() == &flow;
</span><span class="cx"> LayoutUnit height = flow.logicalHeight();
</span><del>- LayoutUnit logicalHeight = flow.minLineHeightForReplacedRenderer(false, 0);
- float logicalRightOffset = flow.logicalRightOffsetForLine(height, DoNotIndentText, logicalHeight);
- line.setLogicalLeftOffset(flow.logicalLeftOffsetForLine(height, DoNotIndentText, logicalHeight) +
- (shouldApplyTextIndent && isFirstLine ? flow.textIndentOffset() : LayoutUnit(0)));
</del><ins>+ line.setLogicalLeftOffset(flow.logicalLeftOffsetForLine(height, DoNotIndentText) + (shouldApplyTextIndent && isFirstLine ? flow.textIndentOffset() : LayoutUnit(0)));
+ float logicalRightOffset = flow.logicalRightOffsetForLine(height, DoNotIndentText);
</ins><span class="cx"> line.setAvailableWidth(std::max<float>(0, logicalRightOffset - line.logicalLeftOffset()));
</span><span class="cx"> if (style.textAlign == JUSTIFY)
</span><span class="cx"> line.setNeedsAllFragments();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (211530 => 211531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp        2017-02-01 22:15:07 UTC (rev 211530)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp        2017-02-01 22:25:58 UTC (rev 211531)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> m_atEndOfSegment = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static unsigned nextBreakablePositionInSegment(LazyLineBreakIterator& lineBreakIterator, unsigned startPosition, bool breakNBSP, bool keepAllWordsForCJK)
</del><ins>+static inline unsigned nextBreakablePositionInSegment(LazyLineBreakIterator& lineBreakIterator, unsigned startPosition, bool breakNBSP, bool keepAllWordsForCJK)
</ins><span class="cx"> {
</span><span class="cx"> if (keepAllWordsForCJK) {
</span><span class="cx"> if (breakNBSP)
</span><span class="lines">@@ -166,18 +166,6 @@
</span><span class="cx"> return position;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float TextFragmentIterator::textWidth(unsigned from, unsigned to, float xPosition) const
-{
- auto& segment = *m_currentSegment;
- ASSERT(segment.start <= from && from <= segment.end && segment.start <= to && to <= segment.end);
- ASSERT(is<RenderText>(segment.renderer));
- if (!m_style.font.size())
- return 0;
- if (m_style.font.isFixedPitch() || (from == segment.start && to == segment.end))
- return downcast<RenderText>(segment.renderer).width(segment.toSegmentPosition(from), to - from, m_style.font, xPosition, nullptr, nullptr);
- return runWidth(segment, from, to, xPosition);
-}
-
</del><span class="cx"> std::optional<unsigned> TextFragmentIterator::lastHyphenPosition(const TextFragmentIterator::TextFragment& run, unsigned before) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(run.start() < before);
</span><span class="lines">@@ -243,20 +231,25 @@
</span><span class="cx"> return nextPosition;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float TextFragmentIterator::runWidth(const FlowContents::Segment& segment, unsigned startPosition, unsigned endPosition, float xPosition) const
</del><ins>+float TextFragmentIterator::textWidth(unsigned from, unsigned to, float xPosition) const
</ins><span class="cx"> {
</span><del>- ASSERT(m_style.font.size());
- ASSERT(startPosition <= endPosition);
- if (startPosition == endPosition)
</del><ins>+ auto& segment = *m_currentSegment;
+ ASSERT(segment.start <= from && from <= segment.end && segment.start <= to && to <= segment.end);
+ ASSERT(is<RenderText>(segment.renderer));
+ if (!m_style.font.size() || from == to)
</ins><span class="cx"> return 0;
</span><del>- unsigned segmentFrom = segment.toSegmentPosition(startPosition);
- unsigned segmentTo = segment.toSegmentPosition(endPosition);
</del><ins>+
+ unsigned segmentFrom = segment.toSegmentPosition(from);
+ unsigned segmentTo = segment.toSegmentPosition(to);
+ if (m_style.font.isFixedPitch())
+ return downcast<RenderText>(segment.renderer).width(segmentFrom, segmentTo - segmentFrom, m_style.font, xPosition, nullptr, nullptr);
+
</ins><span class="cx"> bool measureWithEndSpace = m_style.collapseWhitespace && segmentTo < segment.text.length() && segment.text[segmentTo] == ' ';
</span><span class="cx"> if (measureWithEndSpace)
</span><span class="cx"> ++segmentTo;
</span><del>- TextRun run(StringView(segment.text).substring(segmentFrom, segmentTo - segmentFrom));
- run.setXPos(xPosition);
- run.setTabSize(!!m_style.tabWidth, m_style.tabWidth);
</del><ins>+ TextRun run(StringView(segment.text).substring(segmentFrom, segmentTo - segmentFrom), xPosition);
+ if (m_style.tabWidth)
+ run.setTabSize(true, m_style.tabWidth);
</ins><span class="cx"> float width = m_style.font.width(run);
</span><span class="cx"> if (measureWithEndSpace)
</span><span class="cx"> width -= (m_style.spaceWidth + m_style.wordSpacing);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h (211530 => 211531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h        2017-02-01 22:15:07 UTC (rev 211530)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h        2017-02-01 22:25:58 UTC (rev 211531)
</span><span class="lines">@@ -136,7 +136,6 @@
</span><span class="cx"> bool isHardLineBreak(const FlowContents::Iterator& segment) const;
</span><span class="cx"> unsigned nextBreakablePosition(const FlowContents::Segment&, unsigned startPosition);
</span><span class="cx"> unsigned nextNonWhitespacePosition(const FlowContents::Segment&, unsigned startPosition);
</span><del>- float runWidth(const FlowContents::Segment&, unsigned startPosition, unsigned endPosition, float xPosition) const;
</del><span class="cx">
</span><span class="cx"> FlowContents m_flowContents;
</span><span class="cx"> FlowContents::Iterator m_currentSegment;
</span></span></pre>
</div>
</div>
</body>
</html>