<!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>[176317] 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/176317">176317</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-11-19 07:40:35 -0800 (Wed, 19 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout: Add renderer based rect collecting to RunResolver.
https://bugs.webkit.org/show_bug.cgi?id=138818
Reviewed by Antti Koivisto.
This is in preparation to multiple renderers support.
RunResolver should be able to collect rects for a particular renderer
that might overlap multiple runs. (or might just be a subset of a Run)
Covered by existing tests.
* rendering/SimpleLineLayoutFlowContents.cpp:
(WebCore::SimpleLineLayout::FlowContents::renderer): It operates on a single renderer currently.
(WebCore::SimpleLineLayout::FlowContents::resolveRendererPositions): It operates on a single renderer currently.
* rendering/SimpleLineLayoutFlowContents.h:
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::computeTextBoundingBox):
(WebCore::SimpleLineLayout::computeTextFirstRunLocation):
(WebCore::SimpleLineLayout::collectTextAbsoluteRects):
(WebCore::SimpleLineLayout::collectTextAbsoluteQuads):
(WebCore::SimpleLineLayout::showLineLayoutForFlow):
* rendering/SimpleLineLayoutResolver.cpp:
(WebCore::SimpleLineLayout::baselinePosition):
(WebCore::SimpleLineLayout::linePosition):
(WebCore::SimpleLineLayout::lineSize):
(WebCore::SimpleLineLayout::RunResolver::Run::rect):
(WebCore::SimpleLineLayout::RunResolver::Run::rectForTextRenderer):
(WebCore::SimpleLineLayout::RunResolver::Run::baseline):
(WebCore::SimpleLineLayout::RunResolver::Run::text):
(WebCore::SimpleLineLayout::RunResolver::Run::computeRect):
(WebCore::SimpleLineLayout::RunResolver::RunResolver):
* rendering/SimpleLineLayoutResolver.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFlowContentscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsh">trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp</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 (176316 => 176317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-19 14:24:10 UTC (rev 176316)
+++ trunk/Source/WebCore/ChangeLog 2014-11-19 15:40:35 UTC (rev 176317)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-11-19 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout: Add renderer based rect collecting to RunResolver.
+ https://bugs.webkit.org/show_bug.cgi?id=138818
+
+ Reviewed by Antti Koivisto.
+
+ This is in preparation to multiple renderers support.
+ RunResolver should be able to collect rects for a particular renderer
+ that might overlap multiple runs. (or might just be a subset of a Run)
+
+ Covered by existing tests.
+
+ * rendering/SimpleLineLayoutFlowContents.cpp:
+ (WebCore::SimpleLineLayout::FlowContents::renderer): It operates on a single renderer currently.
+ (WebCore::SimpleLineLayout::FlowContents::resolveRendererPositions): It operates on a single renderer currently.
+ * rendering/SimpleLineLayoutFlowContents.h:
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::computeTextBoundingBox):
+ (WebCore::SimpleLineLayout::computeTextFirstRunLocation):
+ (WebCore::SimpleLineLayout::collectTextAbsoluteRects):
+ (WebCore::SimpleLineLayout::collectTextAbsoluteQuads):
+ (WebCore::SimpleLineLayout::showLineLayoutForFlow):
+ * rendering/SimpleLineLayoutResolver.cpp:
+ (WebCore::SimpleLineLayout::baselinePosition):
+ (WebCore::SimpleLineLayout::linePosition):
+ (WebCore::SimpleLineLayout::lineSize):
+ (WebCore::SimpleLineLayout::RunResolver::Run::rect):
+ (WebCore::SimpleLineLayout::RunResolver::Run::rectForTextRenderer):
+ (WebCore::SimpleLineLayout::RunResolver::Run::baseline):
+ (WebCore::SimpleLineLayout::RunResolver::Run::text):
+ (WebCore::SimpleLineLayout::RunResolver::Run::computeRect):
+ (WebCore::SimpleLineLayout::RunResolver::RunResolver):
+ * rendering/SimpleLineLayoutResolver.h:
+
</ins><span class="cx"> 2014-11-19 Dhi Aurrahman <diorahman@rockybars.com>
</span><span class="cx">
</span><span class="cx"> Add selector checker for :lang pseudo class in Selectors level 4
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp (176316 => 176317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp 2014-11-19 14:24:10 UTC (rev 176316)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp 2014-11-19 15:40:35 UTC (rev 176317)
</span><span class="lines">@@ -77,5 +77,18 @@
</span><span class="cx"> return m_style.font.width(run);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool FlowContents::resolveRendererPositions(const RenderText& renderer, unsigned& startPosition, unsigned& endPosition) const
+{
+ ASSERT(&renderer == downcast<RenderText>(m_flow.firstChild()));
+ startPosition = 0;
+ endPosition = renderer.text()->length();
+ return true;
</ins><span class="cx"> }
</span><ins>+
+const RenderText& FlowContents::renderer(unsigned) const
+{
+ return downcast<RenderText>(*m_flow.firstChild());
</ins><span class="cx"> }
</span><ins>+
+}
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h (176316 => 176317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2014-11-19 14:24:10 UTC (rev 176316)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2014-11-19 15:40:35 UTC (rev 176317)
</span><span class="lines">@@ -48,6 +48,9 @@
</span><span class="cx"> bool isNewlineCharacter(unsigned position) const;
</span><span class="cx"> bool isEndOfContent(unsigned position) const;
</span><span class="cx">
</span><ins>+ bool resolveRendererPositions(const RenderText&, unsigned& startPosition, unsigned& endPosition) const;
+ const RenderText& renderer(unsigned position) const;
+
</ins><span class="cx"> class Style {
</span><span class="cx"> public:
</span><span class="cx"> Style(const RenderStyle& style)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (176316 => 176317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2014-11-19 14:24:10 UTC (rev 176316)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2014-11-19 15:40:35 UTC (rev 176317)
</span><span class="lines">@@ -136,37 +136,26 @@
</span><span class="cx">
</span><span class="cx"> IntRect computeTextBoundingBox(const RenderText& textRenderer, const Layout& layout)
</span><span class="cx"> {
</span><del>- auto resolver = lineResolver(downcast<RenderBlockFlow>(*textRenderer.parent()), layout);
- auto it = resolver.begin();
- auto end = resolver.end();
- if (it == end)
- return IntRect();
- auto firstLineRect = *it;
- float left = firstLineRect.x();
- float right = firstLineRect.maxX();
- float bottom = firstLineRect.maxY();
- for (++it; it != end; ++it) {
- auto rect = *it;
- if (rect.x() < left)
- left = rect.x();
- if (rect.maxX() > right)
- right = rect.maxX();
- if (rect.maxY() > bottom)
- bottom = rect.maxY();
</del><ins>+ auto resolver = runResolver(downcast<RenderBlockFlow>(*textRenderer.parent()), layout);
+ FloatRect boundingBoxRect;
+ for (const auto& run : resolver.rangeForRenderer(textRenderer)) {
+ FloatRect rect = run.rect();
+ if (boundingBoxRect == FloatRect())
+ boundingBoxRect = rect;
+ else
+ boundingBoxRect.uniteEvenIfEmpty(rect);
</ins><span class="cx"> }
</span><del>- float x = left;
- float y = firstLineRect.y();
- float width = right - left;
- float height = bottom - y;
- return enclosingIntRect(FloatRect(x, y, width, height));
</del><ins>+ return enclosingIntRect(boundingBoxRect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntPoint computeTextFirstRunLocation(const RenderText& textRenderer, const Layout& layout)
</span><span class="cx"> {
</span><span class="cx"> auto resolver = runResolver(downcast<RenderBlockFlow>(*textRenderer.parent()), layout);
</span><del>- auto begin = resolver.begin();
- if (begin == resolver.end())
- return IntPoint();
</del><ins>+ const auto& it = resolver.rangeForRenderer(textRenderer);
+ auto begin = it.begin();
+ if (begin == it.end())
+ return IntPoint(0, 0);
+
</ins><span class="cx"> return flooredIntPoint((*begin).rect().location());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -174,9 +163,8 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<IntRect> rects;
</span><span class="cx"> auto resolver = runResolver(downcast<RenderBlockFlow>(*textRenderer.parent()), layout);
</span><del>- for (auto it = resolver.begin(), end = resolver.end(); it != end; ++it) {
- const auto& run = *it;
- auto rect = run.rect();
</del><ins>+ for (const auto& run : resolver.rangeForRenderer(textRenderer)) {
+ LayoutRect rect = run.rect();
</ins><span class="cx"> rects.append(enclosingIntRect(FloatRect(accumulatedOffset + rect.location(), rect.size())));
</span><span class="cx"> }
</span><span class="cx"> return rects;
</span><span class="lines">@@ -186,11 +174,8 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<FloatQuad> quads;
</span><span class="cx"> auto resolver = runResolver(downcast<RenderBlockFlow>(*textRenderer.parent()), layout);
</span><del>- for (auto it = resolver.begin(), end = resolver.end(); it != end; ++it) {
- const auto& run = *it;
- auto rect = run.rect();
- quads.append(textRenderer.localToAbsoluteQuad(FloatQuad(rect), 0, wasFixed));
- }
</del><ins>+ for (const auto& run : resolver.rangeForRenderer(textRenderer))
+ quads.append(textRenderer.localToAbsoluteQuad(FloatQuad(run.rect()), 0, wasFixed));
</ins><span class="cx"> return quads;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp (176316 => 176317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2014-11-19 14:24:10 UTC (rev 176316)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2014-11-19 15:40:35 UTC (rev 176317)
</span><span class="lines">@@ -33,6 +33,21 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> namespace SimpleLineLayout {
</span><span class="cx">
</span><ins>+static float baselinePosition(float lineHeight, float baseline, int lineIndex)
+{
+ return lineHeight * lineIndex + baseline;
+}
+
+static LayoutPoint linePosition(float logicalLeft, float logicalTop)
+{
+ return LayoutPoint(LayoutUnit::fromFloatFloor(logicalLeft), roundToInt(logicalTop));
+}
+
+static LayoutSize lineSize(float logicalLeft, float logicalRight, float height)
+{
+ return LayoutSize(LayoutUnit::fromFloatCeil(logicalRight) - LayoutUnit::fromFloatFloor(logicalLeft), height);
+}
+
</ins><span class="cx"> RunResolver::Run::Run(const Iterator& iterator)
</span><span class="cx"> : m_iterator(iterator)
</span><span class="cx"> {
</span><span class="lines">@@ -40,13 +55,12 @@
</span><span class="cx">
</span><span class="cx"> LayoutRect RunResolver::Run::rect() const
</span><span class="cx"> {
</span><ins>+ auto& run = m_iterator.simpleRun();
</ins><span class="cx"> auto& resolver = m_iterator.resolver();
</span><del>- auto& run = m_iterator.simpleRun();
-
- float baselinePosition = resolver.m_lineHeight * m_iterator.lineIndex() + resolver.m_baseline;
- LayoutPoint linePosition(LayoutUnit::fromFloatFloor(run.logicalLeft), roundToInt(baselinePosition - resolver.m_ascent + resolver.m_borderAndPaddingBefore));
- LayoutSize lineSize(LayoutUnit::fromFloatCeil(run.logicalRight) - LayoutUnit::fromFloatFloor(run.logicalLeft), resolver.m_ascent + resolver.m_descent);
- return LayoutRect(linePosition, lineSize);
</del><ins>+ float baseline = baselinePosition(resolver.m_lineHeight, resolver.m_baseline, m_iterator.lineIndex());
+ LayoutPoint position = linePosition(run.logicalLeft, baseline - resolver.m_ascent + resolver.m_borderAndPaddingBefore);
+ LayoutSize size = lineSize(run.logicalLeft, run.logicalRight, resolver.m_ascent + resolver.m_descent);
+ return LayoutRect(position, size);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatPoint RunResolver::Run::baseline() const
</span><span class="lines">@@ -54,15 +68,17 @@
</span><span class="cx"> auto& resolver = m_iterator.resolver();
</span><span class="cx"> auto& run = m_iterator.simpleRun();
</span><span class="cx">
</span><del>- float baselinePosition = resolver.m_lineHeight * m_iterator.lineIndex() + resolver.m_baseline;
- return FloatPoint(run.logicalLeft, roundToInt(baselinePosition + resolver.m_borderAndPaddingBefore));
</del><ins>+ float baseline = baselinePosition(resolver.m_lineHeight, resolver.m_baseline, m_iterator.lineIndex());
+ return FloatPoint(run.logicalLeft, roundToInt(baseline + resolver.m_borderAndPaddingBefore));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StringView RunResolver::Run::text() const
</span><span class="cx"> {
</span><span class="cx"> auto& resolver = m_iterator.resolver();
</span><span class="cx"> auto& run = m_iterator.simpleRun();
</span><del>- return StringView(resolver.m_string).substring(run.start, run.end - run.start);
</del><ins>+ const auto& renderer = resolver.m_flowContents.renderer(run.start);
+ ASSERT(renderer.is8Bit());
+ return StringView(renderer.characters8(), renderer.textLength()).substring(run.start, run.end - run.start);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RunResolver::Iterator::Iterator(const RunResolver& resolver, unsigned runIndex, unsigned lineIndex)
</span><span class="lines">@@ -97,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> RunResolver::RunResolver(const RenderBlockFlow& flow, const Layout& layout)
</span><span class="cx"> : m_layout(layout)
</span><del>- , m_string(downcast<RenderText>(*flow.firstChild()).text())
</del><ins>+ , m_flowContents(flow)
</ins><span class="cx"> , m_lineHeight(lineHeightFromFlow(flow))
</span><span class="cx"> , m_baseline(baselineFromFlow(flow))
</span><span class="cx"> , m_borderAndPaddingBefore(flow.borderAndPaddingBefore())
</span><span class="lines">@@ -136,6 +152,18 @@
</span><span class="cx"> return Range<Iterator>(rangeBegin, rangeEnd);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Range<RunResolver::Iterator> RunResolver::rangeForRenderer(const RenderText& renderer) const
+{
+ unsigned startPosition = 0;
+ unsigned endPosition = 0;
+ m_flowContents.resolveRendererPositions(renderer, startPosition, endPosition);
+ auto rangeBegin = begin();
+ for (;(*rangeBegin).start() < startPosition && rangeBegin != end(); ++rangeBegin) { }
+ auto rangeEnd = rangeBegin;
+ for (;(*rangeEnd).end() <= endPosition && rangeEnd != end(); ++rangeEnd) { }
+ return Range<Iterator>(rangeBegin, rangeEnd);
+}
+
</ins><span class="cx"> LineResolver::Iterator::Iterator(RunResolver::Iterator runIterator)
</span><span class="cx"> : m_runIterator(runIterator)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h (176316 => 176317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2014-11-19 14:24:10 UTC (rev 176316)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2014-11-19 15:40:35 UTC (rev 176317)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="cx"> #include "RenderText.h"
</span><ins>+#include "SimpleLineLayoutFlowContents.h"
</ins><span class="cx"> #include "SimpleLineLayoutFunctions.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -100,13 +101,14 @@
</span><span class="cx"> Iterator end() const;
</span><span class="cx">
</span><span class="cx"> Range<Iterator> rangeForRect(const LayoutRect&) const;
</span><ins>+ Range<Iterator> rangeForRenderer(const RenderText&) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> enum class IndexType { First, Last };
</span><span class="cx"> unsigned lineIndexForHeight(LayoutUnit, IndexType) const;
</span><span class="cx">
</span><span class="cx"> const Layout& m_layout;
</span><del>- const String m_string;
</del><ins>+ const FlowContents m_flowContents;
</ins><span class="cx"> const LayoutUnit m_lineHeight;
</span><span class="cx"> const LayoutUnit m_baseline;
</span><span class="cx"> const LayoutUnit m_borderAndPaddingBefore;
</span></span></pre>
</div>
</div>
</body>
</html>