Remove the last SVG callers of bloatedCharacters

Source/core/rendering/svg/SVGTextLayoutAttributesBuilder.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 26 matching lines @@
     ASSERT(text);
 
     RenderSVGText* textRoot = RenderSVGText::locateRenderSVGTextAncestor(text);
     if (!textRoot)
         return;
 
     if (m_textPositions.isEmpty()) {
         m_characterDataMap.clear();
 
         m_textLength = 0;
-        const UChar* lastCharacter = 0;
+        UChar lastCharacter = ' ';
         collectTextPositioningElements(textRoot, lastCharacter);
 
         if (!m_textLength)
             return;
 
         buildCharacterDataMap(textRoot);
     }
 
     m_metricsBuilder.buildMetricsAndLayoutAttributes(textRoot, text, m_characterDataMap);
 }
 
 bool SVGTextLayoutAttributesBuilder::buildLayoutAttributesForForSubtree(RenderSVGText* textRoot)
 {
     ASSERT(textRoot);
 
     m_characterDataMap.clear();
 
     if (m_textPositions.isEmpty()) {
         m_textLength = 0;
-        const UChar* lastCharacter = 0;
+        UChar lastCharacter = ' ';
         collectTextPositioningElements(textRoot, lastCharacter);
     }
 
     if (!m_textLength)
         return false;
 
     buildCharacterDataMap(textRoot);
     m_metricsBuilder.buildMetricsAndLayoutAttributes(textRoot, 0, m_characterDataMap);
     return true;
 }
 
 void SVGTextLayoutAttributesBuilder::rebuildMetricsForTextRenderer(RenderSVGInlineText* text)
 {
     ASSERT(text);
     m_metricsBuilder.measureTextRenderer(text);
 }
 
-static inline void processRenderSVGInlineText(RenderSVGInlineText* text, unsigned& atCharacter, const UChar*& lastCharacter)
+static inline void processRenderSVGInlineText(RenderSVGInlineText* text, unsigned& atCharacter, UChar& lastCharacter)
 {
     if (text->style()->whiteSpace() == PRE) {
         atCharacter += text->textLength();
         return;
     }
 
-    const UChar* characters = text->bloatedCharacters();
     unsigned textLength = text->textLength();    
     for (unsigned textPosition = 0; textPosition < textLength; ++textPosition) {
-        const UChar* currentCharacter = characters + textPosition;
-        if (*currentCharacter == ' ' && (!lastCharacter || *lastCharacter == ' '))
+        UChar currentCharacter = text->characterAt(textPosition);
+        if (currentCharacter == ' ' && lastCharacter == ' ')
             continue;
 
         lastCharacter = currentCharacter;
         ++atCharacter;
     }
 }
 
-void SVGTextLayoutAttributesBuilder::collectTextPositioningElements(RenderObject* start, const UChar*& lastCharacter)
+void SVGTextLayoutAttributesBuilder::collectTextPositioningElements(RenderObject* start, UChar& lastCharacter)
 {
     ASSERT(!start->isSVGText() || m_textPositions.isEmpty());
 
     for (RenderObject* child = start->firstChild(); child; child = child->nextSibling()) { 
         if (child->isSVGInlineText()) {
             processRenderSVGInlineText(toRenderSVGInlineText(child), m_textLength, lastCharacter);
             continue;
         }
 
         if (!child->isSVGInline())
@@ skipping 111 matching lines @@
             data.rotate = lastRotation;
             m_characterDataMap.set(position.start + i + 1, data);
             continue;
         }
 
         it->value.rotate = lastRotation;
     }
 }
 
 }