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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit f674f8835af1a23c20d25bc96e737c4e9f4f561a
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 3 21:01:58 2003 +0000

    	- fixed 3406411 -- infoseek.co.jp: many console errors about
    	attempting to set non-screen font (HiraMinPro-W3)
    
            Reviewed by Ken
    
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (_drawGlyphs):
    	use ERROR instead of NSLog for the printing-font-used-on-screen
    	case, so it doesn't flood the world's console logs. We need to
    	investigate why this is happening also, but that can probably
    	be post-Panther.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4929 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 44dd89d..44779f0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2003-09-03  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3406411 -- infoseek.co.jp: many console errors about 
+	attempting to set non-screen font (HiraMinPro-W3)
+
+        Reviewed by Ken
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (_drawGlyphs):
+	use ERROR instead of NSLog for the printing-font-used-on-screen
+	case, so it doesn't flood the world's console logs. We need to
+	investigate why this is happening also, but that can probably
+	be post-Panther.
+
 2003-09-01  John Sullivan  <sullivan at apple.com>
 
 	- WebKit part of fix for 3402489 -- REGRESSION (7B48-7B55): Some 	printed web pages are too small (width is half a page)
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index f9a1611..b634e84 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -987,9 +987,11 @@ static void _drawGlyphs(NSFont *font, NSColor *color, CGGlyph *glyphs, CGSize *a
         if ([gContext isDrawingToScreen]){
             NSFont *screenFont = [font screenFont];
             if (screenFont != font){
-                NSLog (@"Attempting to set non-screen font (%@) when drawing to screen.  Using screen font anyway, may result in incorrect metrics.", [[[font fontDescriptor] fontAttributes] objectForKey: NSFontNameAttribute]);
+                // We are getting this in too many places (3406411); use ERROR so it only prints on
+                // debug versions for now. (We should debug this also, eventually).
+                ERROR ("Attempting to set non-screen font (%@) when drawing to screen.  Using screen font anyway, may result in incorrect metrics.", [[[font fontDescriptor] fontAttributes] objectForKey: NSFontNameAttribute]);
             }
-            [[font screenFont] set];
+            [screenFont set];
         }
         else {
             NSFont *printerFont = [font printerFont];

-- 
WebKit Debian packaging