<!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>[179510] 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/179510">179510</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-02-02 15:53:26 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: use std::upper_bound in splitFragmentToFitLine()
https://bugs.webkit.org/show_bug.cgi?id=141146
Reviewed by Antti Koivisto.
Replace the custom binary search implementation with std::upper_bound and
move splitting functionality to TextFragment.
No change in functionality.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::FragmentForwardIterator::FragmentForwardIterator):
(WebCore::SimpleLineLayout::FragmentForwardIterator::operator++):
(WebCore::SimpleLineLayout::FragmentForwardIterator::operator!=):
(WebCore::SimpleLineLayout::FragmentForwardIterator::operator*):
(WebCore::SimpleLineLayout::begin):
(WebCore::SimpleLineLayout::end):
(WebCore::SimpleLineLayout::splitFragmentToFitLine):
* rendering/SimpleLineLayoutFlowContentsIterator.cpp:
(WebCore::SimpleLineLayout::FlowContentsIterator::runWidth):
* rendering/SimpleLineLayoutFlowContentsIterator.h:
(WebCore::SimpleLineLayout::FlowContentsIterator::TextFragment::split):</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="#trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsIteratorcpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContentsIterator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsIteratorh">trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContentsIterator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179509 => 179510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-02 23:42:13 UTC (rev 179509)
+++ trunk/Source/WebCore/ChangeLog 2015-02-02 23:53:26 UTC (rev 179510)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-02-02 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: use std::upper_bound in splitFragmentToFitLine()
+ https://bugs.webkit.org/show_bug.cgi?id=141146
+
+ Reviewed by Antti Koivisto.
+
+ Replace the custom binary search implementation with std::upper_bound and
+ move splitting functionality to TextFragment.
+
+ No change in functionality.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::FragmentForwardIterator::FragmentForwardIterator):
+ (WebCore::SimpleLineLayout::FragmentForwardIterator::operator++):
+ (WebCore::SimpleLineLayout::FragmentForwardIterator::operator!=):
+ (WebCore::SimpleLineLayout::FragmentForwardIterator::operator*):
+ (WebCore::SimpleLineLayout::begin):
+ (WebCore::SimpleLineLayout::end):
+ (WebCore::SimpleLineLayout::splitFragmentToFitLine):
+ * rendering/SimpleLineLayoutFlowContentsIterator.cpp:
+ (WebCore::SimpleLineLayout::FlowContentsIterator::runWidth):
+ * rendering/SimpleLineLayoutFlowContentsIterator.h:
+ (WebCore::SimpleLineLayout::FlowContentsIterator::TextFragment::split):
+
</ins><span class="cx"> 2015-02-02 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Use FastMalloc (bmalloc) instead of BlockAllocator for GC pages
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (179509 => 179510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-02-02 23:42:13 UTC (rev 179509)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-02-02 23:53:26 UTC (rev 179510)
</span><span class="lines">@@ -297,6 +297,29 @@
</span><span class="cx"> bool m_firstCharacterFits { false };
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class FragmentForwardIterator : public std::iterator<std::forward_iterator_tag, unsigned> {
+public:
+ FragmentForwardIterator(unsigned fragmentIndex)
+ : m_fragmentIndex(fragmentIndex)
+ {
+ }
+
+ FragmentForwardIterator& operator++()
+ {
+ ++m_fragmentIndex;
+ return *this;
+ }
+
+ bool operator!=(const FragmentForwardIterator& other) const { return m_fragmentIndex != other.m_fragmentIndex; }
+ unsigned operator*() const { return m_fragmentIndex; }
+
+private:
+ unsigned m_fragmentIndex { 0 };
+};
+
+static FragmentForwardIterator begin(const FlowContentsIterator::TextFragment& fragment) { return FragmentForwardIterator(fragment.start()); }
+static FragmentForwardIterator end(const FlowContentsIterator::TextFragment& fragment) { return FragmentForwardIterator(fragment.end()); }
+
</ins><span class="cx"> static bool preWrap(const FlowContentsIterator::Style& style)
</span><span class="cx"> {
</span><span class="cx"> return style.wrapLines && !style.collapseWhitespace;
</span><span class="lines">@@ -330,48 +353,16 @@
</span><span class="cx">
</span><span class="cx"> static FlowContentsIterator::TextFragment splitFragmentToFitLine(FlowContentsIterator::TextFragment& fragmentToSplit, float availableWidth, bool keepAtLeastOneCharacter, const FlowContentsIterator& flowContentsIterator)
</span><span class="cx"> {
</span><del>- // Fast path for single char fragments.
- if (fragmentToSplit.start() + 1 == fragmentToSplit.end()) {
- if (keepAtLeastOneCharacter)
- return FlowContentsIterator::TextFragment();
-
- FlowContentsIterator::TextFragment fragmentForNextLine(fragmentToSplit);
- // Make it empty fragment.
- fragmentToSplit = FlowContentsIterator::TextFragment(fragmentToSplit.start(), fragmentToSplit.start(), 0, fragmentToSplit.type());
- return fragmentForNextLine;
- }
- // Simple binary search to find out what fits the current line.
</del><span class="cx"> // FIXME: add surrogate pair support.
</span><del>- unsigned left = fragmentToSplit.start();
- unsigned right = fragmentToSplit.end() - 1; // We can ignore the last character. It surely does not fit.
- float width = 0;
- while (left < right) {
- unsigned middle = (left + right) / 2;
- width = flowContentsIterator.textWidth(fragmentToSplit.start(), middle + 1, 0);
- if (availableWidth > width)
- left = middle + 1;
- else if (availableWidth < width)
- right = middle;
- else {
- right = middle + 1;
- break;
- }
- }
-
- if (keepAtLeastOneCharacter && right == fragmentToSplit.start())
- ++right;
-
- // Fragment for next line.
- unsigned nextLineStart = right;
- unsigned nextLineEnd = fragmentToSplit.end();
- float nextLineWidth = flowContentsIterator.textWidth(nextLineStart, nextLineEnd, 0);
-
- unsigned thisLineStart = fragmentToSplit.start();
- unsigned thisLineEnd = right;
- ASSERT(thisLineStart <= thisLineEnd);
- float thisLineWidth = thisLineStart < thisLineEnd ? flowContentsIterator.textWidth(thisLineStart, thisLineEnd, 0) : 0;
- fragmentToSplit = FlowContentsIterator::TextFragment(thisLineStart, thisLineEnd, thisLineWidth, fragmentToSplit.type(), fragmentToSplit.isCollapsed(), fragmentToSplit.isBreakable());
- return FlowContentsIterator::TextFragment(nextLineStart, nextLineEnd, nextLineWidth, fragmentToSplit.type(), fragmentToSplit.isCollapsed(), fragmentToSplit.isBreakable());
</del><ins>+ unsigned start = fragmentToSplit.start();
+ auto it = std::upper_bound(begin(fragmentToSplit), end(fragmentToSplit), availableWidth, [&flowContentsIterator, start](float availableWidth, unsigned index) {
+ // FIXME: use the actual left position of the line (instead of 0) to calculated width. It might give false width for tab characters.
+ return availableWidth < flowContentsIterator.textWidth(start, index + 1, 0);
+ });
+ unsigned splitPosition = (*it);
+ if (keepAtLeastOneCharacter && splitPosition == fragmentToSplit.start())
+ ++splitPosition;
+ return fragmentToSplit.split(splitPosition, flowContentsIterator);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static FlowContentsIterator::TextFragment firstFragment(FlowContentsIterator& flowContentsIterator, const LineState& previousLine)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContentsIterator.cpp (179509 => 179510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContentsIterator.cpp 2015-02-02 23:42:13 UTC (rev 179509)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContentsIterator.cpp 2015-02-02 23:53:26 UTC (rev 179510)
</span><span class="lines">@@ -171,7 +171,9 @@
</span><span class="cx"> template <typename CharacterType>
</span><span class="cx"> float FlowContentsIterator::runWidth(const String& text, unsigned from, unsigned to, float xPosition) const
</span><span class="cx"> {
</span><del>- ASSERT(from < to);
</del><ins>+ ASSERT(from <= to);
+ if (from == to)
+ return 0;
</ins><span class="cx"> bool measureWithEndSpace = m_style.collapseWhitespace && to < text.length() && text[to] == ' ';
</span><span class="cx"> if (measureWithEndSpace)
</span><span class="cx"> ++to;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContentsIterator.h (179509 => 179510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContentsIterator.h 2015-02-02 23:42:13 UTC (rev 179509)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContentsIterator.h 2015-02-02 23:53:26 UTC (rev 179510)
</span><span class="lines">@@ -59,7 +59,9 @@
</span><span class="cx"> Type type() const { return m_type; }
</span><span class="cx"> bool isCollapsed() const { return m_isCollapsed; }
</span><span class="cx"> bool isBreakable() const { return m_isBreakable; }
</span><ins>+
</ins><span class="cx"> bool isEmpty() const { return start() == end(); }
</span><ins>+ TextFragment split(unsigned splitPosition, const FlowContentsIterator&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> unsigned m_start { 0 };
</span><span class="lines">@@ -103,6 +105,28 @@
</span><span class="cx"> unsigned m_position { 0 };
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline FlowContentsIterator::TextFragment FlowContentsIterator::TextFragment::split(unsigned splitPosition, const FlowContentsIterator& flowContentsIterator)
+{
+ auto updateFragmentProperties = [&flowContentsIterator] (TextFragment& fragment)
+ {
+ fragment.m_width = 0;
+ if (fragment.start() != fragment.end())
+ fragment.m_width = flowContentsIterator.textWidth(fragment.start(), fragment.end(), 0);
+ if (fragment.start() + 1 > fragment.end())
+ return;
+ fragment.m_isCollapsed = false;
+ fragment.m_isBreakable = false;
+ };
+
+ TextFragment newFragment(*this);
+ m_end = splitPosition;
+ updateFragmentProperties(*this);
+
+ newFragment.m_start = splitPosition;
+ updateFragmentProperties(newFragment);
+ return newFragment;
+}
+
</ins><span class="cx"> inline UChar FlowContentsIterator::characterAt(unsigned position) const
</span><span class="cx"> {
</span><span class="cx"> auto& segment = m_flowContents.segmentForPosition(position);
</span></span></pre>
</div>
</div>
</body>
</html>