<!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>[181325] 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/181325">181325</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-03-10 08:16:24 -0700 (Tue, 10 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Merge TextFragmentIterator::findNextBreakablePosition() and TextFragmentIterator::findNextNonWhitespacePosition().
https://bugs.webkit.org/show_bug.cgi?id=142344
Reviewed by Antti Koivisto.
This patch merges findNextBreakablePosition() and findNextNonWhitespacePosition() so that
the segment looping and position handling logic are no longer duplicated. It also unifies
the static next*() functions' signature.
No change in functionality.
* rendering/SimpleLineLayoutTextFragmentIterator.cpp:
(WebCore::SimpleLineLayout::TextFragmentIterator::nextTextFragment):
(WebCore::SimpleLineLayout::nextBreakablePosition):
(WebCore::SimpleLineLayout::nextNonWhitespacePosition):
(WebCore::SimpleLineLayout::TextFragmentIterator::skipToNextPosition):
(WebCore::SimpleLineLayout::TextFragmentIterator::findNextBreakablePosition): Deleted.
(WebCore::SimpleLineLayout::findNextNonWhitespace): Deleted.
(WebCore::SimpleLineLayout::TextFragmentIterator::findNextNonWhitespacePosition): Deleted.
* rendering/SimpleLineLayoutTextFragmentIterator.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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 (181324 => 181325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-10 13:38:31 UTC (rev 181324)
+++ trunk/Source/WebCore/ChangeLog 2015-03-10 15:16:24 UTC (rev 181325)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-03-10 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Merge TextFragmentIterator::findNextBreakablePosition() and TextFragmentIterator::findNextNonWhitespacePosition().
+ https://bugs.webkit.org/show_bug.cgi?id=142344
+
+ Reviewed by Antti Koivisto.
+
+ This patch merges findNextBreakablePosition() and findNextNonWhitespacePosition() so that
+ the segment looping and position handling logic are no longer duplicated. It also unifies
+ the static next*() functions' signature.
+
+ No change in functionality.
+
+ * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+ (WebCore::SimpleLineLayout::TextFragmentIterator::nextTextFragment):
+ (WebCore::SimpleLineLayout::nextBreakablePosition):
+ (WebCore::SimpleLineLayout::nextNonWhitespacePosition):
+ (WebCore::SimpleLineLayout::TextFragmentIterator::skipToNextPosition):
+ (WebCore::SimpleLineLayout::TextFragmentIterator::findNextBreakablePosition): Deleted.
+ (WebCore::SimpleLineLayout::findNextNonWhitespace): Deleted.
+ (WebCore::SimpleLineLayout::TextFragmentIterator::findNextNonWhitespacePosition): Deleted.
+ * rendering/SimpleLineLayoutTextFragmentIterator.h:
+
</ins><span class="cx"> 2015-03-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] GL_MAX_VARYING_FLOATS is not defined in OpenGL ES 2
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (181324 => 181325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2015-03-10 13:38:31 UTC (rev 181324)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2015-03-10 15:16:24 UTC (rev 181325)
</span><span class="lines">@@ -67,25 +67,18 @@
</span><span class="cx"> ++m_position;
</span><span class="cx"> return fragment;
</span><span class="cx"> }
</span><del>- unsigned spaceCount = 0;
</del><span class="cx"> unsigned startPosition = m_position;
</span><del>- unsigned endPosition = findNextNonWhitespacePosition(startPosition, spaceCount);
</del><ins>+ unsigned endPosition = skipToNextPosition(PositionType::NonWhitespace, startPosition);
</ins><span class="cx"> ASSERT(startPosition <= endPosition);
</span><span class="cx"> if (endPosition > startPosition) {
</span><span class="cx"> bool multipleWhitespace = startPosition + 1 < endPosition;
</span><span class="cx"> bool isCollapsed = multipleWhitespace && m_style.collapseWhitespace;
</span><span class="cx"> bool isBreakable = !isCollapsed && multipleWhitespace;
</span><del>- float width = 0;
- if (isCollapsed)
- width = m_style.spaceWidth;
- else {
- unsigned length = endPosition - startPosition;
- width = length == spaceCount ? length * m_style.spaceWidth : textWidth(startPosition, endPosition, xPosition);
- }
</del><ins>+ float width = isCollapsed ? m_style.spaceWidth : textWidth(startPosition, endPosition, xPosition);
</ins><span class="cx"> m_position = endPosition;
</span><span class="cx"> return TextFragment(startPosition, endPosition, width, TextFragment::Whitespace, isCollapsed, isBreakable);
</span><span class="cx"> }
</span><del>- endPosition = findNextBreakablePosition(startPosition + 1);
</del><ins>+ endPosition = skipToNextPosition(PositionType::Breakable, startPosition + 1);
</ins><span class="cx"> m_position = endPosition;
</span><span class="cx"> return TextFragment(startPosition, endPosition, textWidth(startPosition, endPosition, xPosition), TextFragment::NonWhitespace, false, m_style.breakWordOnOverflow);
</span><span class="cx"> }
</span><span class="lines">@@ -114,58 +107,56 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span><del>-static unsigned nextBreakablePosition(LazyLineBreakIterator& lineBreakIterator, const FlowContents::Segment& segment, unsigned position)
</del><ins>+static unsigned nextBreakablePosition(LazyLineBreakIterator& lineBreakIterator, const FlowContents::Segment& segment, unsigned startPosition)
</ins><span class="cx"> {
</span><del>- const auto* characters = segment.text.characters<CharacterType>();
- unsigned segmentLength = segment.end - segment.start;
- unsigned segmentPosition = position - segment.start;
- return nextBreakablePositionNonLoosely<CharacterType, NBSPBehavior::IgnoreNBSP>(lineBreakIterator, characters, segmentLength, segmentPosition);
</del><ins>+ return nextBreakablePositionNonLoosely<CharacterType, NBSPBehavior::IgnoreNBSP>(lineBreakIterator, segment.text.characters<CharacterType>(), segment.end - segment.start, startPosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned TextFragmentIterator::findNextBreakablePosition(unsigned position) const
-{
- while (!isEnd(position)) {
- auto& segment = m_flowContents.segmentForPosition(position);
- if (segment.text.impl() != m_lineBreakIterator.string().impl()) {
- UChar lastCharacter = segment.start > 0 ? characterAt(segment.start - 1) : 0;
- UChar secondToLastCharacter = segment.start > 1 ? characterAt(segment.start - 2) : 0;
- m_lineBreakIterator.setPriorContext(lastCharacter, secondToLastCharacter);
- m_lineBreakIterator.resetStringAndReleaseIterator(segment.text, m_style.locale, LineBreakIteratorModeUAX14);
- }
-
- unsigned breakable = segment.text.is8Bit() ? nextBreakablePosition<LChar>(m_lineBreakIterator, segment, position) : nextBreakablePosition<UChar>(m_lineBreakIterator, segment, position);
- position = segment.start + breakable;
- if (position < segment.end)
- break;
- }
- return position;
-}
-
</del><span class="cx"> template <typename CharacterType>
</span><del>-static bool findNextNonWhitespace(const FlowContents::Segment& segment, const TextFragmentIterator::Style& style, unsigned& position, unsigned& spaceCount)
</del><ins>+static unsigned nextNonWhitespacePosition(const FlowContents::Segment& segment, unsigned startPosition, const TextFragmentIterator::Style& style)
</ins><span class="cx"> {
</span><span class="cx"> const auto* text = segment.text.characters<CharacterType>();
</span><del>- for (; position < segment.end; ++position) {
- auto character = text[position - segment.start];
- bool isSpace = character == ' ';
- bool isWhitespace = isSpace || character == '\t' || (!style.preserveNewline && character == '\n');
</del><ins>+ unsigned position = startPosition;
+ unsigned length = segment.end - segment.start;
+ for (; position < length; ++position) {
+ auto character = text[position];
+ bool isWhitespace = character == ' ' || character == '\t' || (!style.preserveNewline && character == '\n');
</ins><span class="cx"> if (!isWhitespace)
</span><del>- return true;
- if (isSpace)
- ++spaceCount;
</del><ins>+ return position;
</ins><span class="cx"> }
</span><del>- return false;
</del><ins>+ return position;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-unsigned TextFragmentIterator::findNextNonWhitespacePosition(unsigned position, unsigned& spaceCount) const
</del><ins>+unsigned TextFragmentIterator::skipToNextPosition(PositionType positionType, unsigned startPosition) const
</ins><span class="cx"> {
</span><del>- FlowContents::Iterator it(m_flowContents, m_flowContents.segmentIndexForPosition(position));
</del><ins>+ if (isEnd(startPosition))
+ return startPosition;
+
+ unsigned currentPosition = startPosition;
+ FlowContents::Iterator it(m_flowContents, m_flowContents.segmentIndexForPosition(currentPosition));
</ins><span class="cx"> for (auto end = m_flowContents.end(); it != end; ++it) {
</span><del>- bool foundNonWhitespace = (*it).text.is8Bit() ? findNextNonWhitespace<LChar>(*it, m_style, position, spaceCount) : findNextNonWhitespace<UChar>(*it, m_style, position, spaceCount);
- if (foundNonWhitespace)
</del><ins>+ auto& segment = *it;
+ unsigned currentPositonRelativeToSegment = currentPosition - segment.start;
+ unsigned nextPositionRelativeToSegment = 0;
+ if (positionType == NonWhitespace) {
+ nextPositionRelativeToSegment = segment.text.is8Bit() ? nextNonWhitespacePosition<LChar>(segment, currentPositonRelativeToSegment, m_style) :
+ nextNonWhitespacePosition<UChar>(segment, currentPositonRelativeToSegment, m_style);
+ } else if (positionType == Breakable) {
+ if (segment.text.impl() != m_lineBreakIterator.string().impl()) {
+ UChar lastCharacter = segment.start > 0 ? characterAt(segment.start - 1) : 0;
+ UChar secondToLastCharacter = segment.start > 1 ? characterAt(segment.start - 2) : 0;
+ m_lineBreakIterator.setPriorContext(lastCharacter, secondToLastCharacter);
+ m_lineBreakIterator.resetStringAndReleaseIterator(segment.text, m_style.locale, LineBreakIteratorModeUAX14);
+ }
+ nextPositionRelativeToSegment = segment.text.is8Bit() ? nextBreakablePosition<LChar>(m_lineBreakIterator, segment, currentPositonRelativeToSegment) :
+ nextBreakablePosition<UChar>(m_lineBreakIterator, segment, currentPositonRelativeToSegment);
+ } else
+ ASSERT_NOT_REACHED();
+ currentPosition = segment.start + nextPositionRelativeToSegment;
+ if (currentPosition < segment.end)
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><del>- return position;
</del><ins>+ return currentPosition;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharacterType>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h (181324 => 181325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h 2015-03-10 13:38:31 UTC (rev 181324)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.h 2015-03-10 15:16:24 UTC (rev 181325)
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx"> const FlowContents::Segment& segmentForPosition(unsigned position) const { return m_flowContents.segmentForPosition(position); };
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- unsigned findNextNonWhitespacePosition(unsigned position, unsigned& spaceCount) const;
- unsigned findNextBreakablePosition(unsigned position) const;
</del><ins>+ enum PositionType { Breakable, NonWhitespace };
+ unsigned skipToNextPosition(PositionType, unsigned startPosition) const;
</ins><span class="cx"> UChar characterAt(unsigned position) const;
</span><span class="cx"> bool isLineBreak(unsigned position) const;
</span><span class="cx"> bool isEnd(unsigned position) const;
</span></span></pre>
</div>
</div>
</body>
</html>