Remove SVG fonts

Source/core/rendering/svg/SVGTextLayoutEngineSpacing.cpp

Index: Source/core/rendering/svg/SVGTextLayoutEngineSpacing.cpp
diff --git a/Source/core/rendering/svg/SVGTextLayoutEngineSpacing.cpp b/Source/core/rendering/svg/SVGTextLayoutEngineSpacing.cpp
index 5fcb4996fd861c268d3a7af1f1f6e1d04b35cfde..72ddf679fd26c0054b72eb143e6f21da8a85ed56 100644
--- a/Source/core/rendering/svg/SVGTextLayoutEngineSpacing.cpp
+++ b/Source/core/rendering/svg/SVGTextLayoutEngineSpacing.cpp
@@ -25,62 +25,19 @@
 #include "platform/fonts/Character.h"
 #include "platform/fonts/Font.h"
 
-#if ENABLE(SVG_FONTS)
-#include "core/svg/SVGFontData.h"
-#include "core/svg/SVGFontElement.h"
-#include "core/svg/SVGFontFaceElement.h"
-#endif
-
 namespace blink {
 
 SVGTextLayoutEngineSpacing::SVGTextLayoutEngineSpacing(const Font& font, float effectiveZoom)
     : m_font(font)
     , m_lastCharacter(0)
     , m_effectiveZoom(effectiveZoom)
-#if ENABLE(SVG_FONTS)
-    , m_lastGlyph(0)
-#endif
 {
     ASSERT(m_effectiveZoom);
 }
 
-float SVGTextLayoutEngineSpacing::calculateSVGKerning(bool isVerticalText, Glyph currentGlyph)
+float SVGTextLayoutEngineSpacing::calculateSVGKerning(bool /*isVerticalText*/, Glyph /*currentGlyph*/)

[eae, 2014/10/23 22:02:34]

Can we remove this method entirely now (or in the future)?

[pdr., 2014/10/23 22:15:34]

Done.

 {
-#if ENABLE(SVG_FONTS)
-    const SimpleFontData* fontData = m_font.primaryFont();
-    if (!fontData->isSVGFont()) {
-        m_lastGlyph = 0;
-        return 0;
-    }
-
-    ASSERT(fontData->isCustomFont());
-    ASSERT(fontData->isSVGFont());
-
-    RefPtr<CustomFontData> customFontData = fontData->customFontData();
-    SVGFontFaceElement* svgFontFace = toSVGFontData(customFontData)->svgFontFaceElement();
-    ASSERT(svgFontFace);
-
-    SVGFontElement* svgFont = svgFontFace->associatedFontElement();
-    if (!svgFont) {
-        m_lastGlyph = 0;
-        return 0;
-    }
-
-    float kerning = 0;
-    if (m_lastGlyph) {
-        if (isVerticalText)
-            kerning = svgFont->verticalKerningForPairOfGlyphs(m_lastGlyph, currentGlyph);
-        else
-            kerning = svgFont->horizontalKerningForPairOfGlyphs(m_lastGlyph, currentGlyph);
-
-        kerning *= m_font.fontDescription().computedSize() / m_font.fontMetrics().unitsPerEm();
-    }
-
-    m_lastGlyph = currentGlyph;
-    return kerning;
-#else
     return 0;
-#endif
 }
 
 float SVGTextLayoutEngineSpacing::calculateCSSSpacing(UChar currentCharacter)