Changeset 94352 in webkit

Timestamp:

Sep 1, 2011, 3:32:43 PM (15 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/9528843> STIX glyphs not rendered on this stackoverflow answer
​https://bugs.webkit.org/show_bug.cgi?id=67444

Reviewed by Darin Adler.

Source/WebCore:

Test: fast/text/fallback-traits-fixup.html

After obtaining STIX Regular as a fallback font for some characters, getFontDataForCharacters()
proceeded to ask for a font from the same family having the desired traits and weight (because
wkGetFontInLanguageForRange() does not preserve traits and weight). The returned font was different
and happened to not contain the desired character.

• platform/graphics/mac/FontCacheMac.mm:

(WebCore::FontCache::getFontDataForCharacters): Only ask for a family member with the desired
traits and weight if the substitute font does not already have them, and only use the returned
member if it actually contains the desired character.

LayoutTests:

• fast/text/fallback-traits-fixup.html: Added.
• platform/mac/fast/text/fallback-traits-fixup-expected.png: Added.
• platform/mac/fast/text/fallback-traits-fixup-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/text/fallback-traits-fixup.html (added)
• LayoutTests/platform/mac/fast/text/fallback-traits-fixup-expected.png (added)
• LayoutTests/platform/mac/fast/text/fallback-traits-fixup-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/mac/FontCacheMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-01  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/9528843> STIX glyphs not rendered on this stackoverflow answer
+        https://bugs.webkit.org/show_bug.cgi?id=67444
+
+        Reviewed by Darin Adler.
+
+        * fast/text/fallback-traits-fixup.html: Added.
+        * platform/mac/fast/text/fallback-traits-fixup-expected.png: Added.
+        * platform/mac/fast/text/fallback-traits-fixup-expected.txt: Added.
+
 2011-09-01  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-01  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/9528843> STIX glyphs not rendered on this stackoverflow answer
+        https://bugs.webkit.org/show_bug.cgi?id=67444
+
+        Reviewed by Darin Adler.
+
+        Test: fast/text/fallback-traits-fixup.html
+
+        After obtaining STIX Regular as a fallback font for some characters, getFontDataForCharacters()
+        proceeded to ask for a font from the same family having the desired traits and weight (because
+        wkGetFontInLanguageForRange() does not preserve traits and weight). The returned font was different
+        and happened to not contain the desired character.
+
+        * platform/graphics/mac/FontCacheMac.mm:
+        (WebCore::FontCache::getFontDataForCharacters): Only ask for a family member with the desired
+        traits and weight if the substitute font does not already have them, and only use the returned
+        member if it actually contains the desired character.
+
 2011-09-01  Kentaro Hara  <haraken@google.com>
 

trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm

@@ -102 +102 @@
 const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font, const UChar* characters, int length)
 {
-    const FontPlatformData& platformData = font.fontDataAt(0)->fontDataForCharacter(characters[0])->platformData();
+    UChar32 character;
+    U16_GET(characters, 0, 0, length, character);
+    const FontPlatformData& platformData = font.fontDataAt(0)->fontDataForCharacter(character)->platformData();
     NSFont *nsFont = platformData.font();
 
@@ -141 +143 @@
     }
 
-    if (NSFont *bestVariation = [fontManager fontWithFamily:[substituteFont familyName] traits:traits weight:weight size:size])
-        substituteFont = bestVariation;
-
-    substituteFont = font.fontDescription().usePrinterFont() ? [substituteFont printerFont] : [substituteFont screenFont];
-
     NSFontTraitMask substituteFontTraits = [fontManager traitsOfFont:substituteFont];
     NSInteger substituteFontWeight = [fontManager weightOfFont:substituteFont];
+
+    if (traits != substituteFontTraits || weight != substituteFontWeight) {
+        if (NSFont *bestVariation = [fontManager fontWithFamily:[substituteFont familyName] traits:traits weight:weight size:size]) {
+            if (([fontManager traitsOfFont:bestVariation] != substituteFontTraits || [fontManager weightOfFont:bestVariation] != substituteFontWeight)
+                && [[bestVariation coveredCharacterSet] longCharacterIsMember:character])
+                substituteFont = bestVariation;
+        }
+    }
+
+    substituteFont = font.fontDescription().usePrinterFont() ? [substituteFont printerFont] : [substituteFont screenFont];
+
+    substituteFontTraits = [fontManager traitsOfFont:substituteFont];
+    substituteFontWeight = [fontManager weightOfFont:substituteFont];
 
     FontPlatformData alternateFont(substituteFont, platformData.size(),