[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 489261c7c2d386e806bced6ce0fcdde98ade89fd
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 4 07:07:20 2002 +0000

    	- fixed 3117193 -- REGRESSION: Hang on Hixie's weblog
    
            Reviewed by Maciej.
    
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (-[WebTextRenderer substituteFontForString:families:]):
    	Do the operation on the whole string at once instead of a character at a time.
            I decided to do this rather than correct the bug in the character-at-a-time version.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2925 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 366508d..6367aff 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1 +1,12 @@
+2002-12-03  Darin Adler  <darin at apple.com>
+
+	- fixed 3117193 -- REGRESSION: Hang on Hixie's weblog
+
+        Reviewed by Maciej.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer substituteFontForString:families:]):
+	Do the operation on the whole string at once instead of a character at a time.
+        I decided to do this rather than correct the bug in the character-at-a-time version.
+
 == Rolled over to ChangeLog-2002-12-03 ==
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index c03287b..15e753a 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -266,27 +266,16 @@ static BOOL bufferTextDrawing = NO;
     // First search the CSS family fallback list.
     NSString *family = nil;
     int i = 0;
-    while (families && families[i] != 0 && substituteFont == nil){
+    while (families && families[i] != 0) {
         family = families[i++];
         substituteFont = [[WebTextRendererFactory sharedFactory] cachedFontFromFamily: family traits:[[NSFontManager sharedFontManager] traitsOfFont:font] size:[font pointSize]];
-        if (substituteFont){
-            NSCharacterSet *cs = [substituteFont coveredCharacterSet];
-            int pos = 0;
-            int length = [string length];
-            while (pos < length){
-                if (![cs characterIsMember: [string characterAtIndex: pos]]){
-                    substituteFont = nil;
-                    continue;
-                }
-            }
+        if (substituteFont && [string rangeOfCharacterFromSet:[[substituteFont coveredCharacterSet] invertedSet]].location == NSNotFound) {
+            return substituteFont;
         }
     }
-    if (substituteFont)
-        return substituteFont;
     
     // Now do string based lookup
     substituteFont = [NSFont findFontLike:font forString:string withRange:NSMakeRange (0,[string length]) inLanguage:[NSLanguage defaultLanguage]];
-
     if ([substituteFont isEqual: font])
         substituteFont = nil;
 

-- 
WebKit Debian packaging