Include the surrogate character count when updating text state

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 265 matching lines @@
         bool currentCharacterIsWhiteSpace = calculator.currentCharacterIsWhiteSpace();
         if (currentCharacterIsWhiteSpace && !preserveWhiteSpace && textState.lastCharacterWasWhiteSpace) {
             if (attributesToUpdate)
                 attributesToUpdate->addMetrics(SVGTextMetrics(SVGTextMetrics::SkippedSpaceMetrics));
             ASSERT(calculator.currentCharacterMetrics().length() == 1);
             skippedWhitespace++;
             continue;
         }
 
         if (attributesToUpdate) {
-            attributesToUpdate->updateCharacterDataMap(textState.valueListPosition - skippedWhitespace - surrogatePairCharacters + calculator.currentPosition() + 1, calculator.currentPosition() + 1);
+            unsigned currentTextValueListPosition = calculator.currentPosition() - skippedWhitespace - surrogatePairCharacters;
+            attributesToUpdate->updateCharacterDataMap(textState.valueListPosition + currentTextValueListPosition + 1, calculator.currentPosition() + 1);
             attributesToUpdate->addMetrics(calculator.currentCharacterMetrics());
         }
 
         if (calculator.currentCharacterStartsSurrogatePair())
             surrogatePairCharacters++;
         textState.lastCharacterWasWhiteSpace = currentCharacterIsWhiteSpace;
     } while (calculator.advancePosition());
 
-    textState.valueListPosition += calculator.currentPosition() - skippedWhitespace;
+    unsigned currentTextValueListPosition = calculator.currentPosition() - skippedWhitespace - surrogatePairCharacters;
+    textState.valueListPosition += currentTextValueListPosition;
 }
 
 void walkTree(LayoutSVGText* start, LayoutSVGInlineText* stopAtText, SVGCharacterDataMap* allCharactersMap = nullptr)
 {
     TreeWalkTextState textState;
     LayoutObject* child = start->firstChild();
     while (child) {
         if (child->isSVGInlineText()) {
             LayoutSVGInlineText* text = toLayoutSVGInlineText(child);
             OwnPtr<UpdateAttributes> attributesToUpdate = nullptr;
@@ skipping 22 matching lines @@
         walkTree(textRoot, text);
 }
 
 void SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(LayoutSVGText* textRoot, LayoutSVGInlineText* stopAtText, SVGCharacterDataMap& allCharactersMap)
 {
     ASSERT(textRoot);
     walkTree(textRoot, stopAtText, &allCharactersMap);
 }
 
 } // namespace blink