[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 5df5cc5fd5707676c2542ef5d4cd5009dbba624f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 9 00:23:56 2002 +0000

            Solved missing glyph problem, but it's very slow, so
            it's disabled for now.  I'll turn back on after extending
            the character to glyph map in each renderer to include
            substituted font.
    
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (-[WebTextRenderer substituteFontForString:]):
            (-[WebTextRenderer _floatWidthForCharacters:stringLength:fromCharacterPosition:numberOfCharacters:withPadding:applyRounding:attemptFontSubstitution:widths:fonts:glyphs:numGlyphs:]):
    
            Coalesce items, and add a count to title when appropriate.  Useful for
            condensing multiple item, like spacer.gif.
    
            * LoadProgressMonitor.m:
            (-[LoadProgressMonitor _createProgressEntryWithRequest:dataSource:]):
            * ResourceProgressEntry.h:
            * ResourceProgressEntry.m:
            (-[ResourceProgressEntry count]):
            (-[ResourceProgressEntry setCount:]):
            (-[ResourceProgressEntry title]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2605 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c87e31a..536ae60 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-11-08  Richard Williamson   <rjw at apple.com>
+
+        Solved missing glyph problem, but it's very slow, so
+        it's disabled for now.  I'll turn back on after extending
+        the character to glyph map in each renderer to include
+        substituted font.
+        
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer substituteFontForString:]):
+        (-[WebTextRenderer _floatWidthForCharacters:stringLength:fromCharacterPosition:numberOfCharacters:withPadding:applyRounding:attemptFontSubstitution:widths:fonts:glyphs:numGlyphs:]):
+
 2002-11-08  Darin Adler  <darin at apple.com>
 
 	- separate WebBaseNetscapePluginStream more cleanly from its subclasses
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index c87e31a..536ae60 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-11-08  Richard Williamson   <rjw at apple.com>
+
+        Solved missing glyph problem, but it's very slow, so
+        it's disabled for now.  I'll turn back on after extending
+        the character to glyph map in each renderer to include
+        substituted font.
+        
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer substituteFontForString:]):
+        (-[WebTextRenderer _floatWidthForCharacters:stringLength:fromCharacterPosition:numberOfCharacters:withPadding:applyRounding:attemptFontSubstitution:widths:fonts:glyphs:numGlyphs:]):
+
 2002-11-08  Darin Adler  <darin at apple.com>
 
 	- separate WebBaseNetscapePluginStream more cleanly from its subclasses
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index cde821a..3eb665f 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -242,7 +242,15 @@ static BOOL bufferTextDrawing = NO;
     substituteFont = [NSFont findFontLike:font forString:string withRange:NSMakeRange (0,[string length]) inLanguage:[NSLanguage defaultLanguage]];
 
     if ([substituteFont isEqual: font])
-        return nil;
+        substituteFont = nil;
+
+    // The character substitute font lookup is currently disabled.  I need to extend
+    // the character to glyph map to include a font, so we'll only pay the price for
+    // this lookup once, at the expense of replicating information in each WebTextRenderer. 
+#ifdef COMPLETE_SUBSTITUTE_CHECK       
+    if (substituteFont == nil && [string length] == 1)
+        substituteFont = [NSFont findFontLike:font forCharacter: [string characterAtIndex: 0] inLanguage:[NSLanguage defaultLanguage]];
+#endif
         
     return substituteFont;
 }
@@ -780,11 +788,11 @@ static const char *joiningNames[] = {
                 }
                 numGlyphs += cNumGlyphs;
             }
+
 #ifdef DEBUG_MISSING_GLYPH
             else {
-                BOOL hasFont1 = [[NSFont coveredCharacterCache] characterIsMember:c];
-                BOOL hasFont2 = [[NSFont coveredCharacterCache] characterIsMember:originalCharacters[i]];
-                printf ("Unable to find glyph for base character 0x%04x (0x%04x) in font %s(%s) hasFont1 = %d, hasFont2 = %d\n", c, originalCharacters[i], [[font displayName] cString], [[substituteFont displayName] cString], (int)hasFont1, (int)hasFont2);
+                BOOL hasFont = [[NSFont coveredCharacterCache] characterIsMember:c];
+                printf ("Unable to find glyph for base character 0x%04x in font %s(%s) hasFont1 = %d\n", c, [[font displayName] cString], [[substituteFont displayName] cString], (int)hasFont);
             }
 #endif
         }

-- 
WebKit Debian packaging