Changeset 18680 in webkit

Timestamp:

Jan 8, 2007 2:15:00 PM (17 years ago)

Author:

thatcher

Message:

Reviewed by Geoff.

<rdar://problem/4865325> please re-add auto font activation support in WebKit

• platform/mac/WebFontCache.mm: (+[WebFontCache fontWithFamily:traits:size:]):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-01-08  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Geoff.
+
+        <rdar://problem/4865325> please re-add auto font activation support in WebKit
+
+        * platform/mac/WebFontCache.mm:
+        (+[WebFontCache fontWithFamily:traits:size:]):
+
 2007-01-08  Darin Adler  <darin@apple.com>
 

trunk/WebCore/platform/mac/WebFontCache.mm

@@ -114 +114 @@
 {
     NSFontManager *fontManager = [NSFontManager sharedFontManager];
-    NSFont *font= nil;
-    
+
     // Look for an exact match first.
     NSEnumerator *availableFonts = [[fontManager availableFonts] objectEnumerator];
@@ -122 +121 @@
         if ([desiredFamily caseInsensitiveCompare:availableFont] == NSOrderedSame) {
             NSFont *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;
+                return nameMatchedFont;
 
             NSFontTraitMask traits = [fontManager traitsOfFont:nameMatchedFont];
-            
-            if ((traits & desiredTraits) == desiredTraits){
-                font = [fontManager convertFont:nameMatchedFont toHaveTrait:desiredTraits];
-                return font;
-            }
+            if ((traits & desiredTraits) == desiredTraits)
+                return [fontManager convertFont:nameMatchedFont toHaveTrait:desiredTraits];
             break;
         }
     }
-    
+
+    // font was not immediately available, try auto activated fonts <rdar://problem/4564955>
+    NSFont *font = [NSFont fontWithName:desiredFamily size:size];
+    if (font) {
+        NSFontTraitMask traits = [fontManager traitsOfFont:font];
+        if ((traits & desiredTraits) == desiredTraits)
+            return [fontManager convertFont:font toHaveTrait:desiredTraits];
+    }
+
     // Do a simple case insensitive search for a matching font family.
     // NSFontManager requires exact name matches.