Changeset 30066 in webkit

Timestamp:

Feb 7, 2008 8:59:08 AM (16 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Darin Adler.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17194 Changing text to bold changes font family

Test: platform/mac/fast/text/family-for-font-matched-by-name.html

• platform/mac/WebFontCache.mm: (+[WebFontCache internalFontWithFamily:traits:size:]): Changed to use the family of the font whose name matches the desired family if there is no exact family match.

LayoutTests:

Reviewed by Darin Adler.

• test for ​http://bugs.webkit.org/show_bug.cgi?id=17194 Changing text to bold changes font family

• platform/mac/fast/text/family-for-font-matched-by-name-expected.checksum: Added.
• platform/mac/fast/text/family-for-font-matched-by-name-expected.png: Added.
• platform/mac/fast/text/family-for-font-matched-by-name-expected.txt: Added.
• platform/mac/fast/text/family-for-font-matched-by-name.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/family-for-font-matched-by-name-expected.checksum (added)
• LayoutTests/platform/mac/fast/text/family-for-font-matched-by-name-expected.png (added)
• LayoutTests/platform/mac/fast/text/family-for-font-matched-by-name-expected.txt (added)
• LayoutTests/platform/mac/fast/text/family-for-font-matched-by-name.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/mac/WebFontCache.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-02-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - test for http://bugs.webkit.org/show_bug.cgi?id=17194
+          Changing text to bold changes font family
+
+        * platform/mac/fast/text/family-for-font-matched-by-name-expected.checksum: Added.
+        * platform/mac/fast/text/family-for-font-matched-by-name-expected.png: Added.
+        * platform/mac/fast/text/family-for-font-matched-by-name-expected.txt: Added.
+        * platform/mac/fast/text/family-for-font-matched-by-name.html: Added.
+
 2008-02-07  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17194
+          Changing text to bold changes font family
+
+        Test: platform/mac/fast/text/family-for-font-matched-by-name.html
+
+        * platform/mac/WebFontCache.mm:
+        (+[WebFontCache internalFontWithFamily:traits:size:]): Changed to use
+        the family of the font whose name matches the desired family if there
+        is no exact family match.
+
 2008-02-07  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/platform/mac/WebFontCache.mm

@@ -118 +118 @@
     NSEnumerator *availableFonts = [[fontManager availableFonts] objectEnumerator];
     NSString *availableFont;
+    NSFont *nameMatchedFont = nil;
     while ((availableFont = [availableFonts nextObject])) {
         if ([desiredFamily caseInsensitiveCompare:availableFont] == NSOrderedSame) {
-            NSFont *nameMatchedFont = [NSFont fontWithName:availableFont size:size];
+            nameMatchedFont = [NSFont fontWithName:availableFont size:size];
 
             // Special case Osaka-Mono.  According to <rdar://problem/3999467>, we need to 
@@ -144 +145 @@
     }
 
+    if (!availableFamily)
+        availableFamily = [nameMatchedFont familyName];
+
     // Found a family, now figure out what weight and traits to use.
     BOOL choseFont = false;