webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 12 insertions, 8 deletions

diff --git a/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp b/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp
index cb5d07496..f0107c4ab 100644
--- a/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp
+++ b/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.cpp
@@ -18,9 +18,11 @@
  */
 
 #include "config.h"
+
+#if ENABLE(SVG)
 #include "SVGTextLayoutEngineSpacing.h"
 
-#include "FontCascade.h"
+#include "Font.h"
 #include "SVGLengthContext.h"
 #include "SVGRenderStyle.h"
 
@@ -32,7 +34,7 @@
 
 namespace WebCore {
 
-SVGTextLayoutEngineSpacing::SVGTextLayoutEngineSpacing(const FontCascade& font)
+SVGTextLayoutEngineSpacing::SVGTextLayoutEngineSpacing(const Font& font)
     : m_font(font)
     , m_lastCharacter(0)
 {
@@ -41,16 +43,16 @@ SVGTextLayoutEngineSpacing::SVGTextLayoutEngineSpacing(const FontCascade& font)
 float SVGTextLayoutEngineSpacing::calculateSVGKerning(bool isVerticalText, const SVGTextMetrics::Glyph& currentGlyph)
 {
 #if ENABLE(SVG_FONTS)
-    const Font& font = m_font.primaryFont();
-    if (!font.isSVGFont()) {
+    const SimpleFontData* fontData = m_font.primaryFont();
+    if (!fontData->isSVGFont()) {
         m_lastGlyph.isValid = false;
         return 0;
     }
 
-    ASSERT(font.isCustomFont());
-    ASSERT(font.isSVGFont());
+    ASSERT(fontData->isCustomFont());
+    ASSERT(fontData->isSVGFont());
 
-    auto* svgFontData = static_cast<const SVGFontData*>(font.svgData());
+    const SVGFontData* svgFontData = static_cast<const SVGFontData*>(fontData->fontData());
     SVGFontFaceElement* svgFontFace = svgFontData->svgFontFaceElement();
     ASSERT(svgFontFace);
 
@@ -98,7 +100,7 @@ float SVGTextLayoutEngineSpacing::calculateCSSKerningAndSpacing(const SVGRenderS
 
     float spacing = m_font.letterSpacing() + kerning;
     if (currentCharacter && lastCharacter && m_font.wordSpacing()) {
-        if (FontCascade::treatAsSpace(*currentCharacter) && !FontCascade::treatAsSpace(*lastCharacter))
+        if (Font::treatAsSpace(*currentCharacter) && !Font::treatAsSpace(*lastCharacter))
             spacing += m_font.wordSpacing();
     }
 
@@ -106,3 +108,5 @@ float SVGTextLayoutEngineSpacing::calculateCSSKerningAndSpacing(const SVGRenderS
 }
 
 }
+
+#endif // ENABLE(SVG)