More explicit SVGTextMetrics construction

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 57 matching lines @@
 
     // Ensure |m_subrunRanges| is updated for the current bidi run, or the
     // complete m_run if no bidi runs are present. Returns the current position
     // in the subrun which can be used to index into |m_subrunRanges|.
     unsigned updateSubrunRangesForCurrentPosition();
 
     // Current character position in m_text.
     unsigned m_currentPosition;
 
     LineLayoutSVGInlineText m_text;
+    float m_fontScalingFactor;
+    float m_cachedFontHeight;
     TextRun m_run;
 
     BidiCharacterRun* m_bidiRun;
     BidiResolver<TextRunIterator, BidiCharacterRun> m_bidiResolver;
 
     // Ranges for the current bidi run if present, or the entire run otherwise.
     Vector<CharacterRange> m_subrunRanges;
 };
 
 TextRun SVGTextMetricsCalculator::constructTextRun(LineLayoutSVGInlineText textLayoutItem, unsigned position, unsigned length, TextDirection textDirection)
@@ skipping 20 matching lines @@
 
     // Propagate the maximum length of the characters buffer to the TextRun, even when we're only processing a substring.
     run.setCharactersLength(textLayoutItem.textLength() - position);
     ASSERT(run.charactersLength() >= run.length());
     return run;
 }
 
 SVGTextMetricsCalculator::SVGTextMetricsCalculator(LayoutSVGInlineText* text)
     : m_currentPosition(0)
     , m_text(LineLayoutSVGInlineText(text))
+    , m_fontScalingFactor(m_text.scalingFactor())
+    , m_cachedFontHeight(m_text.scaledFont().getFontMetrics().floatHeight() / m_fontScalingFactor)
     , m_run(constructTextRun(m_text, 0, m_text.textLength(), m_text.styleRef().direction()))
     , m_bidiRun(nullptr)
 {
     setupBidiRuns();
 }
 
 SVGTextMetricsCalculator::~SVGTextMetricsCalculator()
 {
     if (m_bidiRun)
         m_bidiResolver.runs().deleteRuns();
@@ skipping 72 matching lines @@
         return 0;
 
     return positionInRun;
 }
 
 SVGTextMetrics SVGTextMetricsCalculator::currentCharacterMetrics()
 {
     unsigned currentSubrunPosition = updateSubrunRangesForCurrentPosition();
     unsigned length = currentCharacterStartsSurrogatePair() ? 2 : 1;
     float width = m_subrunRanges[currentSubrunPosition].width();
-    return SVGTextMetrics(m_text, length, width);
+    return SVGTextMetrics(length, width / m_fontScalingFactor, m_cachedFontHeight);
 }
 
 struct TreeWalkTextState {
     TreeWalkTextState()
         : lastCharacterWasWhiteSpace(true)
         , valueListPosition(0) { }
 
     bool lastCharacterWasWhiteSpace;
     unsigned valueListPosition;
 };
@@ skipping 104 matching lines @@
         walkTree(textRoot, text);
 }
 
 void SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(LayoutSVGText* textRoot, LayoutSVGInlineText* stopAtText, SVGCharacterDataMap& allCharactersMap)
 {
     ASSERT(textRoot);
     walkTree(textRoot, stopAtText, &allCharactersMap);
 }
 
 } // namespace blink