<!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>[181698] 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/181698">181698</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-03-18 09:51:37 -0700 (Wed, 18 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Use Vector<>::const_iterator instead of custom FlowContents::Iterator.
https://bugs.webkit.org/show_bug.cgi?id=142809
Reviewed by Antti Koivisto.
FlowContents::Iterator simply iterates on a vector<>. No need to custom implement it.
No change in functionality.
* rendering/SimpleLineLayoutFlowContents.h:
(WebCore::SimpleLineLayout::FlowContents::begin):
(WebCore::SimpleLineLayout::FlowContents::end):
(WebCore::SimpleLineLayout::FlowContents::Iterator::Iterator): Deleted.
(WebCore::SimpleLineLayout::FlowContents::Iterator::operator++): Deleted.
(WebCore::SimpleLineLayout::FlowContents::Iterator::operator--): Deleted.
(WebCore::SimpleLineLayout::FlowContents::Iterator::operator==): Deleted.
(WebCore::SimpleLineLayout::FlowContents::Iterator::operator!=): Deleted.
(WebCore::SimpleLineLayout::FlowContents::Iterator::operator*): Deleted.
(WebCore::SimpleLineLayout::FlowContents::Iterator::operator->): Deleted.
* rendering/SimpleLineLayoutTextFragmentIterator.cpp:
(WebCore::SimpleLineLayout::TextFragmentIterator::skipToNextPosition):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsh">trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp">trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181697 => 181698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-18 16:47:47 UTC (rev 181697)
+++ trunk/Source/WebCore/ChangeLog 2015-03-18 16:51:37 UTC (rev 181698)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-03-18 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Simple line layout: Use Vector<>::const_iterator instead of custom FlowContents::Iterator.
+ https://bugs.webkit.org/show_bug.cgi?id=142809
+
+ Reviewed by Antti Koivisto.
+
+ FlowContents::Iterator simply iterates on a vector<>. No need to custom implement it.
+
+ No change in functionality.
+
+ * rendering/SimpleLineLayoutFlowContents.h:
+ (WebCore::SimpleLineLayout::FlowContents::begin):
+ (WebCore::SimpleLineLayout::FlowContents::end):
+ (WebCore::SimpleLineLayout::FlowContents::Iterator::Iterator): Deleted.
+ (WebCore::SimpleLineLayout::FlowContents::Iterator::operator++): Deleted.
+ (WebCore::SimpleLineLayout::FlowContents::Iterator::operator--): Deleted.
+ (WebCore::SimpleLineLayout::FlowContents::Iterator::operator==): Deleted.
+ (WebCore::SimpleLineLayout::FlowContents::Iterator::operator!=): Deleted.
+ (WebCore::SimpleLineLayout::FlowContents::Iterator::operator*): Deleted.
+ (WebCore::SimpleLineLayout::FlowContents::Iterator::operator->): Deleted.
+ * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+ (WebCore::SimpleLineLayout::TextFragmentIterator::skipToNextPosition):
+
+2015-03-18 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Simple line layout: Change FlowContents::segmentForPosition() to segmentForRun().
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=142785
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h (181697 => 181698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2015-03-18 16:47:47 UTC (rev 181697)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2015-03-18 16:51:37 UTC (rev 181698)
</span><span class="lines">@@ -46,69 +46,16 @@
</span><span class="cx"> const Segment& segmentForRun(unsigned start, unsigned end) const;
</span><span class="cx"> const Segment& segmentForRenderer(const RenderObject&) const;
</span><span class="cx">
</span><del>- class Iterator {
- public:
- Iterator(const FlowContents& flowContents, unsigned segmentIndex)
- : m_flowContents(flowContents)
- , m_segmentIndex(segmentIndex)
- {
- }
</del><ins>+ typedef Vector<Segment, 8>::const_iterator Iterator;
+ Iterator begin() const { return m_segments.begin(); }
+ Iterator end() const { return m_segments.end(); }
</ins><span class="cx">
</span><del>- Iterator& operator++();
- Iterator& operator--();
- bool operator==(const Iterator& other) const;
- bool operator!=(const Iterator& other) const;
- const Segment& operator*() const;
- const Segment* operator->() const;
-
- private:
- const FlowContents& m_flowContents;
- unsigned m_segmentIndex;
- };
-
- Iterator begin() const { return Iterator(*this, 0); }
- Iterator end() const { return Iterator(*this, m_segments.size()); }
-
</del><span class="cx"> private:
</span><span class="cx"> unsigned segmentIndexForRunSlow(unsigned start, unsigned end) const;
</span><span class="cx"> const Vector<Segment, 8> m_segments;
</span><span class="cx"> mutable unsigned m_lastSegmentIndex;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline FlowContents::Iterator& FlowContents::Iterator::operator++()
-{
- ++m_segmentIndex;
- return *this;
-}
-
-inline FlowContents::Iterator& FlowContents::Iterator::operator--()
-{
- --m_segmentIndex;
- return *this;
-}
-
-inline bool FlowContents::Iterator::operator==(const FlowContents::Iterator& other) const
-{
- return m_segmentIndex == other.m_segmentIndex;
-}
-
-inline bool FlowContents::Iterator::operator!=(const FlowContents::Iterator& other) const
-{
- return !(*this == other);
-}
-
-inline const FlowContents::Segment& FlowContents::Iterator::operator*() const
-{
- ASSERT(m_segmentIndex < m_flowContents.m_segments.size());
- return m_flowContents.m_segments[m_segmentIndex];
-}
-
-inline const FlowContents::Segment* FlowContents::Iterator::operator->() const
-{
- ASSERT(m_segmentIndex < m_flowContents.m_segments.size());
- return &(m_flowContents.m_segments[m_segmentIndex]);
-}
-
</del><span class="cx"> inline const FlowContents::Segment& FlowContents::segmentForRun(unsigned start, unsigned end) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(start < end);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (181697 => 181698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2015-03-18 16:47:47 UTC (rev 181697)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2015-03-18 16:51:37 UTC (rev 181698)
</span><span class="lines">@@ -157,8 +157,7 @@
</span><span class="cx"> nextPosition = m_currentSegment->text.is8Bit() ? nextBreakablePosition<LChar>(*m_currentSegment, currentPosition) : nextBreakablePosition<UChar>(*m_currentSegment, currentPosition);
</span><span class="cx"> // We need to know whether the word actually finishes at the end of this renderer or not.
</span><span class="cx"> if (nextPosition == m_currentSegment->end) {
</span><del>- auto nextSegment = m_currentSegment;
- ++nextSegment;
</del><ins>+ const auto nextSegment = m_currentSegment + 1;
</ins><span class="cx"> if (nextSegment != m_flowContents.end())
</span><span class="cx"> overlappingFragment = nextPosition < (nextSegment->text.is8Bit() ? nextBreakablePosition<LChar>(*nextSegment, nextPosition) : nextBreakablePosition<UChar>(*nextSegment, nextPosition));
</span><span class="cx"> } else if (nextPosition == currentPosition) {
</span></span></pre>
</div>
</div>
</body>
</html>