Rebuild layout attributes on layout instead of on layout tree updates

third_party/WebKit/Source/core/layout/svg/SVGTextMetricsBuilder.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010-2012. 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 303 matching lines @@
         }
 
         if (calculator.currentCharacterStartsSurrogatePair())
             surrogatePairCharacters++;
         textState.lastCharacterWasWhiteSpace = currentCharacterIsWhiteSpace;
     } while (calculator.advancePosition());
 
     textState.valueListPosition += calculator.currentPosition() - skippedWhitespace;
 }
 
-void walkTree(LayoutSVGText* start, LayoutSVGInlineText* stopAtText, SVGCharacterDataMap* allCharactersMap = nullptr)
+void walkTree(LayoutSVGText& start, LayoutSVGInlineText* stopAtText, SVGCharacterDataMap* allCharactersMap = nullptr)
 {
     TreeWalkTextState textState;
-    LayoutObject* child = start->firstChild();
+    LayoutObject* child = start.firstChild();
     while (child) {
         if (child->isSVGInlineText()) {
             LayoutSVGInlineText* text = toLayoutSVGInlineText(child);
             OwnPtr<UpdateAttributes> attributesToUpdate = nullptr;
             if (!stopAtText || stopAtText == text)
                 attributesToUpdate = adoptPtr(new UpdateAttributes(*text->layoutAttributes(), text->metricsList(), allCharactersMap));
             walkInlineText(text, textState, attributesToUpdate.get());
             if (stopAtText == text)
                 return;
         } else if (child->isSVGInline()) {
             // Visit children of text content elements.
             if (LayoutObject* inlineChild = toLayoutSVGInline(child)->firstChild()) {
                 child = inlineChild;
                 continue;
             }
         }
-        child = child->nextInPreOrderAfterChildren(start);
+        child = child->nextInPreOrderAfterChildren(&start);
     }
 }
 
 } // namespace
 
-void SVGTextMetricsBuilder::measureTextLayoutObject(LayoutSVGInlineText* text)
+void SVGTextMetricsBuilder::measureTextLayoutObject(LayoutSVGText& textRoot, LayoutSVGInlineText& text)
 {
-    ASSERT(text);
-    if (LayoutSVGText* textRoot = LayoutSVGText::locateLayoutSVGTextAncestor(text))
-        walkTree(textRoot, text);
+    walkTree(textRoot, &text);
 }
 
-void SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(LayoutSVGText* textRoot, LayoutSVGInlineText* stopAtText, SVGCharacterDataMap& allCharactersMap)
+void SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(LayoutSVGText& textRoot, SVGCharacterDataMap& allCharactersMap)
 {
-    ASSERT(textRoot);
-    walkTree(textRoot, stopAtText, &allCharactersMap);
+    walkTree(textRoot, nullptr, &allCharactersMap);
 }
 
 } // namespace blink