Merge 107862 - REGRESSION(r105057): Dynamically changing <tspan> offsets is broken

Source/WebCore/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 61 matching lines @@
     Vector<SVGTextLayoutAttributes*>& layoutAttributes = textRoot->layoutAttributes();
 
     size_t layoutAttributesSize = layoutAttributes.size();
     for (size_t i = 0; i < layoutAttributesSize; ++i)
         m_metricsBuilder.measureTextRenderer(layoutAttributes[i]->context());
 }
 
 bool SVGTextLayoutAttributesBuilder::buildLayoutAttributesIfNeeded(RenderSVGText* textRoot)
 {
     ASSERT(textRoot);
-    if (!m_textPositions.isEmpty())
-        return m_textLength;
 
-    m_textLength = 0;
-    const UChar* lastCharacter = 0;
-    collectTextPositioningElements(textRoot, lastCharacter);
+    if (m_textPositions.isEmpty()) {
+        m_textLength = 0;
+        const UChar* lastCharacter = 0;
+        collectTextPositioningElements(textRoot, lastCharacter);
+    }
 
     m_characterDataMap.clear();
     if (!m_textLength)
         return false;
 
     buildLayoutAttributes(textRoot);
     return true;
 }
 
 static inline void processRenderSVGInlineText(RenderSVGInlineText* text, unsigned& atCharacter, const UChar*& lastCharacter)
@@ skipping 149 matching lines @@
             continue;
         }
 
         it->second.rotate = lastRotation;
     }
 }
 
 }
 
 #endif // ENABLE(SVG)