[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[cblu]

The following commit has been merged in the debian/unstable branch:
commit f7e822156e3621e6004e8bc90baccc8510c6761f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 2 19:58:03 2003 +0000

    	Fixed:
    	<rdar://problem/3439222>: always hangs opening plain text file on a particular machine due to missing font, no UI to detect
    	<rdar://problem/3492983>: Certain fonts cause Safari to hang on text/plain pages
    
            Reviewed by rjw.
    
            * WebView.subproj/WebTextView.m:
            (-[WebTextView setFixedWidthFont]): Use [[WebTextRendererFactory sharedFactory] fontWithFamilies:traits:size:] to get the font since it takes the font family which is what we store in WebPreferences and it does fallback work. Only set the font if non-nil is returned.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5650 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a9102e9..f9aff45 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-12-02  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed:
+	<rdar://problem/3439222>: always hangs opening plain text file on a particular machine due to missing font, no UI to detect
+	<rdar://problem/3492983>: Certain fonts cause Safari to hang on text/plain pages
+
+        Reviewed by rjw.
+
+        * WebView.subproj/WebTextView.m:
+        (-[WebTextView setFixedWidthFont]): Use [[WebTextRendererFactory sharedFactory] fontWithFamilies:traits:size:] to get the font since it takes the font family which is what we store in WebPreferences and it does fallback work. Only set the font if non-nil is returned.
+
 2003-11-21  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Richard.
diff --git a/WebKit/WebView.subproj/WebTextView.m b/WebKit/WebView.subproj/WebTextView.m
index 28490fb..bd31412 100644
--- a/WebKit/WebView.subproj/WebTextView.m
+++ b/WebKit/WebView.subproj/WebTextView.m
@@ -14,6 +14,7 @@
 #import <WebKit/WebFrameViewPrivate.h>
 #import <WebKit/WebNSViewExtras.h>
 #import <WebKit/WebPreferences.h>
+#import <WebKit/WebTextRendererFactory.h>
 #import <WebKit/WebViewPrivate.h>
 
 @interface WebTextView (ForwardDeclarations)
@@ -69,9 +70,15 @@
 - (void)setFixedWidthFont
 {
     WebPreferences *preferences = [WebPreferences standardPreferences];
-    NSFont *font = [NSFont fontWithName:[preferences fixedFontFamily]
-                                   size:[preferences defaultFixedFontSize]*_textSizeMultiplier];
-    [self setFont:font];
+    NSString *families[2];
+    families[0] = [preferences fixedFontFamily];
+    families[1] = nil;
+    NSFont *font = [[WebTextRendererFactory sharedFactory] fontWithFamilies:families 
+                                                                     traits:0 
+                                                                       size:[preferences defaultFixedFontSize]*_textSizeMultiplier];
+    if (font) {
+        [self setFont:font];
+    }
 }
 
 // This method was borrowed from Mail and changed to use ratios rather than deltas.

-- 
WebKit Debian packaging