<!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>[160074] 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/160074">160074</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-04 00:29:45 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move space-ignoring inline functions into MidpointState
<https://webkit.org/b/124957>
Reviewed by David Hyatt.
Since:
- The following inline functions were used only with a mandatory LineMidpointState argument:
startIgnoringSpaces, stopIgnoringSpaces, ensureLineBoxInsideIgnoredSpaces, deprecatedAddMidpoint.
- TrailingObjects class uses these functions. Since they're inline in BreakingContextInlineHeaders.h,
it's hard to separate TrailingObjects into it's own file. (blocks bug #124956)
I made these functions as a member of LineMidpointState, and I also updated the call sites.
No new tests, no behavior change.
* platform/text/BidiResolver.h:
(WebCore::MidpointState::startIgnoringSpaces):
(WebCore::MidpointState::stopIgnoringSpaces):
(WebCore::MidpointState::ensureLineBoxInsideIgnoredSpaces):
(WebCore::MidpointState::deprecatedAddMidpoint):
* rendering/RenderBlock.h:
* rendering/line/BreakingContextInlineHeaders.h:
(WebCore::TrailingObjects::updateMidpointsForTrailingBoxes):
(WebCore::BreakingContext::handleBR):
(WebCore::BreakingContext::handleOutOfFlowPositioned):
(WebCore::shouldSkipWhitespaceAfterStartObject):
(WebCore::BreakingContext::handleEmptyInline):
(WebCore::BreakingContext::handleReplaced):
(WebCore::ensureCharacterGetsLineBox):
(WebCore::BreakingContext::handleText):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformtextBidiResolverh">trunk/Source/WebCore/platform/text/BidiResolver.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh">trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160073 => 160074)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-04 07:56:26 UTC (rev 160073)
+++ trunk/Source/WebCore/ChangeLog 2013-12-04 08:29:45 UTC (rev 160074)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2013-12-04 Zoltan Horvath <zoltan@webkit.org>
+
+ Move space-ignoring inline functions into MidpointState
+ <https://webkit.org/b/124957>
+
+ Reviewed by David Hyatt.
+
+ Since:
+ - The following inline functions were used only with a mandatory LineMidpointState argument:
+ startIgnoringSpaces, stopIgnoringSpaces, ensureLineBoxInsideIgnoredSpaces, deprecatedAddMidpoint.
+ - TrailingObjects class uses these functions. Since they're inline in BreakingContextInlineHeaders.h,
+ it's hard to separate TrailingObjects into it's own file. (blocks bug #124956)
+ I made these functions as a member of LineMidpointState, and I also updated the call sites.
+
+ No new tests, no behavior change.
+
+ * platform/text/BidiResolver.h:
+ (WebCore::MidpointState::startIgnoringSpaces):
+ (WebCore::MidpointState::stopIgnoringSpaces):
+ (WebCore::MidpointState::ensureLineBoxInsideIgnoredSpaces):
+ (WebCore::MidpointState::deprecatedAddMidpoint):
+ * rendering/RenderBlock.h:
+ * rendering/line/BreakingContextInlineHeaders.h:
+ (WebCore::TrailingObjects::updateMidpointsForTrailingBoxes):
+ (WebCore::BreakingContext::handleBR):
+ (WebCore::BreakingContext::handleOutOfFlowPositioned):
+ (WebCore::shouldSkipWhitespaceAfterStartObject):
+ (WebCore::BreakingContext::handleEmptyInline):
+ (WebCore::BreakingContext::handleReplaced):
+ (WebCore::ensureCharacterGetsLineBox):
+ (WebCore::BreakingContext::handleText):
+
</ins><span class="cx"> 2013-12-03 Zoltan Horvath <zoltan@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove BreakingContext's friendship from RenderBlockFlow
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextBidiResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/BidiResolver.h (160073 => 160074)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/BidiResolver.h 2013-12-04 07:56:26 UTC (rev 160073)
+++ trunk/Source/WebCore/platform/text/BidiResolver.h 2013-12-04 08:29:45 UTC (rev 160074)
</span><span class="lines">@@ -31,7 +31,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-template <class Iterator> struct MidpointState {
</del><ins>+class RenderObject;
+
+template <class Iterator> class MidpointState {
+public:
</ins><span class="cx"> MidpointState()
</span><span class="cx"> {
</span><span class="cx"> reset();
</span><span class="lines">@@ -51,6 +54,36 @@
</span><span class="cx"> unsigned numMidpoints;
</span><span class="cx"> unsigned currentMidpoint;
</span><span class="cx"> bool betweenMidpoints;
</span><ins>+
+ void startIgnoringSpaces(const Iterator& midpoint)
+ {
+ ASSERT(!(numMidpoints % 2));
+ deprecatedAddMidpoint(midpoint);
+ }
+
+ void stopIgnoringSpaces(const Iterator& midpoint)
+ {
+ ASSERT(lineMidpointState.numMidpoints % 2);
+ deprecatedAddMidpoint(midpoint);
+ }
+
+ // When ignoring spaces, this needs to be called for objects that need line boxes such as RenderInlines or
+ // hard line breaks to ensure that they're not ignored.
+ void ensureLineBoxInsideIgnoredSpaces(RenderObject* renderer)
+ {
+ Iterator midpoint(0, renderer, 0);
+ stopIgnoringSpaces(midpoint);
+ startIgnoringSpaces(midpoint);
+ }
+private:
+ void deprecatedAddMidpoint(const Iterator& midpoint)
+ {
+ if (midpoints.size() <= numMidpoints)
+ midpoints.grow(numMidpoints + 10);
+
+ Iterator* midpointsIterator = midpoints.data();
+ midpointsIterator[numMidpoints++] = midpoint;
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // The BidiStatus at a given position (typically the end of a line) can
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (160073 => 160074)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2013-12-04 07:56:26 UTC (rev 160073)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2013-12-04 08:29:45 UTC (rev 160074)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> template <class Iterator, class Run> class BidiResolver;
</span><span class="cx"> template <class Run> class BidiRunList;
</span><del>-template <class Iterator> struct MidpointState;
</del><ins>+template <class Iterator> class MidpointState;
</ins><span class="cx"> typedef BidiResolver<InlineIterator, BidiRun> InlineBidiResolver;
</span><span class="cx"> typedef MidpointState<InlineIterator> LineMidpointState;
</span><span class="cx"> typedef WTF::ListHashSet<RenderBox*, 16> TrackedRendererListHashSet;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h (160073 => 160074)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2013-12-04 07:56:26 UTC (rev 160073)
+++ trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2013-12-04 08:29:45 UTC (rev 160074)
</span><span class="lines">@@ -106,37 +106,6 @@
</span><span class="cx"> m_boxes.append(box);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Don't call this directly. Use one of the descriptive helper functions below.
-inline void deprecatedAddMidpoint(LineMidpointState& lineMidpointState, const InlineIterator& midpoint)
-{
- if (lineMidpointState.midpoints.size() <= lineMidpointState.numMidpoints)
- lineMidpointState.midpoints.grow(lineMidpointState.numMidpoints + 10);
-
- InlineIterator* midpoints = lineMidpointState.midpoints.data();
- midpoints[lineMidpointState.numMidpoints++] = midpoint;
-}
-
-inline void startIgnoringSpaces(LineMidpointState& lineMidpointState, const InlineIterator& midpoint)
-{
- ASSERT(!(lineMidpointState.numMidpoints % 2));
- deprecatedAddMidpoint(lineMidpointState, midpoint);
-}
-
-inline void stopIgnoringSpaces(LineMidpointState& lineMidpointState, const InlineIterator& midpoint)
-{
- ASSERT(lineMidpointState.numMidpoints % 2);
- deprecatedAddMidpoint(lineMidpointState, midpoint);
-}
-
-// When ignoring spaces, this needs to be called for objects that need line boxes such as RenderInlines or
-// hard line breaks to ensure that they're not ignored.
-inline void ensureLineBoxInsideIgnoredSpaces(LineMidpointState& lineMidpointState, RenderObject* renderer)
-{
- InlineIterator midpoint(0, renderer, 0);
- stopIgnoringSpaces(lineMidpointState, midpoint);
- startIgnoringSpaces(lineMidpointState, midpoint);
-}
-
</del><span class="cx"> void TrailingObjects::updateMidpointsForTrailingBoxes(LineMidpointState& lineMidpointState, const InlineIterator& lBreak, CollapseFirstSpaceOrNot collapseFirstSpace)
</span><span class="cx"> {
</span><span class="cx"> if (!m_whitespace)
</span><span class="lines">@@ -158,7 +127,7 @@
</span><span class="cx"> for (size_t i = 0; i < m_boxes.size(); ++i) {
</span><span class="cx"> if (currentMidpoint >= lineMidpointState.numMidpoints) {
</span><span class="cx"> // We don't have a midpoint for this box yet.
</span><del>- ensureLineBoxInsideIgnoredSpaces(lineMidpointState, m_boxes[i]);
</del><ins>+ lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_boxes[i]);
</ins><span class="cx"> } else {
</span><span class="cx"> ASSERT(lineMidpointState.midpoints[currentMidpoint].renderer() == m_boxes[i]);
</span><span class="cx"> ASSERT(lineMidpointState.midpoints[currentMidpoint + 1].renderer() == m_boxes[i]);
</span><span class="lines">@@ -172,9 +141,9 @@
</span><span class="cx"> unsigned length = m_whitespace->textLength();
</span><span class="cx"> unsigned pos = length >= 2 ? length - 2 : UINT_MAX;
</span><span class="cx"> InlineIterator endMid(0, m_whitespace, pos);
</span><del>- startIgnoringSpaces(lineMidpointState, endMid);
</del><ins>+ lineMidpointState.startIgnoringSpaces(endMid);
</ins><span class="cx"> for (size_t i = 0; i < m_boxes.size(); ++i)
</span><del>- ensureLineBoxInsideIgnoredSpaces(lineMidpointState, m_boxes[i]);
</del><ins>+ lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_boxes[i]);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -365,12 +334,12 @@
</span><span class="cx"> // need to check for floats to clear - so if we're ignoring spaces, stop ignoring them and add a
</span><span class="cx"> // run for this object.
</span><span class="cx"> if (m_ignoringSpaces && m_currentStyle->clear() != CNONE)
</span><del>- ensureLineBoxInsideIgnoredSpaces(m_lineMidpointState, br);
</del><ins>+ m_lineMidpointState.ensureLineBoxInsideIgnoredSpaces(br);
</ins><span class="cx"> // If we were preceded by collapsing space and are in a right-aligned container we need to ensure the space gets
</span><span class="cx"> // collapsed away so that it doesn't push the text out from the container's right-hand edge.
</span><span class="cx"> // FIXME: Do this regardless of the container's alignment - will require rebaselining a lot of test results.
</span><span class="cx"> else if (m_ignoringSpaces && (m_blockStyle.textAlign() == RIGHT || m_blockStyle.textAlign() == WEBKIT_RIGHT))
</span><del>- stopIgnoringSpaces(m_lineMidpointState, InlineIterator(0, m_current.renderer(), m_current.m_pos));
</del><ins>+ m_lineMidpointState.stopIgnoringSpaces(InlineIterator(0, m_current.renderer(), m_current.m_pos));
</ins><span class="cx">
</span><span class="cx"> if (!m_lineInfo.isEmpty())
</span><span class="cx"> clear = m_currentStyle->clear();
</span><span class="lines">@@ -443,7 +412,7 @@
</span><span class="cx"> // then start ignoring spaces again.
</span><span class="cx"> if (isInlineType || box->container()->isRenderInline()) {
</span><span class="cx"> if (m_ignoringSpaces)
</span><del>- ensureLineBoxInsideIgnoredSpaces(m_lineMidpointState, box);
</del><ins>+ m_lineMidpointState.ensureLineBoxInsideIgnoredSpaces(box);
</ins><span class="cx"> m_trailingObjects.appendBoxIfNeeded(box);
</span><span class="cx"> } else
</span><span class="cx"> positionedObjects.append(box);
</span><span class="lines">@@ -485,7 +454,7 @@
</span><span class="cx"> RenderText* nextText = toRenderText(next);
</span><span class="cx"> UChar nextChar = nextText->characterAt(0);
</span><span class="cx"> if (nextText->style().isCollapsibleWhiteSpace(nextChar)) {
</span><del>- startIgnoringSpaces(lineMidpointState, InlineIterator(0, o, 0));
</del><ins>+ lineMidpointState.startIgnoringSpaces(InlineIterator(0, o, 0));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -512,7 +481,7 @@
</span><span class="cx"> m_lineInfo.setEmpty(false, &m_block, &m_width);
</span><span class="cx"> if (m_ignoringSpaces) {
</span><span class="cx"> m_trailingObjects.clear();
</span><del>- ensureLineBoxInsideIgnoredSpaces(m_lineMidpointState, m_current.renderer());
</del><ins>+ m_lineMidpointState.ensureLineBoxInsideIgnoredSpaces(m_current.renderer());
</ins><span class="cx"> } else if (m_blockStyle.collapseWhiteSpace() && m_resolver.position().renderer() == m_current.renderer()
</span><span class="cx"> && shouldSkipWhitespaceAfterStartObject(m_block, m_current.renderer(), m_lineMidpointState)) {
</span><span class="cx"> // Like with list markers, we start ignoring spaces to make sure that any
</span><span class="lines">@@ -541,7 +510,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_ignoringSpaces)
</span><del>- stopIgnoringSpaces(m_lineMidpointState, InlineIterator(0, m_current.renderer(), 0));
</del><ins>+ m_lineMidpointState.stopIgnoringSpaces(InlineIterator(0, m_current.renderer(), 0));
</ins><span class="cx">
</span><span class="cx"> m_lineInfo.setEmpty(false, &m_block, &m_width);
</span><span class="cx"> m_ignoringSpaces = false;
</span><span class="lines">@@ -673,8 +642,8 @@
</span><span class="cx"> inline void ensureCharacterGetsLineBox(LineMidpointState& lineMidpointState, InlineIterator& textParagraphSeparator)
</span><span class="cx"> {
</span><span class="cx"> InlineIterator midpoint(0, textParagraphSeparator.renderer(), textParagraphSeparator.m_pos);
</span><del>- startIgnoringSpaces(lineMidpointState, InlineIterator(0, textParagraphSeparator.renderer(), textParagraphSeparator.m_pos - 1));
- stopIgnoringSpaces(lineMidpointState, InlineIterator(0, textParagraphSeparator.renderer(), textParagraphSeparator.m_pos));
</del><ins>+ lineMidpointState.startIgnoringSpaces(InlineIterator(0, textParagraphSeparator.renderer(), textParagraphSeparator.m_pos - 1));
+ lineMidpointState.stopIgnoringSpaces(InlineIterator(0, textParagraphSeparator.renderer(), textParagraphSeparator.m_pos));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void tryHyphenating(RenderText* text, const Font& font, const AtomicString& localeIdentifier, unsigned consecutiveHyphenatedLines, int consecutiveHyphenatedLinesLimit, int minimumPrefixLimit, int minimumSuffixLimit, unsigned lastSpace, unsigned pos, float xPos, int availableWidth, bool isFixedPitch, bool collapseWhiteSpace, int lastSpaceWordSpacing, InlineIterator& lineBreak, int nextBreakable, bool& hyphenated)
</span><span class="lines">@@ -856,7 +825,7 @@
</span><span class="cx"> m_ignoringSpaces = false;
</span><span class="cx"> wordSpacingForWordMeasurement = 0;
</span><span class="cx"> lastSpace = m_current.m_pos; // e.g., "Foo goo", don't add in any of the ignored spaces.
</span><del>- stopIgnoringSpaces(m_lineMidpointState, InlineIterator(0, m_current.renderer(), m_current.m_pos));
</del><ins>+ m_lineMidpointState.stopIgnoringSpaces(InlineIterator(0, m_current.renderer(), m_current.m_pos));
</ins><span class="cx"> stoppedIgnoringSpaces = true;
</span><span class="cx"> } else {
</span><span class="cx"> // Just keep ignoring these spaces.
</span><span class="lines">@@ -1000,7 +969,7 @@
</span><span class="cx"> // We just entered a mode where we are ignoring
</span><span class="cx"> // spaces. Create a midpoint to terminate the run
</span><span class="cx"> // before the second space.
</span><del>- startIgnoringSpaces(m_lineMidpointState, m_startOfIgnoredSpaces);
</del><ins>+ m_lineMidpointState.startIgnoringSpaces(m_startOfIgnoredSpaces);
</ins><span class="cx"> m_trailingObjects.updateMidpointsForTrailingBoxes(m_lineMidpointState, InlineIterator(), TrailingObjects::DoNotCollapseFirstSpace);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1011,7 +980,7 @@
</span><span class="cx"> lastSpaceWordSpacing = applyWordSpacing ? wordSpacing : 0;
</span><span class="cx"> wordSpacingForWordMeasurement = (applyWordSpacing && wordMeasurements.last().width) ? wordSpacing : 0;
</span><span class="cx"> lastSpace = m_current.m_pos; // e.g., "Foo goo", don't add in any of the ignored spaces.
</span><del>- stopIgnoringSpaces(m_lineMidpointState, InlineIterator(0, m_current.renderer(), m_current.m_pos));
</del><ins>+ m_lineMidpointState.stopIgnoringSpaces(InlineIterator(0, m_current.renderer(), m_current.m_pos));
</ins><span class="cx"> }
</span><span class="cx"> #if ENABLE(SVG)
</span><span class="cx"> if (isSVGText && m_current.m_pos > 0) {
</span><span class="lines">@@ -1031,7 +1000,7 @@
</span><span class="cx"> m_startOfIgnoredSpaces.m_pos--;
</span><span class="cx"> // If there's just a single trailing space start ignoring it now so it collapses away.
</span><span class="cx"> if (m_current.m_pos == renderText->textLength() - 1)
</span><del>- startIgnoringSpaces(m_lineMidpointState, m_startOfIgnoredSpaces);
</del><ins>+ m_lineMidpointState.startIgnoringSpaces(m_startOfIgnoredSpaces);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>