Index: Source/core/platform/graphics/Font.cpp |
diff --git a/Source/core/platform/graphics/Font.cpp b/Source/core/platform/graphics/Font.cpp |
index 4d610de1a0b08d8fd66710d57ead6e32a703636b..f948c7e8c9de9c02fc4e0ea40e31a48f61e23e9a 100644 |
--- a/Source/core/platform/graphics/Font.cpp |
+++ b/Source/core/platform/graphics/Font.cpp |
@@ -76,7 +76,7 @@ Font::Font() |
{ |
} |
-Font::Font(const FontDescription& fd, short letterSpacing, short wordSpacing) |
+Font::Font(const FontDescription& fd, float letterSpacing, float wordSpacing) |
: m_fontDescription(fd) |
, m_letterSpacing(letterSpacing) |
, m_wordSpacing(wordSpacing) |
@@ -201,7 +201,7 @@ float Font::width(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFo |
} |
bool hasKerningOrLigatures = typesettingFeatures() & (Kerning | Ligatures); |
- bool hasWordSpacingOrLetterSpacing = wordSpacing() | letterSpacing(); |
+ bool hasWordSpacingOrLetterSpacing = wordSpacing() || letterSpacing(); |
float* cacheEntry = m_fontFallbackList->widthCache().add(run, std::numeric_limits<float>::quiet_NaN(), hasKerningOrLigatures, hasWordSpacingOrLetterSpacing, glyphOverflow); |
if (cacheEntry && !std::isnan(*cacheEntry)) |
return *cacheEntry; |