<!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>[181290] 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/181290">181290</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-03-09 16:30:35 -0700 (Mon, 09 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple line layout should not be limited to RenderText.
https://bugs.webkit.org/show_bug.cgi?id=142504
Reviewed by Antti Koivisto.
This is in transition to support br element.
No change in functionality.
* rendering/RenderText.cpp:
(WebCore::RenderText::absoluteRects):
(WebCore::RenderText::absoluteQuadsClippedToEllipsis):
(WebCore::RenderText::absoluteQuads):
(WebCore::RenderText::firstRunLocation):
(WebCore::RenderText::linesBoundingBox):
(WebCore::RenderText::caretMinOffset):
(WebCore::RenderText::caretMaxOffset):
(WebCore::RenderText::containsCaretOffset):
* rendering/SimpleLineLayoutFlowContents.cpp:
(WebCore::SimpleLineLayout::FlowContents::segmentForRenderer):
* rendering/SimpleLineLayoutFlowContents.h:
* rendering/SimpleLineLayoutFunctions.cpp:
(WebCore::SimpleLineLayout::computeBoundingBox):
(WebCore::SimpleLineLayout::computeFirstRunLocation):
(WebCore::SimpleLineLayout::collectAbsoluteRects):
(WebCore::SimpleLineLayout::collectAbsoluteQuads):
(WebCore::SimpleLineLayout::computeTextBoundingBox): Deleted.
(WebCore::SimpleLineLayout::computeTextFirstRunLocation): Deleted.
(WebCore::SimpleLineLayout::collectTextAbsoluteRects): Deleted.
(WebCore::SimpleLineLayout::collectTextAbsoluteQuads): Deleted.
* rendering/SimpleLineLayoutFunctions.h:
(WebCore::SimpleLineLayout::findCaretMinimumOffset):
(WebCore::SimpleLineLayout::findCaretMaximumOffset):
(WebCore::SimpleLineLayout::containsCaretOffset):
(WebCore::SimpleLineLayout::findTextCaretMinimumOffset): Deleted.
(WebCore::SimpleLineLayout::findTextCaretMaximumOffset): Deleted.
(WebCore::SimpleLineLayout::containsTextCaretOffset): Deleted.
* rendering/SimpleLineLayoutResolver.cpp:
(WebCore::SimpleLineLayout::RunResolver::Run::text):
(WebCore::SimpleLineLayout::RunResolver::rangeForRenderer):
* rendering/SimpleLineLayoutResolver.h:
* rendering/SimpleLineLayoutTextFragmentIterator.cpp:
(WebCore::SimpleLineLayout::TextFragmentIterator::textWidth):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</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="#trunkSourceWebCorerenderingSimpleLineLayoutFunctionsh">trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h</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>
<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 (181289 => 181290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-09 22:51:06 UTC (rev 181289)
+++ trunk/Source/WebCore/ChangeLog 2015-03-09 23:30:35 UTC (rev 181290)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2015-03-09 Zalan Bujtas <zalan@apple.com>
+
+ Simple line layout should not be limited to RenderText.
+ https://bugs.webkit.org/show_bug.cgi?id=142504
+
+ Reviewed by Antti Koivisto.
+
+ This is in transition to support br element.
+
+ No change in functionality.
+
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::absoluteRects):
+ (WebCore::RenderText::absoluteQuadsClippedToEllipsis):
+ (WebCore::RenderText::absoluteQuads):
+ (WebCore::RenderText::firstRunLocation):
+ (WebCore::RenderText::linesBoundingBox):
+ (WebCore::RenderText::caretMinOffset):
+ (WebCore::RenderText::caretMaxOffset):
+ (WebCore::RenderText::containsCaretOffset):
+ * rendering/SimpleLineLayoutFlowContents.cpp:
+ (WebCore::SimpleLineLayout::FlowContents::segmentForRenderer):
+ * rendering/SimpleLineLayoutFlowContents.h:
+ * rendering/SimpleLineLayoutFunctions.cpp:
+ (WebCore::SimpleLineLayout::computeBoundingBox):
+ (WebCore::SimpleLineLayout::computeFirstRunLocation):
+ (WebCore::SimpleLineLayout::collectAbsoluteRects):
+ (WebCore::SimpleLineLayout::collectAbsoluteQuads):
+ (WebCore::SimpleLineLayout::computeTextBoundingBox): Deleted.
+ (WebCore::SimpleLineLayout::computeTextFirstRunLocation): Deleted.
+ (WebCore::SimpleLineLayout::collectTextAbsoluteRects): Deleted.
+ (WebCore::SimpleLineLayout::collectTextAbsoluteQuads): Deleted.
+ * rendering/SimpleLineLayoutFunctions.h:
+ (WebCore::SimpleLineLayout::findCaretMinimumOffset):
+ (WebCore::SimpleLineLayout::findCaretMaximumOffset):
+ (WebCore::SimpleLineLayout::containsCaretOffset):
+ (WebCore::SimpleLineLayout::findTextCaretMinimumOffset): Deleted.
+ (WebCore::SimpleLineLayout::findTextCaretMaximumOffset): Deleted.
+ (WebCore::SimpleLineLayout::containsTextCaretOffset): Deleted.
+ * rendering/SimpleLineLayoutResolver.cpp:
+ (WebCore::SimpleLineLayout::RunResolver::Run::text):
+ (WebCore::SimpleLineLayout::RunResolver::rangeForRenderer):
+ * rendering/SimpleLineLayoutResolver.h:
+ * rendering/SimpleLineLayoutTextFragmentIterator.cpp:
+ (WebCore::SimpleLineLayout::TextFragmentIterator::textWidth):
+
</ins><span class="cx"> 2015-03-09 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> svg/custom/svg-fonts-without-missing-glyph.xhtml fails after fonts/font-fallback-prefers-pictographs.html
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (181289 => 181290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2015-03-09 22:51:06 UTC (rev 181289)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2015-03-09 23:30:35 UTC (rev 181290)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> void RenderText::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const
</span><span class="cx"> {
</span><span class="cx"> if (auto layout = simpleLineLayout()) {
</span><del>- rects.appendVector(collectTextAbsoluteRects(*this, *layout, accumulatedOffset));
</del><ins>+ rects.appendVector(SimpleLineLayout::collectAbsoluteRects(*this, *layout, accumulatedOffset));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> rects.appendVector(m_lineBoxes.absoluteRects(accumulatedOffset));
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (auto layout = simpleLineLayout()) {
</span><span class="cx"> ASSERT(style().textOverflow() != TextOverflowEllipsis);
</span><del>- return collectTextAbsoluteQuads(*this, *layout, nullptr);
</del><ins>+ return SimpleLineLayout::collectAbsoluteQuads(*this, *layout, nullptr);
</ins><span class="cx"> }
</span><span class="cx"> return m_lineBoxes.absoluteQuads(*this, nullptr, RenderTextLineBoxes::ClipToEllipsis);
</span><span class="cx"> }
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> void RenderText::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const
</span><span class="cx"> {
</span><span class="cx"> if (auto layout = simpleLineLayout()) {
</span><del>- quads.appendVector(collectTextAbsoluteQuads(*this, *layout, wasFixed));
</del><ins>+ quads.appendVector(SimpleLineLayout::collectAbsoluteQuads(*this, *layout, wasFixed));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> quads.appendVector(m_lineBoxes.absoluteQuads(*this, wasFixed, RenderTextLineBoxes::NoClipping));
</span><span class="lines">@@ -961,7 +961,7 @@
</span><span class="cx"> IntPoint RenderText::firstRunLocation() const
</span><span class="cx"> {
</span><span class="cx"> if (auto* layout = simpleLineLayout())
</span><del>- return SimpleLineLayout::computeTextFirstRunLocation(*this, *layout);
</del><ins>+ return SimpleLineLayout::computeFirstRunLocation(*this, *layout);
</ins><span class="cx">
</span><span class="cx"> return m_lineBoxes.firstRunLocation();
</span><span class="cx"> }
</span><span class="lines">@@ -1258,7 +1258,7 @@
</span><span class="cx"> IntRect RenderText::linesBoundingBox() const
</span><span class="cx"> {
</span><span class="cx"> if (auto layout = simpleLineLayout())
</span><del>- return SimpleLineLayout::computeTextBoundingBox(*this, *layout);
</del><ins>+ return SimpleLineLayout::computeBoundingBox(*this, *layout);
</ins><span class="cx">
</span><span class="cx"> return m_lineBoxes.boundingBox(*this);
</span><span class="cx"> }
</span><span class="lines">@@ -1346,14 +1346,14 @@
</span><span class="cx"> int RenderText::caretMinOffset() const
</span><span class="cx"> {
</span><span class="cx"> if (auto layout = simpleLineLayout())
</span><del>- return SimpleLineLayout::findTextCaretMinimumOffset(*this, *layout);
</del><ins>+ return SimpleLineLayout::findCaretMinimumOffset(*this, *layout);
</ins><span class="cx"> return m_lineBoxes.caretMinOffset();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderText::caretMaxOffset() const
</span><span class="cx"> {
</span><span class="cx"> if (auto layout = simpleLineLayout())
</span><del>- return SimpleLineLayout::findTextCaretMaximumOffset(*this, *layout);
</del><ins>+ return SimpleLineLayout::findCaretMaximumOffset(*this, *layout);
</ins><span class="cx"> return m_lineBoxes.caretMaxOffset(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1372,7 +1372,7 @@
</span><span class="cx"> bool RenderText::containsCaretOffset(unsigned offset) const
</span><span class="cx"> {
</span><span class="cx"> if (auto layout = simpleLineLayout())
</span><del>- return SimpleLineLayout::containsTextCaretOffset(*this, *layout, offset);
</del><ins>+ return SimpleLineLayout::containsCaretOffset(*this, *layout, offset);
</ins><span class="cx"> return m_lineBoxes.containsOffset(*this, offset, RenderTextLineBoxes::CaretOffset);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp (181289 => 181290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp 2015-03-09 22:51:06 UTC (rev 181289)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp 2015-03-09 23:30:35 UTC (rev 181290)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> return index;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const FlowContents::Segment& FlowContents::segmentForRenderer(const RenderText& renderer) const
</del><ins>+const FlowContents::Segment& FlowContents::segmentForRenderer(const RenderObject& renderer) const
</ins><span class="cx"> {
</span><span class="cx"> for (auto& segment : m_segments) {
</span><span class="cx"> if (&segment.renderer == &renderer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFlowContentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h (181289 => 181290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2015-03-09 22:51:06 UTC (rev 181289)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFlowContents.h 2015-03-09 23:30:35 UTC (rev 181290)
</span><span class="lines">@@ -41,10 +41,10 @@
</span><span class="cx"> unsigned start;
</span><span class="cx"> unsigned end;
</span><span class="cx"> String text;
</span><del>- const RenderText& renderer;
</del><ins>+ const RenderObject& renderer;
</ins><span class="cx"> };
</span><span class="cx"> const Segment& segmentForPosition(unsigned) const;
</span><del>- const Segment& segmentForRenderer(const RenderText&) const;
</del><ins>+ const Segment& segmentForRenderer(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> class Iterator {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp (181289 => 181290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-03-09 22:51:06 UTC (rev 181289)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.cpp 2015-03-09 23:30:35 UTC (rev 181290)
</span><span class="lines">@@ -134,11 +134,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntRect computeTextBoundingBox(const RenderText& textRenderer, const Layout& layout)
</del><ins>+IntRect computeBoundingBox(const RenderObject& renderer, const Layout& layout)
</ins><span class="cx"> {
</span><del>- auto resolver = runResolver(downcast<RenderBlockFlow>(*textRenderer.parent()), layout);
</del><ins>+ auto resolver = runResolver(downcast<RenderBlockFlow>(*renderer.parent()), layout);
</ins><span class="cx"> FloatRect boundingBoxRect;
</span><del>- for (const auto& run : resolver.rangeForRenderer(textRenderer)) {
</del><ins>+ for (const auto& run : resolver.rangeForRenderer(renderer)) {
</ins><span class="cx"> FloatRect rect = run.rect();
</span><span class="cx"> if (boundingBoxRect == FloatRect())
</span><span class="cx"> boundingBoxRect = rect;
</span><span class="lines">@@ -148,10 +148,10 @@
</span><span class="cx"> return enclosingIntRect(boundingBoxRect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint computeTextFirstRunLocation(const RenderText& textRenderer, const Layout& layout)
</del><ins>+IntPoint computeFirstRunLocation(const RenderObject& renderer, const Layout& layout)
</ins><span class="cx"> {
</span><del>- auto resolver = runResolver(downcast<RenderBlockFlow>(*textRenderer.parent()), layout);
- const auto& it = resolver.rangeForRenderer(textRenderer);
</del><ins>+ auto resolver = runResolver(downcast<RenderBlockFlow>(*renderer.parent()), layout);
+ const auto& it = resolver.rangeForRenderer(renderer);
</ins><span class="cx"> auto begin = it.begin();
</span><span class="cx"> if (begin == it.end())
</span><span class="cx"> return IntPoint(0, 0);
</span><span class="lines">@@ -159,23 +159,23 @@
</span><span class="cx"> return flooredIntPoint((*begin).rect().location());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Vector<IntRect> collectTextAbsoluteRects(const RenderText& textRenderer, const Layout& layout, const LayoutPoint& accumulatedOffset)
</del><ins>+Vector<IntRect> collectAbsoluteRects(const RenderObject& renderer, const Layout& layout, const LayoutPoint& accumulatedOffset)
</ins><span class="cx"> {
</span><span class="cx"> Vector<IntRect> rects;
</span><del>- auto resolver = runResolver(downcast<RenderBlockFlow>(*textRenderer.parent()), layout);
- for (const auto& run : resolver.rangeForRenderer(textRenderer)) {
</del><ins>+ auto resolver = runResolver(downcast<RenderBlockFlow>(*renderer.parent()), layout);
+ for (const auto& run : resolver.rangeForRenderer(renderer)) {
</ins><span class="cx"> LayoutRect rect = run.rect();
</span><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="cx"> }
</span><span class="cx">
</span><del>-Vector<FloatQuad> collectTextAbsoluteQuads(const RenderText& textRenderer, const Layout& layout, bool* wasFixed)
</del><ins>+Vector<FloatQuad> collectAbsoluteQuads(const RenderObject& renderer, const Layout& layout, bool* wasFixed)
</ins><span class="cx"> {
</span><span class="cx"> Vector<FloatQuad> quads;
</span><del>- auto resolver = runResolver(downcast<RenderBlockFlow>(*textRenderer.parent()), layout);
- for (const auto& run : resolver.rangeForRenderer(textRenderer))
- quads.append(textRenderer.localToAbsoluteQuad(FloatQuad(run.rect()), 0, wasFixed));
</del><ins>+ auto resolver = runResolver(downcast<RenderBlockFlow>(*renderer.parent()), layout);
+ for (const auto& run : resolver.rangeForRenderer(renderer))
+ quads.append(renderer.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="trunkSourceWebCorerenderingSimpleLineLayoutFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h (181289 => 181290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2015-03-09 22:51:06 UTC (rev 181289)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutFunctions.h 2015-03-09 23:30:35 UTC (rev 181290)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> class HitTestRequest;
</span><span class="cx"> class HitTestResult;
</span><span class="cx"> class RenderBlockFlow;
</span><del>-class RenderText;
</del><span class="cx"> struct PaintInfo;
</span><span class="cx">
</span><span class="cx"> namespace SimpleLineLayout {
</span><span class="lines">@@ -51,14 +50,14 @@
</span><span class="cx"> void collectFlowOverflow(RenderBlockFlow&, const Layout&);
</span><span class="cx">
</span><span class="cx"> bool isTextRendered(const RenderText&, const Layout&);
</span><del>-bool containsTextCaretOffset(const RenderText&, const Layout&, unsigned);
-unsigned findTextCaretMinimumOffset(const RenderText&, const Layout&);
-unsigned findTextCaretMaximumOffset(const RenderText&, const Layout&);
-IntRect computeTextBoundingBox(const RenderText&, const Layout&);
-IntPoint computeTextFirstRunLocation(const RenderText&, const Layout&);
</del><ins>+bool containsCaretOffset(const RenderObject&, const Layout&, unsigned);
+unsigned findCaretMinimumOffset(const RenderObject&, const Layout&);
+unsigned findCaretMaximumOffset(const RenderObject&, const Layout&);
+IntRect computeBoundingBox(const RenderObject&, const Layout&);
+IntPoint computeFirstRunLocation(const RenderObject&, const Layout&);
</ins><span class="cx">
</span><del>-Vector<IntRect> collectTextAbsoluteRects(const RenderText&, const Layout&, const LayoutPoint& accumulatedOffset);
-Vector<FloatQuad> collectTextAbsoluteQuads(const RenderText&, const Layout&, bool* wasFixed);
</del><ins>+Vector<IntRect> collectAbsoluteRects(const RenderObject&, const Layout&, const LayoutPoint& accumulatedOffset);
+Vector<FloatQuad> collectAbsoluteQuads(const RenderObject&, const Layout&, bool* wasFixed);
</ins><span class="cx">
</span><span class="cx"> LayoutUnit lineHeightFromFlow(const RenderBlockFlow&);
</span><span class="cx"> LayoutUnit baselineFromFlow(const RenderBlockFlow&);
</span><span class="lines">@@ -88,14 +87,14 @@
</span><span class="cx"> return flow.borderAndPaddingBefore() + lineHeightFromFlow(flow) * (layout.lineCount() - 1) + baselineFromFlow(flow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline unsigned findTextCaretMinimumOffset(const RenderText&, const Layout& layout)
</del><ins>+inline unsigned findCaretMinimumOffset(const RenderText&, const Layout& layout)
</ins><span class="cx"> {
</span><span class="cx"> if (!layout.runCount())
</span><span class="cx"> return 0;
</span><span class="cx"> return layout.runAt(0).start;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline unsigned findTextCaretMaximumOffset(const RenderText& renderer, const Layout& layout)
</del><ins>+inline unsigned findCaretMaximumOffset(const RenderText& renderer, const Layout& layout)
</ins><span class="cx"> {
</span><span class="cx"> if (!layout.runCount())
</span><span class="cx"> return renderer.textLength();
</span><span class="lines">@@ -103,7 +102,7 @@
</span><span class="cx"> return last.end;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool containsTextCaretOffset(const RenderText&, const Layout& layout, unsigned offset)
</del><ins>+inline bool containsCaretOffset(const RenderText&, const Layout& layout, unsigned offset)
</ins><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < layout.runCount(); ++i) {
</span><span class="cx"> auto& run = layout.runAt(i);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp (181289 => 181290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2015-03-09 22:51:06 UTC (rev 181289)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.cpp 2015-03-09 23:30:35 UTC (rev 181290)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "SimpleLineLayoutResolver.h"
</span><span class="cx">
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><del>-#include "RenderText.h"
</del><ins>+#include "RenderObject.h"
</ins><span class="cx"> #include "SimpleLineLayoutFunctions.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> auto& resolver = m_iterator.resolver();
</span><span class="cx"> auto& run = m_iterator.simpleRun();
</span><span class="cx"> auto& segment = resolver.m_flowContents.segmentForPosition(run.start);
</span><del>- // We currently split runs on segment boundaries (different RenderText).
</del><ins>+ // We currently split runs on segment boundaries (different RenderObject).
</ins><span class="cx"> ASSERT(run.end <= segment.end);
</span><span class="cx"> if (segment.text.is8Bit())
</span><span class="cx"> return StringView(segment.text.characters8(), segment.text.length()).substring(run.start - segment.start, run.end - run.start);
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> return Range<Iterator>(rangeBegin, rangeEnd);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Range<RunResolver::Iterator> RunResolver::rangeForRenderer(const RenderText& renderer) const
</del><ins>+Range<RunResolver::Iterator> RunResolver::rangeForRenderer(const RenderObject& renderer) const
</ins><span class="cx"> {
</span><span class="cx"> auto& segment = m_flowContents.segmentForRenderer(renderer);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h (181289 => 181290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2015-03-09 22:51:06 UTC (rev 181289)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutResolver.h 2015-03-09 23:30:35 UTC (rev 181290)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><del>-#include "RenderText.h"
</del><span class="cx"> #include "SimpleLineLayoutFlowContents.h"
</span><span class="cx"> #include "SimpleLineLayoutFunctions.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -101,7 +100,7 @@
</span><span class="cx"> Iterator end() const;
</span><span class="cx">
</span><span class="cx"> Range<Iterator> rangeForRect(const LayoutRect&) const;
</span><del>- Range<Iterator> rangeForRenderer(const RenderText&) const;
</del><ins>+ Range<Iterator> rangeForRenderer(const RenderObject&) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> enum class IndexType { First, Last };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutTextFragmentIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp (181289 => 181290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2015-03-09 22:51:06 UTC (rev 181289)
+++ trunk/Source/WebCore/rendering/SimpleLineLayoutTextFragmentIterator.cpp 2015-03-09 23:30:35 UTC (rev 181290)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RenderBlockFlow.h"
</span><span class="cx"> #include "RenderChildIterator.h"
</span><del>-#include "RenderText.h"
</del><span class="cx"> #include "SimpleLineLayoutFlowContents.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -94,8 +93,9 @@
</span><span class="cx"> float TextFragmentIterator::textWidth(unsigned from, unsigned to, float xPosition) const
</span><span class="cx"> {
</span><span class="cx"> const auto& fromSegment = m_flowContents.segmentForPosition(from);
</span><ins>+ ASSERT(is<RenderText>(fromSegment.renderer));
</ins><span class="cx"> if ((m_style.font.isFixedPitch() && fromSegment.end >= to) || (from == fromSegment.start && to == fromSegment.end))
</span><del>- return fromSegment.renderer.width(from - fromSegment.start, to - from, m_style.font, xPosition, nullptr, nullptr);
</del><ins>+ return downcast<RenderText>(fromSegment.renderer).width(from - fromSegment.start, to - from, m_style.font, xPosition, nullptr, nullptr);
</ins><span class="cx">
</span><span class="cx"> const auto* segment = &fromSegment;
</span><span class="cx"> float textWidth = 0;
</span></span></pre>
</div>
</div>
</body>
</html>