Remove effective zoom from font metrics before length calculations

Source/core/svg/SVGLengthContext.cpp

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. 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.
@@ skipping 270 matching lines @@
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 float SVGLengthContext::convertValueFromUserUnitsToCHS(float value) const
 {
     const ComputedStyle* style = computedStyleForLengthResolving(m_context);
     if (!style)
         return 0;
 
-    float zeroWidth = style->fontMetrics().zeroWidth();
+    float zeroWidth = style->fontMetrics().zeroWidth() / style->effectiveZoom();
     if (!zeroWidth)
         return 0;
 
     return value / zeroWidth;
 }
 
 float SVGLengthContext::convertValueFromCHSToUserUnits(float value) const
 {
     const ComputedStyle* style = computedStyleForLengthResolving(m_context);
     if (!style)
         return 0;
 
-    return value * style->fontMetrics().zeroWidth();
+    return value * style->fontMetrics().zeroWidth() / style->effectiveZoom();
 }
 
 float SVGLengthContext::convertValueFromUserUnitsToEXS(float value) const
 {
     const ComputedStyle* style = computedStyleForLengthResolving(m_context);
     if (!style)
         return 0;
 
     // Use of ceil allows a pixel match to the W3Cs expected output of coords-units-03-b.svg
     // if this causes problems in real world cases maybe it would be best to remove this
-    float xHeight = ceilf(style->fontMetrics().xHeight());
+    float xHeight = ceilf(style->fontMetrics().xHeight() / style->effectiveZoom());
     if (!xHeight)
         return 0;
 
     return value / xHeight;
 }
 
 float SVGLengthContext::convertValueFromEXSToUserUnits(float value) const
 {
     const ComputedStyle* style = computedStyleForLengthResolving(m_context);
     if (!style)
         return 0;
 
     // Use of ceil allows a pixel match to the W3Cs expected output of coords-units-03-b.svg
     // if this causes problems in real world cases maybe it would be best to remove this
-    return value * ceilf(style->fontMetrics().xHeight());
+    return value * ceilf(style->fontMetrics().xHeight() / style->effectiveZoom());
 }
 
 bool SVGLengthContext::determineViewport(FloatSize& viewportSize) const
 {
     if (!m_context)
         return false;
 
     // Root <svg> element lengths are resolved against the top level viewport.
     if (m_context->isOutermostSVGSVGElement()) {
         viewportSize = toSVGSVGElement(m_context)->currentViewportSize();
         return true;
     }
 
     // Take size from nearest viewport element.
     SVGElement* viewportElement = m_context->viewportElement();
     if (!isSVGSVGElement(viewportElement))
         return false;
 
     const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
     viewportSize = svg.currentViewBoxRect().size();
     if (viewportSize.isEmpty())
         viewportSize = svg.currentViewportSize();
 
     return true;
 }
 
 }