From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- .../WebCore/rendering/svg/SVGTextLayoutEngineSpacing.h | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'Source/WebCore/rendering/svg/SVGTextLayoutEngineSpacing.h') 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 -- cgit v1.2.1