Merge 87846 - 2011-06-01 Levi Weintraub <leviw@chromium.org>

Source/WebCore/rendering/svg/RenderSVGInlineText.cpp

Index: Source/WebCore/rendering/svg/RenderSVGInlineText.cpp
===================================================================
--- Source/WebCore/rendering/svg/RenderSVGInlineText.cpp	(revision 89363)
+++ Source/WebCore/rendering/svg/RenderSVGInlineText.cpp	(working copy)
@@ -235,15 +235,15 @@
 
     Document* document = renderer->document();
     ASSERT(document);
-
+    
     CSSStyleSelector* styleSelector = document->styleSelector();
     ASSERT(styleSelector);
 
-    // Alter font-size to the right on-screen value, to avoid scaling the glyphs themselves.
+    // Alter font-size to the right on-screen value to avoid scaling the glyphs themselves, except when GeometricPrecision is specified
     AffineTransform ctm;
     SVGImageBufferTools::calculateTransformationToOutermostSVGCoordinateSystem(renderer, ctm);
     scalingFactor = narrowPrecisionToFloat(sqrt((pow(ctm.xScale(), 2) + pow(ctm.yScale(), 2)) / 2));
-    if (scalingFactor == 1 || !scalingFactor) {
+    if (scalingFactor == 1 || !scalingFactor || style->fontDescription().textRenderingMode() == GeometricPrecision) {
         scalingFactor = 1;
         scaledFont = style->font();
         return;