Ignore minimum font-size for SVG text

third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.cpp

 /*
  * Copyright (C) 2006 Oliver Hunt <ojh16@student.canterbury.ac.nz>
  * Copyright (C) 2006 Apple Computer Inc.
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2008 Rob Buis <buis@kde.org>
  * 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
@@ skipping 349 matching lines @@
     TextRun subRun = constructTextRun(*this, bidiRun->start(),
                                       bidiRun->stop() - bidiRun->start(),
                                       bidiRun->direction());
     addMetricsFromRun(subRun, lastCharacterWasWhiteSpace);
   }
 
   bidiResolver.runs().deleteRuns();
 }
 
 void LayoutSVGInlineText::updateScaledFont() {
-  computeNewScaledFontForStyle(this, m_scalingFactor, m_scaledFont);
+  computeNewScaledFontForStyle(*this, m_scalingFactor, m_scaledFont);
 }
 
 void LayoutSVGInlineText::computeNewScaledFontForStyle(
-    LayoutObject* layoutObject,
+    const LayoutObject& layoutObject,
     float& scalingFactor,
     Font& scaledFont) {
-  const ComputedStyle* style = layoutObject->style();
-  ASSERT(style);
-  ASSERT(layoutObject);
+  const ComputedStyle& style = layoutObject.styleRef();
 
   // Alter font-size to the right on-screen value to avoid scaling the glyphs
   // themselves, except when GeometricPrecision is specified.
   scalingFactor =
-      SVGLayoutSupport::calculateScreenFontSizeScalingFactor(layoutObject);
-  if (style->effectiveZoom() == 1 && (scalingFactor == 1 || !scalingFactor)) {
+      SVGLayoutSupport::calculateScreenFontSizeScalingFactor(&layoutObject);
+  if (!scalingFactor) {
     scalingFactor = 1;
-    scaledFont = style->font();
+    scaledFont = style.font();
     return;
   }
 
-  if (style->getFontDescription().textRendering() == GeometricPrecision)
+  const FontDescription& unscaledFontDescription = style.getFontDescription();
+  if (unscaledFontDescription.textRendering() == GeometricPrecision)
     scalingFactor = 1;
 
-  FontDescription fontDescription(style->getFontDescription());
+  Document& document = layoutObject.document();
+  float scaledFontSize = FontSize::getComputedSizeFromSpecifiedSize(
+      &document, scalingFactor, unscaledFontDescription.isAbsoluteSize(),
+      unscaledFontDescription.specifiedSize(), DoNotApplyMinimumForFontSize);
+  if (scaledFontSize == unscaledFontDescription.computedSize()) {
+    scaledFont = style.font();
+    return;
+  }
 
-  Document& document = layoutObject->document();
-  // FIXME: We need to better handle the case when we compute very small fonts
-  // below (below 1pt).
-  fontDescription.setComputedSize(FontSize::getComputedSizeFromSpecifiedSize(
-      &document, scalingFactor, fontDescription.isAbsoluteSize(),
-      fontDescription.specifiedSize(), DoNotUseSmartMinimumForFontSize));
+  FontDescription fontDescription = unscaledFontDescription;
+  fontDescription.setComputedSize(scaledFontSize);
 
   scaledFont = Font(fontDescription);
   scaledFont.update(document.styleEngine().fontSelector());
 }
 
 LayoutRect LayoutSVGInlineText::absoluteVisualRect() const {
   return parent()->absoluteVisualRect();
 }
 
 FloatRect LayoutSVGInlineText::visualRectInLocalSVGCoordinates() const {
   return parent()->visualRectInLocalSVGCoordinates();
 }
 
 PassRefPtr<StringImpl> LayoutSVGInlineText::originalText() const {
   RefPtr<StringImpl> result = LayoutText::originalText();
   if (!result)
     return nullptr;
   return normalizeWhitespace(result);
 }
 
 }  // namespace blink