[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 5e2285884cbf329a1723140d83254768e70ada5f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 10 23:38:08 2003 +0000

    	Fixed 3298153.  Force use of printer font when printing.
    
            Reviewed by Chris.
    
            * WebCoreSupport.subproj/WebTextRenderer.m:
            (_drawGlyphs):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4616 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 73a6a26..0c33566 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-07-10  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3298153.  Force use of printer font when printing.
+
+        Reviewed by Chris.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (_drawGlyphs):
+
 2003-07-10  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3161102>: Avoid retain cycles by destroying plug-ins in the page cache before dealloc
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index ebf6731..8bbebb3 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -649,7 +649,14 @@ static void _drawGlyphs(NSFont *font, NSColor *color, CGGlyph *glyphs, CGSize *a
         [gBuffer addGlyphs: glyphs advances: advances count: numGlyphs at: x : y];
     }
     else {
-        cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+        NSGraphicsContext *graphicsContext = [NSGraphicsContext currentContext];
+        cgContext = (CGContextRef)[graphicsContext graphicsPort];
+        
+        // Force use of printer font when printing.
+        if ([graphicsContext isDrawingToScreen] == NO){
+            font = [font printerFont];
+        }
+            
         // Setup the color and font.
         [color set];
         [font set];

-- 
WebKit Debian packaging