[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 68860175b28673f4cfa4667707bd6afb5a727ddd
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 21 01:21:02 2002 +0000

            Fixed mono spaced fonts to always render with mono spacing! (3078065)
    
            * WebCoreSupport.subproj/WebTextRenderer.h:
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (widthForGlyph):
            (-[WebTextRenderer initWithFont:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2793 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cb8922e..5e35b8e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-20  Richard Williamson   <rjw at apple.com>
+
+        Fixed mono spaced fonts to always render with mono spacing! (3078065)
+        
+        * WebCoreSupport.subproj/WebTextRenderer.h:
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (widthForGlyph):
+        (-[WebTextRenderer initWithFont:]):
+
 2002-11-20  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3074926 - crash in BitsToPix() trying to print cnet page
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index cb8922e..5e35b8e 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-11-20  Richard Williamson   <rjw at apple.com>
+
+        Fixed mono spaced fonts to always render with mono spacing! (3078065)
+        
+        * WebCoreSupport.subproj/WebTextRenderer.h:
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (widthForGlyph):
+        (-[WebTextRenderer initWithFont:]):
+
 2002-11-20  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3074926 - crash in BitsToPix() trying to print cnet page
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 7e7deb1..fc80e5d 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -146,7 +146,7 @@ static double totalCGGetAdvancesTime = 0;
 
 static inline WebGlyphWidth widthForGlyph (WebTextRenderer *renderer, WidthMap *map, ATSGlyphRef glyph)
 {
-    WebGlyphWidth width;
+    WebGlyphWidth width = UNINITIALIZED_GLYPH_WIDTH;
     BOOL errorResult;
     
     if (map == 0){
@@ -169,12 +169,17 @@ static inline WebGlyphWidth widthForGlyph (WebTextRenderer *renderer, WidthMap *
             double thisTime = CFAbsoluteTimeGetCurrent() - startTime;
             totalCGGetAdvancesTime += thisTime;
 #endif
-            return ((WebGlyphWidth *)map->widths)[glyph-map->startRange];
+            width = ((WebGlyphWidth *)map->widths)[glyph-map->startRange];
         }
-        return width;
     }
 
-    return widthForGlyph (renderer, map->next, glyph);
+    if (width == UNINITIALIZED_GLYPH_WIDTH)
+        width = widthForGlyph (renderer, map->next, glyph);
+    
+    if (renderer->isFixedPitch && width != 0)
+        return renderer->fixedWidth;
+
+    return width;
 }
 
 
@@ -352,7 +357,11 @@ static BOOL bufferTextDrawing = NO;
     ATSUDisposeStyle(style);
 
     spaceGlyph = nonGlyphID;
-    
+
+    isFixedPitch = [font isFixedPitch];
+    if (isFixedPitch)
+        fixedWidth = CEIL_TO_INT([font widthOfString: @"X"]);
+        
     return self;
 }
 

-- 
WebKit Debian packaging