<!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>[163248] 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/163248">163248</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-01 12:37:15 -0800 (Sat, 01 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>SVGTextLayoutAttributesBuilder shouldn't use RenderText::deprecatedCharacters()
https://bugs.webkit.org/show_bug.cgi?id=128048
Reviewed by Sam Weinig.
Change UChar*& lastCharacter to bool& lastCharacterWasSpace since that's what the parameter was used for.
* rendering/svg/SVGTextLayoutAttributesBuilder.cpp:
(WebCore::SVGTextLayoutAttributesBuilder::buildLayoutAttributesForTextRenderer):
Initialize lastCharacterWasSpace to true to match the previous behavior.
(WebCore::SVGTextLayoutAttributesBuilder::buildLayoutAttributesForForSubtree):
Ditto.
(WebCore::processRenderSVGInlineText):
Take a reference instead of a pointer, get the character using RenderText::operator[] and compute lastCharacterWasSpace.
(WebCore::SVGTextLayoutAttributesBuilder::collectTextPositioningElements):
This now takes a bool reference instead.
* rendering/svg/SVGTextLayoutAttributesBuilder.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextLayoutAttributesBuildercpp">trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGTextLayoutAttributesBuilderh">trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163247 => 163248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-01 20:29:23 UTC (rev 163247)
+++ trunk/Source/WebCore/ChangeLog 2014-02-01 20:37:15 UTC (rev 163248)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-02-01 Anders Carlsson <andersca@apple.com>
+
+ SVGTextLayoutAttributesBuilder shouldn't use RenderText::deprecatedCharacters()
+ https://bugs.webkit.org/show_bug.cgi?id=128048
+
+ Reviewed by Sam Weinig.
+
+ Change UChar*& lastCharacter to bool& lastCharacterWasSpace since that's what the parameter was used for.
+
+ * rendering/svg/SVGTextLayoutAttributesBuilder.cpp:
+ (WebCore::SVGTextLayoutAttributesBuilder::buildLayoutAttributesForTextRenderer):
+ Initialize lastCharacterWasSpace to true to match the previous behavior.
+
+ (WebCore::SVGTextLayoutAttributesBuilder::buildLayoutAttributesForForSubtree):
+ Ditto.
+
+ (WebCore::processRenderSVGInlineText):
+ Take a reference instead of a pointer, get the character using RenderText::operator[] and compute lastCharacterWasSpace.
+
+ (WebCore::SVGTextLayoutAttributesBuilder::collectTextPositioningElements):
+ This now takes a bool reference instead.
+
+ * rendering/svg/SVGTextLayoutAttributesBuilder.h:
+
</ins><span class="cx"> 2014-02-01 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IDB: Index cursor complete advance() and iterate() support
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextLayoutAttributesBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp (163247 => 163248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp 2014-02-01 20:29:23 UTC (rev 163247)
+++ trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp 2014-02-01 20:37:15 UTC (rev 163248)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> m_characterDataMap.clear();
</span><span class="cx">
</span><span class="cx"> m_textLength = 0;
</span><del>- const UChar* lastCharacter = 0;
- collectTextPositioningElements(textRoot, lastCharacter);
</del><ins>+ bool lastCharacterWasSpace = true;
+ collectTextPositioningElements(textRoot, lastCharacterWasSpace);
</ins><span class="cx">
</span><span class="cx"> if (!m_textLength)
</span><span class="cx"> return;
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx">
</span><span class="cx"> if (m_textPositions.isEmpty()) {
</span><span class="cx"> m_textLength = 0;
</span><del>- const UChar* lastCharacter = 0;
- collectTextPositioningElements(textRoot, lastCharacter);
</del><ins>+ bool lastCharacterWasSpace = true;
+ collectTextPositioningElements(textRoot, lastCharacterWasSpace);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_textLength)
</span><span class="lines">@@ -81,32 +81,30 @@
</span><span class="cx"> m_metricsBuilder.measureTextRenderer(text);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void processRenderSVGInlineText(RenderSVGInlineText* text, unsigned& atCharacter, const UChar*& lastCharacter)
</del><ins>+static inline void processRenderSVGInlineText(const RenderSVGInlineText& text, unsigned& atCharacter, bool& lastCharacterWasSpace)
</ins><span class="cx"> {
</span><del>- if (text->style().whiteSpace() == PRE) {
- atCharacter += text->textLength();
</del><ins>+ if (text.style().whiteSpace() == PRE) {
+ atCharacter += text.textLength();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const UChar* characters = text->deprecatedCharacters();
- unsigned textLength = text->textLength();
- for (unsigned textPosition = 0; textPosition < textLength; ++textPosition) {
- const UChar* currentCharacter = characters + textPosition;
- if (*currentCharacter == ' ' && (!lastCharacter || *lastCharacter == ' '))
</del><ins>+ for (unsigned textPosition = 0, textLength = text.textLength(); textPosition < textLength; ++textPosition) {
+ const UChar currentCharacter = text[textPosition];
+ if (currentCharacter == ' ' && lastCharacterWasSpace)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- lastCharacter = currentCharacter;
</del><ins>+ lastCharacterWasSpace = currentCharacter == ' ';
</ins><span class="cx"> ++atCharacter;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGTextLayoutAttributesBuilder::collectTextPositioningElements(RenderObject* start, const UChar*& lastCharacter)
</del><ins>+void SVGTextLayoutAttributesBuilder::collectTextPositioningElements(RenderObject* start, bool& lastCharacterWasSpace)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!start->isSVGText() || m_textPositions.isEmpty());
</span><span class="cx">
</span><span class="cx"> for (RenderObject* child = start->firstChildSlow(); child; child = child->nextSibling()) {
</span><span class="cx"> if (child->isSVGInlineText()) {
</span><del>- processRenderSVGInlineText(toRenderSVGInlineText(child), m_textLength, lastCharacter);
</del><ins>+ processRenderSVGInlineText(*toRenderSVGInlineText(child), m_textLength, lastCharacterWasSpace);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -118,7 +116,7 @@
</span><span class="cx"> if (element)
</span><span class="cx"> m_textPositions.append(TextPosition(element, m_textLength));
</span><span class="cx">
</span><del>- collectTextPositioningElements(child, lastCharacter);
</del><ins>+ collectTextPositioningElements(child, lastCharacterWasSpace);
</ins><span class="cx">
</span><span class="cx"> if (!element)
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGTextLayoutAttributesBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h (163247 => 163248)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h 2014-02-01 20:29:23 UTC (rev 163247)
+++ trunk/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.h 2014-02-01 20:37:15 UTC (rev 163248)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void buildCharacterDataMap(RenderSVGText*);
</span><del>- void collectTextPositioningElements(RenderObject*, const UChar*& lastCharacter);
</del><ins>+ void collectTextPositioningElements(RenderObject*, bool& lastCharacterWasSpace);
</ins><span class="cx"> void fillCharacterDataMap(const TextPosition&);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>