summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/port/platform/graphics/chromium/FontCacheLinux.cpp2
-rw-r--r--webkit/port/platform/graphics/chromium/SimpleFontDataLinux.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/webkit/port/platform/graphics/chromium/FontCacheLinux.cpp b/webkit/port/platform/graphics/chromium/FontCacheLinux.cpp
index ab37374..b9aa718 100644
--- a/webkit/port/platform/graphics/chromium/FontCacheLinux.cpp
+++ b/webkit/port/platform/graphics/chromium/FontCacheLinux.cpp
@@ -96,7 +96,7 @@ FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontD
style |= SkTypeface::kItalic;
SkTypeface* tf = SkTypeface::Create(name, (SkTypeface::Style)style);
-
+
FontPlatformData* result =
new FontPlatformData(tf,
fontDescription.computedSize(),
diff --git a/webkit/port/platform/graphics/chromium/SimpleFontDataLinux.cpp b/webkit/port/platform/graphics/chromium/SimpleFontDataLinux.cpp
index 7b8a75e..c5080c9 100644
--- a/webkit/port/platform/graphics/chromium/SimpleFontDataLinux.cpp
+++ b/webkit/port/platform/graphics/chromium/SimpleFontDataLinux.cpp
@@ -52,8 +52,7 @@ void SimpleFontData::platformInit()
if (!glyphPageZero)
return;
- static const UChar32 M_char = 'M';
- m_maxCharWidth = widthForGlyph(glyphPageZero->glyphDataForCharacter(M_char).glyph);
+ m_maxCharWidth = SkScalarRound(metrics.fXRange * SkScalarRound(m_font.size()));
if (metrics.fAvgCharWidth) {
m_avgCharWidth = SkScalarRound(metrics.fAvgCharWidth);