[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 4eeb540bf700c850b4755b566dde2d1f464e8c81
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 6 02:38:17 2002 +0000

    Added a comment.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1740 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index 785d069..c5961fe 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -131,8 +131,11 @@
                 fontWeight = [[fontInfo objectAtIndex: 2] intValue];
                 fontMask = [[fontInfo objectAtIndex: 3] unsignedIntValue];
                 
-                // First look for a 'normal' weight font.  The weight and mask
-                // properties are somewhat conflicting.
+                // First look for a 'normal' weight font.  Note that the 
+                // documentation indicates that the weight parameter is ignored if the 
+                // trait contains the bold mask.  This is odd as one would think that other
+                // 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];
                     if (font != nil) {

-- 
WebKit Debian packaging