Index: Source/core/platform/graphics/Font.h |
diff --git a/Source/core/platform/graphics/Font.h b/Source/core/platform/graphics/Font.h |
index 1261b64e868999b625ea40319b9cbc64ae65ad82..0d990bf245f2148170bd49b5b652c94277ec96b2 100644 |
--- a/Source/core/platform/graphics/Font.h |
+++ b/Source/core/platform/graphics/Font.h |
@@ -79,7 +79,7 @@ struct GlyphOverflow { |
class Font { |
public: |
Font(); |
- Font(const FontDescription&, short letterSpacing, short wordSpacing); |
+ Font(const FontDescription&, float letterSpacing, float wordSpacing); |
// This constructor is only used if the platform wants to start with a native font. |
Font(const FontPlatformData&, bool isPrinting, FontSmoothingMode = AutoSmoothing); |
~Font(); |
@@ -113,10 +113,10 @@ public: |
bool isSmallCaps() const { return m_fontDescription.smallCaps(); } |
- short wordSpacing() const { return m_wordSpacing; } |
- short letterSpacing() const { return m_letterSpacing; } |
- void setWordSpacing(short s) { m_wordSpacing = s; } |
- void setLetterSpacing(short s) { m_letterSpacing = s; } |
+ float wordSpacing() const { return m_wordSpacing; } |
+ float letterSpacing() const { return m_letterSpacing; } |
+ void setWordSpacing(float s) { m_wordSpacing = s; } |
+ void setLetterSpacing(float s) { m_letterSpacing = s; } |
bool isFixedPitch() const; |
bool isPrinterFont() const { return m_fontDescription.usePrinterFont(); } |
@@ -289,8 +289,8 @@ private: |
FontDescription m_fontDescription; |
mutable RefPtr<FontFallbackList> m_fontFallbackList; |
- short m_letterSpacing; |
- short m_wordSpacing; |
+ float m_letterSpacing; |
+ float m_wordSpacing; |
bool m_isPlatformFont; |
bool m_needsTranscoding; |
mutable TypesettingFeatures m_typesettingFeatures; // Caches values computed from m_fontDescription. |