Merge of master

1 files changed, 9 insertions, 2 deletions

diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/SimpleFontDataQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/SimpleFontDataQt.cpp
index 6cf4e55..f823f84 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/SimpleFontDataQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/SimpleFontDataQt.cpp
@@ -30,7 +30,7 @@ namespace WebCore {
 
 void SimpleFontData::determinePitch()
 {
-    m_treatAsFixedPitch = m_font.font().fixedPitch();
+    m_treatAsFixedPitch = m_platformData.font().fixedPitch();
 }
 
 bool SimpleFontData::containsCharacters(const UChar*, int length) const
@@ -40,7 +40,7 @@ bool SimpleFontData::containsCharacters(const UChar*, int length) const
 
 void SimpleFontData::platformInit()
 {
-    QFontMetrics fm(m_font.font());
+    QFontMetrics fm(m_platformData.font());
 
     m_ascent = fm.ascent();
     m_descent = fm.descent();
@@ -59,6 +59,13 @@ void SimpleFontData::platformGlyphInit()
     m_missingGlyphData.glyph = 0;
 }
 
+void SimpleFontData::platformCharWidthInit()
+{
+    QFontMetrics fm(m_platformData.font());
+    m_avgCharWidth = fm.averageCharWidth();
+    m_maxCharWidth = fm.maxWidth();
+}
+
 void SimpleFontData::platformDestroy()
 {
 }