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

[darin]

The following commit has been merged in the debian/unstable branch:
commit bd9fcf8f159034b4aee9be5de2defecedb15d43a
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 18 22:23:37 2003 +0000

            Reviewed by Richard.
    
    	- fixed 3194756 -- REGRESSION: Geneva bold yields Geneva plain, used to yield Helvetica bold (apple.com)
    
            * WebCoreSupport.subproj/WebTextRendererFactory.m:
            (-[WebTextRendererFactory fontWithFamily:traits:size:]):
            Remove the first call to NSFontManager before we do our searching algorithm.
            We always need to do the searching, because NSFontManager uses a different set of rules.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3854 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fd0811c..0a990dc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-18  Darin Adler  <darin at apple.com>
+
+        Reviewed by Richard.
+
+	- fixed 3194756 -- REGRESSION: Geneva bold yields Geneva plain, used to yield Helvetica bold (apple.com)
+
+        * WebCoreSupport.subproj/WebTextRendererFactory.m:
+        (-[WebTextRendererFactory fontWithFamily:traits:size:]):
+        Remove the first call to NSFontManager before we do our searching algorithm.
+        We always need to do the searching, because NSFontManager uses a different set of rules.
+
 2003-03-17  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3200647 - File I/O related download errors just says "error"
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index 793e474..782be6f 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -313,19 +313,11 @@ static int getLCDScaleParameters(void)
 
 - (NSFont *)fontWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
 {
-    NSFont *font;
-    NSEnumerator *e;
-    NSString *availableFamily;
-    
-    font = [[NSFontManager sharedFontManager] fontWithFamily:family traits:traits weight:5 size:size];
-    if (font != nil) {
-        return font;
-    }
-    
     // FIXME:  For now do a simple case insensitive search for a matching font.
     // The font manager requires exact name matches.  This will at least address the problem
     // of matching arial to Arial, etc.
-    e = [[[NSFontManager sharedFontManager] availableFontFamilies] objectEnumerator];
+    NSEnumerator *e = [[[NSFontManager sharedFontManager] availableFontFamilies] objectEnumerator];
+    NSString *availableFamily;
     while ((availableFamily = [e nextObject])) {
         if ([family caseInsensitiveCompare:availableFamily] == NSOrderedSame) {
             NSArray *fonts = [[NSFontManager sharedFontManager] availableMembersOfFontFamily:availableFamily];
@@ -347,7 +339,7 @@ static int getLCDScaleParameters(void)
                 // traits could also indicate weight changes.  In fact, the weight parameter
                 // and the trait mask together make a conflicted API.
                 if (fontWeight == 5 && (fontMask & traits) == traits){
-                    font = [[NSFontManager sharedFontManager] fontWithFamily:availableFamily traits:traits weight:5 size:size];
+                    NSFont *font = [[NSFontManager sharedFontManager] fontWithFamily:availableFamily traits:traits weight:5 size:size];
                     if (font != nil) {
                         return font;
                     }
@@ -355,7 +347,7 @@ static int getLCDScaleParameters(void)
                 
                 // Get a font with the correct traits but a weight we're told actually exists.
                 if ((fontMask & traits) == traits){
-                    font = [[NSFontManager sharedFontManager] fontWithFamily:availableFamily traits:traits weight:fontWeight size:size];
+                    NSFont *font = [[NSFontManager sharedFontManager] fontWithFamily:availableFamily traits:traits weight:fontWeight size:size];
                     if (font != nil) {
                         return font;
                     }

-- 
WebKit Debian packaging