Changeset 18680 in webkit
- Timestamp:
- Jan 8, 2007 2:15:00 PM (17 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r18677 r18680 1 2007-01-08 Timothy Hatcher <timothy@apple.com> 2 3 Reviewed by Geoff. 4 5 <rdar://problem/4865325> please re-add auto font activation support in WebKit 6 7 * platform/mac/WebFontCache.mm: 8 (+[WebFontCache fontWithFamily:traits:size:]): 9 1 10 2007-01-08 Darin Adler <darin@apple.com> 2 11 -
trunk/WebCore/platform/mac/WebFontCache.mm
r17652 r18680 114 114 { 115 115 NSFontManager *fontManager = [NSFontManager sharedFontManager]; 116 NSFont *font= nil; 117 116 118 117 // Look for an exact match first. 119 118 NSEnumerator *availableFonts = [[fontManager availableFonts] objectEnumerator]; … … 122 121 if ([desiredFamily caseInsensitiveCompare:availableFont] == NSOrderedSame) { 123 122 NSFont *nameMatchedFont = [NSFont fontWithName:availableFont size:size]; 124 123 125 124 // Special case Osaka-Mono. According to <rdar://problem/3999467>, we need to 126 125 // treat Osaka-Mono as fixed pitch. 127 126 if ([desiredFamily caseInsensitiveCompare:@"Osaka-Mono"] == NSOrderedSame && desiredTraits == 0) 128 return nameMatchedFont;127 return nameMatchedFont; 129 128 130 129 NSFontTraitMask traits = [fontManager traitsOfFont:nameMatchedFont]; 131 132 if ((traits & desiredTraits) == desiredTraits){ 133 font = [fontManager convertFont:nameMatchedFont toHaveTrait:desiredTraits]; 134 return font; 135 } 130 if ((traits & desiredTraits) == desiredTraits) 131 return [fontManager convertFont:nameMatchedFont toHaveTrait:desiredTraits]; 136 132 break; 137 133 } 138 134 } 139 135 136 // font was not immediately available, try auto activated fonts <rdar://problem/4564955> 137 NSFont *font = [NSFont fontWithName:desiredFamily size:size]; 138 if (font) { 139 NSFontTraitMask traits = [fontManager traitsOfFont:font]; 140 if ((traits & desiredTraits) == desiredTraits) 141 return [fontManager convertFont:font toHaveTrait:desiredTraits]; 142 } 143 140 144 // Do a simple case insensitive search for a matching font family. 141 145 // NSFontManager requires exact name matches.
Note: See TracChangeset
for help on using the changeset viewer.