Use Length for baselineShiftValue in SVGLayoutStyle

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
  * 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"
 
 #include "core/layout/svg/SVGTextLayoutEngineBaseline.h"
 
 #include "core/layout/LayoutObject.h"
 #include "core/layout/style/SVGLayoutStyle.h"
 #include "core/layout/svg/SVGTextMetrics.h"
-#include "core/svg/SVGLengthContext.h"
+#include "platform/LengthFunctions.h"
 #include "platform/fonts/Font.h"
 #include "platform/text/UnicodeRange.h"
 
 namespace blink {
 
 SVGTextLayoutEngineBaseline::SVGTextLayoutEngineBaseline(const Font& font)
     : m_font(font)
 {
 }
 
-float SVGTextLayoutEngineBaseline::calculateBaselineShift(const SVGLayoutStyle& style, SVGElement* contextElement) const
+float SVGTextLayoutEngineBaseline::calculateBaselineShift(const LayoutStyle& style) const
 {
-    if (style.baselineShift() == BS_LENGTH) {
-        RefPtrWillBeRawPtr<SVGLength> baselineShiftValueLength = style.baselineShiftValue();
-        if (baselineShiftValueLength->unitType() == LengthTypePercentage)
-            return baselineShiftValueLength->scaleByPercentage(m_font.fontDescription().computedPixelSize());
+    const SVGLayoutStyle& svgStyle = style.svgStyle();
 
-        SVGLengthContext lengthContext(contextElement);
-        return baselineShiftValueLength->value(lengthContext);
+    switch (svgStyle.baselineShift()) {
+    case BS_LENGTH: {
+        const float zoom = style.effectiveZoom();
+        return floatValueForLength(svgStyle.baselineShiftValue(), m_font.fontDescription().computedPixelSize() * zoom) / zoom;

[pdr., 2015/02/25 19:21:15]

What do you think about moving this zoom calculation to a more central helper
function? (here, or in a later patch)

[fs, 2015/02/25 21:21:11]

I didn't see much use for it, since AFAIK this is a one-off. I suppose we could
do something like:

static float valueForLength(const Length&, float dimension, const LayoutStyle&[,
SVGLengthMode]);

on SVGLengthContext. Should mesh reasonably well with the existing one I think.
If that sounds ok/wanted I'm willing to do that as a follow-up.

     }
-
-    switch (style.baselineShift()) {
-    case BS_BASELINE:
-        return 0;
     case BS_SUB:
         return -m_font.fontMetrics().floatHeight() / 2;
     case BS_SUPER:
         return m_font.fontMetrics().floatHeight() / 2;
     default:
         ASSERT_NOT_REACHED();
         return 0;
     }
 }
 
@@ skipping 161 matching lines @@
     }
 
     // Horizontal advance calculation.
     if (angle && !orientationIsMultiplyOf180Degrees)
         return metrics.height();
 
     return metrics.width();
 }
 
 }