Changeset 31689 in webkit

Timestamp:

Apr 7, 2008 1:08:30 PM (16 years ago)

Author:

mitz@apple.com

Message:

Reviewed by Dave Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=18311 <rdar://problem/5842980> REGRESSION (r31620): Font variants (e.g. Helvetica Neue *Light*) don't render correctly

• platform/mac/WebFontCache.mm: (+[WebFontCache internalFontWithFamily:traits:weight:size:]): Changed to match by family name first, and only if that fails, look for a match by full (PostScript) name. Reverted the full name-based match logic to only distinguish between the broad categories of "bold" and "not bold".

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/WebFontCache.mm (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=18311
+          <rdar://problem/5842980> REGRESSION (r31620): Font variants (e.g. Helvetica Neue *Light*) don't render correctly
+
+        * platform/mac/WebFontCache.mm:
+        (+[WebFontCache internalFontWithFamily:traits:weight:size:]): Changed to
+        match by family name first, and only if that fails, look for a match by
+        full (PostScript) name. Reverted the full name-based match logic to only
+        distinguish between the broad categories of "bold" and "not bold".
+
 2008-04-07  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/platform/mac/WebFontCache.mm

@@ -115 +115 @@
     NSFontManager *fontManager = [NSFontManager sharedFontManager];
 
-    // Look for an exact match first.
-    NSEnumerator *availableFonts = [[fontManager availableFonts] objectEnumerator];
-    NSString *availableFont;
-    NSFont *nameMatchedFont = nil;
-    while ((availableFont = [availableFonts nextObject])) {
-        if ([desiredFamily caseInsensitiveCompare:availableFont] == NSOrderedSame) {
-            nameMatchedFont = [NSFont fontWithName:availableFont size:size];
-
-            // Special case Osaka-Mono.  According to <rdar://problem/3999467>, we need to 
-            // treat Osaka-Mono as fixed pitch.
-            if ([desiredFamily caseInsensitiveCompare:@"Osaka-Mono"] == NSOrderedSame && desiredTraits == 0)
-                return nameMatchedFont;
-
-            NSFontTraitMask traits = [fontManager traitsOfFont:nameMatchedFont];
-            NSInteger weight = [fontManager weightOfFont:nameMatchedFont];
-            fixUpWeight(weight, availableFont);
-
-            if ((traits & desiredTraits) == desiredTraits && weight == desiredWeight)
-                return [fontManager convertFont:nameMatchedFont toHaveTrait:desiredTraits];
-            break;
-        }
-    }
-
     // Do a simple case insensitive search for a matching font family.
     // NSFontManager requires exact name matches.
@@ -148 +125 @@
     }
 
-    if (!availableFamily)
-        availableFamily = [nameMatchedFont familyName];
+    if (!availableFamily) {
+        // Match by PostScript name.
+        NSEnumerator *availableFonts = [[fontManager availableFonts] objectEnumerator];
+        NSString *availableFont;
+        NSFont *nameMatchedFont = nil;
+        NSFontTraitMask desiredTraitsForNameMatch = desiredTraits | (desiredWeight >= 7 ? NSBoldFontMask : 0);
+        while ((availableFont = [availableFonts nextObject])) {
+            if ([desiredFamily caseInsensitiveCompare:availableFont] == NSOrderedSame) {
+                nameMatchedFont = [NSFont fontWithName:availableFont size:size];
+
+                // Special case Osaka-Mono.  According to <rdar://problem/3999467>, we need to 
+                // treat Osaka-Mono as fixed pitch.
+                if ([desiredFamily caseInsensitiveCompare:@"Osaka-Mono"] == NSOrderedSame && desiredTraitsForNameMatch == 0)
+                    return nameMatchedFont;
+
+                NSFontTraitMask traits = [fontManager traitsOfFont:nameMatchedFont];
+                if ((traits & desiredTraitsForNameMatch) == desiredTraitsForNameMatch)
+                    return [fontManager convertFont:nameMatchedFont toHaveTrait:desiredTraitsForNameMatch];
+
+                availableFamily = [nameMatchedFont familyName];
+                break;
+            }
+        }
+    }
 
     // Found a family, now figure out what weight and traits to use.