Changeset 46428 in webkit

Timestamp:

Jul 27, 2009 2:31:55 PM (15 years ago)

Author:

treat@webkit.org

Message:

2009-07-27 Mike Fenton <​mike.fenton@torchmobile.com>

Reviewed by Adam Treat.

Add mapping FontWeight to QFont::Weight values as requested via FIXME.
​https://bugs.webkit.org/show_bug.cgi?id=27663

• platform/graphics/qt/FontCacheQt.cpp: (WebCore::FontPlatformDataCacheKey::FontPlatformDataCacheKey):
• platform/graphics/qt/FontPlatformData.h: (WebCore::FontPlatformData::toQFontWeight):
• platform/graphics/qt/FontPlatformDataQt.cpp: (WebCore::FontPlatformData::FontPlatformData):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/FontCacheQt.cpp (modified) (1 diff)
• platform/graphics/qt/FontPlatformData.h (modified) (2 diffs)
• platform/graphics/qt/FontPlatformDataQt.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-07-27  Mike Fenton  <mike.fenton@torchmobile.com>
+
+        Reviewed by Adam Treat.
+
+        Add mapping FontWeight to QFont::Weight values as requested via FIXME.
+        https://bugs.webkit.org/show_bug.cgi?id=27663
+
+        * platform/graphics/qt/FontCacheQt.cpp:
+        (WebCore::FontPlatformDataCacheKey::FontPlatformDataCacheKey):
+        * platform/graphics/qt/FontPlatformData.h:
+        (WebCore::FontPlatformData::toQFontWeight):
+        * platform/graphics/qt/FontPlatformDataQt.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+
 2009-07-27  Jakub Wieczorek  <faw217@gmail.com>
 

trunk/WebCore/platform/graphics/qt/FontCacheQt.cpp

@@ -66 +66 @@
     {
         // FIXME: Map all FontWeight values to QFont weights in FontPlatformData's ctor and follow it here
-        if (description.weight() >= FontWeight600)
+        if (FontPlatformData::toQFontWeight(description.weight()) > QFont::Normal)
             m_bold = true;
 

trunk/WebCore/platform/graphics/qt/FontPlatformData.h

@@ -2 +2 @@
     Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
     Copyright (C) 2008 Holger Hans Peter Freyther
+    Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
@@ -41 +42 @@
     FontPlatformData(const QFont&, bool bold);
 
+    static inline QFont::Weight toQFontWeight(FontWeight fontWeight)
+    {
+        switch (fontWeight) {
+        case FontWeight100:
+        case FontWeight200:
+            return QFont::Light;  // QFont::Light == Weight of 25
+        case FontWeight600:
+            return QFont::DemiBold;  // QFont::DemiBold == Weight of 63
+        case FontWeight700:
+        case FontWeight800:
+            return QFont::Bold;  // QFont::Bold == Weight of 75
+        case FontWeight900:
+            return QFont::Black;  // QFont::Black == Weight of 87
+        case FontWeight300:
+        case FontWeight400:
+        case FontWeight500:
+        default:
+            return QFont::Normal;  // QFont::Normal == Weight of 50
+        }
+    }
+
     QFont font() const { return m_font; }
     float size() const { return m_size; }

trunk/WebCore/platform/graphics/qt/FontPlatformDataQt.cpp

@@ -1 +1 @@
 /*
     Copyright (C) 2008 Holger Hans Peter Freyther
+    Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
@@ -43 +44 @@
     m_font.setPixelSize(qRound(description.computedSize()));
     m_font.setItalic(description.italic());
-    // FIXME: Map all FontWeight values to QFont weights.
-    if (description.weight() >= FontWeight600) {
-        m_font.setWeight(QFont::Bold);
-        m_bold = true;
-    } else
-        m_font.setWeight(QFont::Normal);
+
+    m_font.setWeight(toQFontWeight(description.weight()));
+    m_bold = m_font.bold();
 
     bool smallCaps = description.smallCaps();