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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 9cd1a6233d4b7a337b17ec8af5e020d619c43293
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 5 08:12:33 2003 +0000

            Reviewed by Darin.
    
    	- fixed 3406140 - REGRESSION (7B52-7B55): time spent in NSFont makes Safari 50% slower in Five Apps test
    
            * WebCoreSupport.subproj/WebTextRendererFactory.m:
            (-[WebTextRendererFactory fontWithFamily:traits:size:]): Make font
    	using the font name we found, not the one we were looking
    	for. Since the compare is case-insensitive, it makes a
    	difference. Also, don't make the font twice.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4942 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 260f5f9..e8d7411 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2003-09-05  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
+	- fixed 3406140 - REGRESSION (7B52-7B55): time spent in NSFont makes Safari 50% slower in Five Apps test
+	
+        * WebCoreSupport.subproj/WebTextRendererFactory.m:
+        (-[WebTextRendererFactory fontWithFamily:traits:size:]): Make font
+	using the font name we found, not the one we were looking
+	for. Since the compare is case-insensitive, it makes a
+	difference. Also, don't make the font twice.
+
 2003-09-04  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3316704>: Shockwave: getnetText steam is not functioning correctly
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index 9c3d962..3cfb4e9 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -341,11 +341,11 @@ static BOOL betterChoice(NSFontTraitMask desiredTraits, int desiredWeight,
     NSString *availableFont;
     while ((availableFont = [availableFonts nextObject])) {
         if ([desiredFamily caseInsensitiveCompare:availableFont] == NSOrderedSame) {
-            NSFont *nameMatchedFont = [NSFont fontWithName:desiredFamily size:size];
+            NSFont *nameMatchedFont = [NSFont fontWithName:availableFont size:size];
             NSFontTraitMask traits = [fontManager traitsOfFont:nameMatchedFont];
             
             if ((traits & desiredTraits) == desiredTraits){
-                font = [fontManager convertFont: [NSFont fontWithName:availableFont size:size] toHaveTrait:desiredTraits];
+                font = [fontManager convertFont:nameMatchedFont toHaveTrait:desiredTraits];
                 LOG (FontSelection, "returning exact match (%@)\n\n", [[[font fontDescriptor] fontAttributes] objectForKey: NSFontNameAttribute]);
                 return font;
             }

-- 
WebKit Debian packaging