webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 4 insertions, 14 deletions

diff --git a/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.h b/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.h
index 71d470737..8e98f2c87 100644
--- a/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.h
+++ b/Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.h
@@ -17,15 +17,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef SVGTextLayoutEngineSpacing_h
-#define SVGTextLayoutEngineSpacing_h
+#pragma once
 
-#if ENABLE(SVG)
 #include "SVGTextMetrics.h"
 
 namespace WebCore {
 
-class Font;
+class FontCascade;
 class SVGRenderStyle;
 class SVGElement;
 
@@ -33,21 +31,13 @@ class SVGElement;
 class SVGTextLayoutEngineSpacing {
     WTF_MAKE_NONCOPYABLE(SVGTextLayoutEngineSpacing);
 public:
-    SVGTextLayoutEngineSpacing(const Font&);
+    SVGTextLayoutEngineSpacing(const FontCascade&);
 
-    float calculateSVGKerning(bool isVerticalText, const SVGTextMetrics::Glyph& currentGlyph);
     float calculateCSSKerningAndSpacing(const SVGRenderStyle*, SVGElement* lengthContext, const UChar* currentCharacter);
 
 private:
-    const Font& m_font;
+    const FontCascade& m_font;
     const UChar* m_lastCharacter;
-
-#if ENABLE(SVG_FONTS)
-    SVGTextMetrics::Glyph m_lastGlyph;
-#endif
 };
 
 } // namespace WebCore
-
-#endif // ENABLE(SVG)
-#endif