Remove effective zoom from font metrics before SVG text layout.

Source/core/layout/svg/SVGTextLayoutEngineBaseline.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010. 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 11 matching lines @@
 
 #include "core/layout/LayoutObject.h"
 #include "core/style/SVGComputedStyle.h"
 #include "core/layout/svg/SVGTextMetrics.h"
 #include "core/svg/SVGLengthContext.h"
 #include "platform/fonts/Font.h"
 #include "platform/text/UnicodeRange.h"
 
 namespace blink {
 
-SVGTextLayoutEngineBaseline::SVGTextLayoutEngineBaseline(const Font& font)
+SVGTextLayoutEngineBaseline::SVGTextLayoutEngineBaseline(const Font& font, float effectiveZoom)
     : m_font(font)
+    , m_effectiveZoom(effectiveZoom)
 {
+    ASSERT(m_effectiveZoom);
 }
 
 float SVGTextLayoutEngineBaseline::calculateBaselineShift(const ComputedStyle& style) const
 {
     const SVGComputedStyle& svgStyle = style.svgStyle();
 
     switch (svgStyle.baselineShift()) {
     case BS_LENGTH:
-        return SVGLengthContext::valueForLength(svgStyle.baselineShiftValue(), style, m_font.fontDescription().computedPixelSize());
+        return SVGLengthContext::valueForLength(svgStyle.baselineShiftValue(), style, m_font.fontDescription().computedPixelSize() / m_effectiveZoom);
     case BS_SUB:
-        return -m_font.fontMetrics().floatHeight() / 2;
+        return -m_font.fontMetrics().floatHeight() / 2 / m_effectiveZoom;
     case BS_SUPER:
-        return m_font.fontMetrics().floatHeight() / 2;
+        return m_font.fontMetrics().floatHeight() / 2 / m_effectiveZoom;
     default:
         ASSERT_NOT_REACHED();
         return 0;
     }
 }
 
 EAlignmentBaseline SVGTextLayoutEngineBaseline::dominantBaselineToAlignmentBaseline(bool isVerticalText, const LayoutObject* textRenderer) const
 {
     ASSERT(textRenderer);
     ASSERT(textRenderer->style());
@@ skipping 50 matching lines @@
     ASSERT(textRendererParent);
 
     EAlignmentBaseline baseline = textRenderer->style()->svgStyle().alignmentBaseline();
     if (baseline == AB_AUTO || baseline == AB_BASELINE) {
         baseline = dominantBaselineToAlignmentBaseline(isVerticalText, textRendererParent);
         ASSERT(baseline != AB_AUTO && baseline != AB_BASELINE);
     }
 
     const FontMetrics& fontMetrics = m_font.fontMetrics();
 
+    float alignementBaselineShift = 0;

[Erik Dahlström (inactive), 2015/04/14 09:13:08]

s/alignement/alignment/

+
     // Note: http://wiki.apache.org/xmlgraphics-fop/LineLayout/AlignmentHandling
     switch (baseline) {
     case AB_BEFORE_EDGE:
     case AB_TEXT_BEFORE_EDGE:
-        return fontMetrics.floatAscent();
+        alignementBaselineShift = fontMetrics.floatAscent();
+        break;
     case AB_MIDDLE:
-        return fontMetrics.xHeight() / 2;
+        alignementBaselineShift = fontMetrics.xHeight() / 2;
+        break;
     case AB_CENTRAL:
-        return (fontMetrics.floatAscent() - fontMetrics.floatDescent()) / 2;
+        alignementBaselineShift = (fontMetrics.floatAscent() - fontMetrics.floatDescent()) / 2;
+        break;
     case AB_AFTER_EDGE:
     case AB_TEXT_AFTER_EDGE:
     case AB_IDEOGRAPHIC:
-        return -fontMetrics.floatDescent();
+        alignementBaselineShift = -fontMetrics.floatDescent();
+        break;
     case AB_ALPHABETIC:
-        return 0;
+        alignementBaselineShift = 0;
+        break;
     case AB_HANGING:
-        return fontMetrics.floatAscent() * 8 / 10.f;
+        alignementBaselineShift = fontMetrics.floatAscent() * 8 / 10.f;
+        break;
     case AB_MATHEMATICAL:
-        return fontMetrics.floatAscent() / 2;
+        alignementBaselineShift = fontMetrics.floatAscent() / 2;
+        break;
     case AB_BASELINE:
     default:
         ASSERT_NOT_REACHED();
-        return 0;
     }
+
+    if (m_effectiveZoom != 1)
+        alignementBaselineShift = alignementBaselineShift / m_effectiveZoom;

[fs, 2015/04/14 09:21:21]

Since we have a nit in effect already... I'd prefer this one as /=.

+
+    return alignementBaselineShift;
 }
 
 float SVGTextLayoutEngineBaseline::calculateGlyphOrientationAngle(bool isVerticalText, const SVGComputedStyle& style, const UChar& character) const
 {
     switch (isVerticalText ? style.glyphOrientationVertical() : style.glyphOrientationHorizontal()) {
     case GO_AUTO: {
         // Spec: Fullwidth ideographic and fullwidth Latin text will be set with a glyph-orientation of 0-degrees.
         // Text which is not fullwidth will be set with a glyph-orientation of 90-degrees.
         unsigned unicodeRange = findCharUnicodeRange(character);
         if (unicodeRange == cRangeSetLatin || unicodeRange == cRangeArabic)
@@ skipping 25 matching lines @@
     // The function is based on spec requirements:
     //
     // Spec: If the 'glyph-orientation-horizontal' results in an orientation angle that is not a multiple of
     // of 180 degrees, then the current text position is incremented according to the vertical metrics of the glyph.
     //
     // Spec: If if the 'glyph-orientation-vertical' results in an orientation angle that is not a multiple of
     // 180 degrees, then the current text position is incremented according to the horizontal metrics of the glyph.
 
     const FontMetrics& fontMetrics = m_font.fontMetrics();
 
+    float ascent = fontMetrics.floatAscent() / m_effectiveZoom;
+    float descent = fontMetrics.floatDescent() / m_effectiveZoom;
+
     // Vertical orientation handling.
     if (isVerticalText) {
-        float ascentMinusDescent = fontMetrics.floatAscent() - fontMetrics.floatDescent();
+        float ascentMinusDescent = ascent - descent;
+
         if (!angle) {
             xOrientationShift = (ascentMinusDescent - metrics.width()) / 2;
-            yOrientationShift = fontMetrics.floatAscent();
+            yOrientationShift = ascent;
         } else if (angle == 180) {
             xOrientationShift = (ascentMinusDescent + metrics.width()) / 2;
         } else if (angle == 270) {
             yOrientationShift = metrics.width();
             xOrientationShift = ascentMinusDescent;
         }
 
         // Vertical advance calculation.
         if (angle && !orientationIsMultiplyOf180Degrees)
             return metrics.width();
 
         return metrics.height();
     }
 
     // Horizontal orientation handling.
     if (angle == 90) {
         yOrientationShift = -metrics.width();
     } else if (angle == 180) {
         xOrientationShift = metrics.width();
-        yOrientationShift = -fontMetrics.floatAscent();
+        yOrientationShift = -ascent;
     } else if (angle == 270) {
         xOrientationShift = metrics.width();
     }
 
     // Horizontal advance calculation.
     if (angle && !orientationIsMultiplyOf180Degrees)
         return metrics.height();
 
     return metrics.width();
 }
 
 }