[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit c950dcb9dc7162819e110c88fd027f4120a029bd
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 28 03:45:02 2003 +0000

    	Fixed 3398229.  When we request a font from NSFont by name we should use a case specific name.  We do case insensitve comparsion, but once a match is found we should use the actual font name, not the requested name.  Two layout tests are still failing, but I don't think the failures are font related.
    
    
            Reviewed by Hyatt.
    
            * WebCoreSupport.subproj/WebTextRendererFactory.m:
            (-[WebTextRendererFactory fontWithFamily:traits:size:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4910 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cf63fb2..6433de9 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-27  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3398229.  When we request a font from NSFont by name we should use a case specific name.  We do case insensitve comparsion, but once a match is found we should use the actual font name, not the requested name.  Two layout tests are still failing, but I don't think the failures are font related.
+
+        Reviewed by Hyatt.
+
+        * WebCoreSupport.subproj/WebTextRendererFactory.m:
+        (-[WebTextRendererFactory fontWithFamily:traits:size:]):
+
 === Safari-95 ===
 
 2003-08-27  Richard Williamson   <rjw at apple.com>
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index 1aa9f7e..9c3d962 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -332,6 +332,7 @@ static BOOL betterChoice(NSFontTraitMask desiredTraits, int desiredWeight,
 - (NSFont *)fontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)desiredTraits size:(float)size
 {
     NSFontManager *fontManager = [NSFontManager sharedFontManager];
+    NSFont *font= nil;
     
     LOG (FontSelection, "looking for %@ with traits %x\n", desiredFamily, desiredTraits);
     
@@ -344,8 +345,9 @@ static BOOL betterChoice(NSFontTraitMask desiredTraits, int desiredWeight,
             NSFontTraitMask traits = [fontManager traitsOfFont:nameMatchedFont];
             
             if ((traits & desiredTraits) == desiredTraits){
-                LOG (FontSelection, "returning exact match\n\n");
-                return  [fontManager convertFont: [NSFont fontWithName:desiredFamily size:size] toHaveTrait:desiredTraits];
+                font = [fontManager convertFont: [NSFont fontWithName:availableFont size:size] toHaveTrait:desiredTraits];
+                LOG (FontSelection, "returning exact match (%@)\n\n", [[[font fontDescriptor] fontAttributes] objectForKey: NSFontNameAttribute]);
+                return font;
             }
             LOG (FontSelection, "found exact match, but not desired traits, available traits %x\n", traits);
             break;
@@ -404,7 +406,7 @@ static BOOL betterChoice(NSFontTraitMask desiredTraits, int desiredWeight,
         return nil;
     }
 
-    NSFont *font = [fontManager fontWithFamily:availableFamily traits:chosenTraits weight:chosenWeight size:size];
+    font = [fontManager fontWithFamily:availableFamily traits:chosenTraits weight:chosenWeight size:size];
     
     LOG (FontSelection, "returning font family %@ (%@) traits %x\n\n", 
             availableFamily, [[[font fontDescriptor] fontAttributes] objectForKey: NSFontNameAttribute], chosenTraits);

-- 
WebKit Debian packaging