[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 009253ab39898590e8596bfcf1785023daf83a2f
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 7 22:38:33 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3410939 -- disabling Geneva and Helvetica (by removing them, or by using Font Book) makes Safari crash
    
            * WebCoreSupport.subproj/WebTextRendererFactory.m: (-[WebTextRendererFactory fallbackFontWithTraits:size:]):
            Fall back on Lucida Grande (plain, not bothering with traits) if Helvetica is not present.
    
            * English.lproj/StringsNotToBeLocalized.txt: Update for this and other recent changes.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index de5ad35..666cc3f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2003-09-07  Darin Adler  <darin at apple.com>
 
+        Reviewed by Maciej.
+
+        - fixed 3410939 -- disabling Geneva and Helvetica (by removing them, or by using Font Book) makes Safari crash
+
+        * WebCoreSupport.subproj/WebTextRendererFactory.m: (-[WebTextRendererFactory fallbackFontWithTraits:size:]):
+        Fall back on Lucida Grande (plain, not bothering with traits) if Helvetica is not present.
+
+        * English.lproj/StringsNotToBeLocalized.txt: Update for this and other recent changes.
+
+2003-09-07  Darin Adler  <darin at apple.com>
+
         Reviewed by Ken.
 
         - fixed 3406660 -- screen fonts are not being used for substitute fonts (Japanese text, Roman font)
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 9fbcc1b..b1f02b4 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -88,6 +88,7 @@
 "Library/Internet Plug-Ins"
 "List count: %d items\n"
 "List total size: %d bytes\n"
+"Lucida Grande"
 "Mozilla/4.0 (compatible; MSIE 5.2; Mac_PowerPC) AppleWebKit/%@ %@"
 "Mozilla/4.0 (compatible; MSIE 5.2; Mac_PowerPC) AppleWebKit/%@"
 "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT) AppleWebKit/%@ %@"
@@ -106,6 +107,7 @@
 "Papyrus"
 "Set-Cookie"
 "Times"
+"UseBackForwardList"
 "WebActionButtonKey"
 "WebActionElementKey"
 "WebActionModifierFlagsKey"
@@ -219,8 +221,6 @@
 "\nHeap data: %ld items\n"
 "\nList root path: %s\n"
 "\r\n"
-"_CGFontCacheSetMaxSize"
-"_CGFontCacheSetShouldAutoExpire"
 "__KHTML__"
 "_blank"
 "_current"
@@ -236,6 +236,7 @@
 "application/x-javascript"
 "application/xhtml+xml"
 "application/xml"
+"c"
 "com.RealNetworks.RealOne Player"
 "com.apple.HIWebView"
 "com.apple.JavaAppletPlugin"
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index 3cfb4e9..523c01f 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -242,7 +242,17 @@ static int getLCDScaleParameters(void)
 
 - (NSFont *)fallbackFontWithTraits:(NSFontTraitMask)traits size:(float)size 
 {
-    return [self cachedFontFromFamily:@"Helvetica" traits:traits size:size];
+    NSFont *font = [self cachedFontFromFamily:@"Helvetica" traits:traits size:size];
+    if (font == nil) {
+        // The Helvetica fallback will almost always work, since that's a basic
+        // font that we ship with all systems. But in the highly unusual case where
+        // the user removed Helvetica, we fall back on Lucida Grande because that's
+        // guaranteed to be there, according to Nathan Taylor. This is good enough
+        // to avoid a crash, at least. To reduce the possibility of failure even further,
+        // we don't even bother with traits.
+        font = [self cachedFontFromFamily:@"Lucida Grande" traits:0 size:size];
+    }
+    return font;
 }
 
 - (NSFont *)fontWithFamilies:(NSString **)families traits:(NSFontTraitMask)traits size:(float)size

-- 
WebKit Debian packaging