<!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>[212860] 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/212860">212860</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2017-02-22 15:55:34 -0800 (Wed, 22 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace SimpleLineLayout::Range by WTF::IteratorRange
https://bugs.webkit.org/show_bug.cgi?id=168742
Reviewed by Zalan Bujtas.
Kill a redundant custom type.
* rendering/SimpleLineLayoutResolver.cpp:
(WebCore::SimpleLineLayout::RunResolver::rangeForRect):
(WebCore::SimpleLineLayout::RunResolver::rangeForRenderer):
(WebCore::SimpleLineLayout::RunResolver::rangeForRendererWithOffsets):
* rendering/SimpleLineLayoutResolver.h:
(WebCore::SimpleLineLayout::LineResolver::rangeForRect):
(WebCore::SimpleLineLayout::Range::Range): Deleted.
(WebCore::SimpleLineLayout::Range::begin): Deleted.
(WebCore::SimpleLineLayout::Range::end): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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 (212859 => 212860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-22 23:44:53 UTC (rev 212859)
+++ trunk/Source/WebCore/ChangeLog 2017-02-22 23:55:34 UTC (rev 212860)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-02-22 Antti Koivisto <antti@apple.com>
+
+ Replace SimpleLineLayout::Range by WTF::IteratorRange
+ https://bugs.webkit.org/show_bug.cgi?id=168742
+
+ Reviewed by Zalan Bujtas.
+
+ Kill a redundant custom type.
+
+ * rendering/SimpleLineLayoutResolver.cpp:
+ (WebCore::SimpleLineLayout::RunResolver::rangeForRect):
+ (WebCore::SimpleLineLayout::RunResolver::rangeForRenderer):
+ (WebCore::SimpleLineLayout::RunResolver::rangeForRendererWithOffsets):
+ * rendering/SimpleLineLayoutResolver.h:
+ (WebCore::SimpleLineLayout::LineResolver::rangeForRect):
+ (WebCore::SimpleLineLayout::Range::Range): Deleted.
+ (WebCore::SimpleLineLayout::Range::begin): Deleted.
+ (WebCore::SimpleLineLayout::Range::end): Deleted.
+
</ins><span class="cx"> 2017-02-22 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the Web Authentication API as "Under Consideration".
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp (212859 => 212860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2017-02-22 23:44:53 UTC (rev 212859)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2017-02-22 23:55:34 UTC (rev 212860)
</span><span class="lines">@@ -145,10 +145,10 @@
</span><span class="cx"> return std::min<unsigned>(y / m_lineHeight, m_layout.lineCount() - 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Range<RunResolver::Iterator> RunResolver::rangeForRect(const LayoutRect& rect) const
</del><ins>+WTF::IteratorRange<RunResolver::Iterator> RunResolver::rangeForRect(const LayoutRect& rect) const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_lineHeight)
</span><del>- return Range<Iterator>(begin(), end());
</del><ins>+ return { begin(), end() };
</ins><span class="cx">
</span><span class="cx"> unsigned firstLine = lineIndexForHeight(rect.y(), IndexType::First);
</span><span class="cx"> unsigned lastLine = std::max(firstLine, lineIndexForHeight(rect.maxY(), IndexType::Last));
</span><span class="lines">@@ -155,17 +155,17 @@
</span><span class="cx">
</span><span class="cx"> auto rangeBegin = begin().advanceLines(firstLine);
</span><span class="cx"> if (rangeBegin == end())
</span><del>- return Range<Iterator>(end(), end());
</del><ins>+ return { end(), end() };
</ins><span class="cx"> auto rangeEnd = rangeBegin;
</span><span class="cx"> ASSERT(lastLine >= firstLine);
</span><span class="cx"> rangeEnd.advanceLines(lastLine - firstLine + 1);
</span><del>- return Range<Iterator>(rangeBegin, rangeEnd);
</del><ins>+ return { rangeBegin, rangeEnd };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Range<RunResolver::Iterator> RunResolver::rangeForRenderer(const RenderObject& renderer) const
</del><ins>+WTF::IteratorRange<RunResolver::Iterator> RunResolver::rangeForRenderer(const RenderObject& renderer) const
</ins><span class="cx"> {
</span><span class="cx"> if (begin() == end())
</span><del>- return Range<Iterator>(end(), end());
</del><ins>+ return { end(), end() };
</ins><span class="cx"> FlowContents::Iterator segment = m_flowContents.begin();
</span><span class="cx"> auto run = begin();
</span><span class="cx"> ASSERT(segment->start <= (*run).start());
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> // Do we actually have a run for this renderer?
</span><span class="cx"> // Collapsed whitespace with dedicated renderer could end up with no run at all.
</span><span class="cx"> if (run == end() || (segment->start != segment->end && segment->end <= (*run).start()))
</span><del>- return Range<Iterator>(end(), end());
</del><ins>+ return { end(), end() };
</ins><span class="cx">
</span><span class="cx"> auto rangeBegin = run;
</span><span class="cx"> // Move beyond the end of the segment.
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> // Special case when segment == run.
</span><span class="cx"> if (run == rangeBegin)
</span><span class="cx"> ++run;
</span><del>- return Range<Iterator>(rangeBegin, run);
</del><ins>+ return { rangeBegin, run };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RunResolver::Iterator RunResolver::runForPoint(const LayoutPoint& point) const
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> return --it;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Range<RunResolver::Iterator> RunResolver::rangeForRendererWithOffsets(const RenderObject& renderer, unsigned startOffset, unsigned endOffset) const
</del><ins>+WTF::IteratorRange<RunResolver::Iterator> RunResolver::rangeForRendererWithOffsets(const RenderObject& renderer, unsigned startOffset, unsigned endOffset) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(startOffset <= endOffset);
</span><span class="cx"> auto range = rangeForRenderer(renderer);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h (212859 => 212860)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2017-02-22 23:44:53 UTC (rev 212859)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2017-02-22 23:55:34 UTC (rev 212860)
</span><span class="lines">@@ -29,24 +29,12 @@
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="cx"> #include "SimpleLineLayoutFlowContents.h"
</span><span class="cx"> #include "SimpleLineLayoutFunctions.h"
</span><ins>+#include <wtf/IteratorRange.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace SimpleLineLayout {
</span><span class="cx">
</span><del>-template <class IteratorType>
-class Range {
-public:
- Range(IteratorType begin, IteratorType end) : m_begin(begin), m_end(end) { }
-
- IteratorType begin() const { return m_begin; }
- IteratorType end() const { return m_end; }
-
-private:
- IteratorType m_begin;
- IteratorType m_end;
-};
-
</del><span class="cx"> class RunResolver {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -113,10 +101,10 @@
</span><span class="cx"> Iterator begin() const;
</span><span class="cx"> Iterator end() const;
</span><span class="cx">
</span><del>- Range<Iterator> rangeForRect(const LayoutRect&) const;
- Range<Iterator> rangeForRenderer(const RenderObject&) const;
</del><ins>+ WTF::IteratorRange<Iterator> rangeForRect(const LayoutRect&) const;
+ WTF::IteratorRange<Iterator> rangeForRenderer(const RenderObject&) const;
</ins><span class="cx"> Iterator runForPoint(const LayoutPoint&) const;
</span><del>- Range<Iterator> rangeForRendererWithOffsets(const RenderObject&, unsigned start, unsigned end) const;
</del><ins>+ WTF::IteratorRange<Iterator> rangeForRendererWithOffsets(const RenderObject&, unsigned start, unsigned end) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> enum class IndexType { First, Last };
</span><span class="lines">@@ -158,7 +146,7 @@
</span><span class="cx"> Iterator begin() const;
</span><span class="cx"> Iterator end() const;
</span><span class="cx">
</span><del>- Range<Iterator> rangeForRect(const LayoutRect&) const;
</del><ins>+ WTF::IteratorRange<Iterator> rangeForRect(const LayoutRect&) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RunResolver m_runResolver;
</span><span class="lines">@@ -296,10 +284,10 @@
</span><span class="cx"> return Iterator(m_runResolver.end());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Range<LineResolver::Iterator> LineResolver::rangeForRect(const LayoutRect& rect) const
</del><ins>+inline WTF::IteratorRange<LineResolver::Iterator> LineResolver::rangeForRect(const LayoutRect& rect) const
</ins><span class="cx"> {
</span><span class="cx"> auto runRange = m_runResolver.rangeForRect(rect);
</span><del>- return Range<Iterator>(Iterator(runRange.begin()), Iterator(runRange.end()));
</del><ins>+ return { Iterator(runRange.begin()), Iterator(runRange.end()) };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline RunResolver runResolver(const RenderBlockFlow& flow, const Layout& layout)
</span></span></pre>
</div>
</div>
</body>
</html>