Merge 117225

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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 
 #if ENABLE(SVG)
 #include "SVGTextLayoutAttributesBuilder.h"
 
 #include "RenderSVGInlineText.h"
 #include "RenderSVGText.h"
 #include "SVGTextPositioningElement.h"
 
-// Set to a value > 0 to dump the text layout attributes
-#define DUMP_TEXT_LAYOUT_ATTRIBUTES 0
-
 namespace WebCore {
 
 SVGTextLayoutAttributesBuilder::SVGTextLayoutAttributesBuilder()
     : m_textLength(0)
 {
 }
 
 void SVGTextLayoutAttributesBuilder::buildLayoutAttributesForTextRenderer(RenderSVGInlineText* text)
 {
     ASSERT(text);
 
     RenderSVGText* textRoot = RenderSVGText::locateRenderSVGTextAncestor(text);
     if (!textRoot)
         return;
 
-    if (!buildLayoutAttributesIfNeeded(textRoot))
-        return;
+    if (m_textPositions.isEmpty()) {
+        m_characterDataMap.clear();
+
+        m_textLength = 0;
+        const UChar* lastCharacter = 0;
+        collectTextPositioningElements(textRoot, lastCharacter);
+
+        if (!m_textLength)
+            return;
+
+        buildCharacterDataMap(textRoot);
+    }
 
     m_metricsBuilder.buildMetricsAndLayoutAttributes(textRoot, text, m_characterDataMap);
 }
 
-void SVGTextLayoutAttributesBuilder::buildLayoutAttributesForWholeTree(RenderSVGText* textRoot)
+bool SVGTextLayoutAttributesBuilder::buildLayoutAttributesForForSubtree(RenderSVGText* textRoot)
 {
     ASSERT(textRoot);
 
-    if (!buildLayoutAttributesIfNeeded(textRoot))
-        return;
+    m_characterDataMap.clear();
 
+    if (m_textPositions.isEmpty()) {
+        m_textLength = 0;
+        const UChar* lastCharacter = 0;
+        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);
 }
 
-void SVGTextLayoutAttributesBuilder::rebuildMetricsForWholeTree(RenderSVGText* textRoot)
-{
-    ASSERT(textRoot);
-    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()) {
-        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)
 {
     if (text->style()->whiteSpace() == PRE) {
         atCharacter += text->textLength();
         return;
     }
 
     const UChar* characters = text->characters();
     unsigned textLength = text->textLength();    
     for (unsigned textPosition = 0; textPosition < textLength; ++textPosition) {
@@ skipping 29 matching lines @@
         if (!element)
             continue;
 
         // Update text position, after we're back from recursion.
         TextPosition& position = m_textPositions[atPosition];
         ASSERT(!position.length);
         position.length = m_textLength - position.start;
     }
 }
 
-void SVGTextLayoutAttributesBuilder::buildLayoutAttributes(RenderSVGText* textRoot)
+void SVGTextLayoutAttributesBuilder::buildCharacterDataMap(RenderSVGText* textRoot)
 {
-    ASSERT(m_textLength);
-
     SVGTextPositioningElement* outermostTextElement = SVGTextPositioningElement::elementFromRenderer(textRoot);
     ASSERT(outermostTextElement);
 
     // Grab outermost <text> element value lists and insert them in the character data map.
     TextPosition wholeTextPosition(outermostTextElement, 0, m_textLength);
     fillCharacterDataMap(wholeTextPosition);
 
     // Handle x/y default attributes.
     SVGCharacterDataMap::iterator it = m_characterDataMap.find(1);
     if (it == m_characterDataMap.end()) {
         SVGCharacterData data;
         data.x = 0;
         data.y = 0;
         m_characterDataMap.set(1, data);
     } else {
         SVGCharacterData& data = it->second;
         if (data.x == SVGTextLayoutAttributes::emptyValue())
             data.x = 0;
         if (data.y == SVGTextLayoutAttributes::emptyValue())
             data.y = 0;
     }
 
     // Fill character data map using child text positioning elements in top-down order. 
     unsigned size = m_textPositions.size();
     for (unsigned i = 0; i < size; ++i)
         fillCharacterDataMap(m_textPositions[i]);
-
-#if DUMP_TEXT_LAYOUT_ATTRIBUTES > 0
-    fprintf(stderr, "\nDumping ALL layout attributes for RenderSVGText, renderer=%p, node=%p (m_textLength: %i)\n", textRoot, textRoot->node(), m_textLength);
-    m_characterDataMap.dump();
-#endif
 }
 
 static inline void updateCharacterData(unsigned i, float& lastRotation, SVGCharacterData& data, const SVGLengthContext& lengthContext, const SVGLengthList* xList, const SVGLengthList* yList, const SVGLengthList* dxList, const SVGLengthList* dyList, const SVGNumberList* rotateList)
 {
     if (xList)
         data.x = xList->at(i).value(lengthContext);
     if (yList)
         data.y = yList->at(i).value(lengthContext);
     if (dxList)
         data.dx = dxList->at(i).value(lengthContext);
@@ skipping 56 matching lines @@
             continue;
         }
 
         it->second.rotate = lastRotation;
     }
 }
 
 }
 
 #endif // ENABLE(SVG)