Changeset 21471 in webkit

Timestamp:

May 14, 2007 6:39:27 PM (17 years ago)

Author:

bdash

Message:

2007-05-14 Mitz Pettel <​mitz@webkit.org>

Reviewed by Darin.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=13711 REGRESSION - Bookmark Bar text rendering changed

No test possible since this patch affects only Safari chrome.

• platform/Font.cpp: (WebCore::Font::Font): Initialize m_isPlatformFont according to whether the Font object is derived from a FontPlatformData or not.
• platform/Font.h: (WebCore::Font::isPlatformFont): Added. Returns whether this Font was derived from a platform font.
• platform/mac/FontCacheMac.mm: (WebCore::FontCache::getFontDataForCharacters): Changed to not enable synthetic bold and italic in the fallback fonts if the original font was derived from a platform font.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/Font.cpp (modified) (4 diffs)
• platform/Font.h (modified) (2 diffs)
• platform/mac/FontCacheMac.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-05-14  Mitz Pettel  <mitz@webkit.org>
+
+        Reviewed by Darin.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=13711
+          REGRESSION - Bookmark Bar text rendering changed
+
+        No test possible since this patch affects only Safari chrome.
+
+        * platform/Font.cpp:
+        (WebCore::Font::Font): Initialize m_isPlatformFont according to whether
+        the Font object is derived from a FontPlatformData or not.
+        * platform/Font.h:
+        (WebCore::Font::isPlatformFont): Added. Returns whether this Font was
+        derived from a platform font.
+        * platform/mac/FontCacheMac.mm:
+        (WebCore::FontCache::getFontDataForCharacters): Changed to not enable
+        synthetic bold and italic in the fallback fonts if the original font
+        was derived from a platform font.
+
 2007-05-14  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/platform/Font.cpp

@@ -283 +283 @@
     , m_letterSpacing(0)
     , m_wordSpacing(0)
+    , m_isPlatformFont(false)
 {
 }
@@ -291 +292 @@
     , m_letterSpacing(letterSpacing)
     , m_wordSpacing(wordSpacing)
+    , m_isPlatformFont(false)
 {
 }
@@ -299 +301 @@
     , m_letterSpacing(0)
     , m_wordSpacing(0)
+    , m_isPlatformFont(true)
 {
     m_fontDescription.setUsePrinterFont(isPrinterFont);
@@ -311 +314 @@
     , m_letterSpacing(other.m_letterSpacing)
     , m_wordSpacing(other.m_wordSpacing)
+    , m_isPlatformFont(other.m_isPlatformFont)
 {
 }

trunk/WebCore/platform/Font.h

@@ -127 +127 @@
     bool bold() const { return m_fontDescription.bold(); }
 
+    bool isPlatformFont() const { return m_isPlatformFont; }
+
 #if PLATFORM(QT)
     operator QFont() const;
@@ -182 +184 @@
     short m_letterSpacing;
     short m_wordSpacing;
+    bool m_isPlatformFont;
 };
 

trunk/WebCore/platform/mac/FontCacheMac.mm

@@ -160 +160 @@
 
     FontPlatformData alternateFont(substituteFont, 
-        (traits & NSBoldFontMask) && !(substituteFontTraits & NSBoldFontMask),
-        (traits & NSItalicFontMask) && !(substituteFontTraits & NSItalicFontMask));
+        !font.isPlatformFont() && (traits & NSBoldFontMask) && !(substituteFontTraits & NSBoldFontMask),
+        !font.isPlatformFont() && (traits & NSItalicFontMask) && !(substituteFontTraits & NSItalicFontMask));
     return getCachedFontData(&alternateFont);
 }