[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 34f759f69a416a2ee4f4c2a51090569701fab44c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 14 20:37:40 2003 +0000

            Rolled out workaround to bug 3298153 -- get "screen font while printing"
            error, bad stuff happens after that (Sherlock, Safari). It turns out the
            real fix was on the WebCore side. Now that we have that fix we don't need
            these extra calls to printerFont, which is a relatively slow call that
            may need to look up a font by name each time it's called.
    
            * WebCoreSupport.subproj/WebTextRenderer.m: (_drawGlyphs):
            Remove code to look up the printer font.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index dbad8cd..1ed9812 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-14  Darin Adler  <darin at apple.com>
+
+        Rolled out workaround to bug 3298153 -- get "screen font while printing"
+        error, bad stuff happens after that (Sherlock, Safari). It turns out the
+        real fix was on the WebCore side. Now that we have that fix we don't need
+        these extra calls to printerFont, which is a relatively slow call that
+        may need to look up a font by name each time it's called.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m: (_drawGlyphs):
+        Remove code to look up the printer font.
+
 2003-07-14  Maciej Stachowiak  <mjs at apple.com>
 
 	Rolled in fix from Safari-89-branch
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 8bbebb3..ebf6731 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -649,14 +649,7 @@ static void _drawGlyphs(NSFont *font, NSColor *color, CGGlyph *glyphs, CGSize *a
         [gBuffer addGlyphs: glyphs advances: advances count: numGlyphs at: x : y];
     }
     else {
-        NSGraphicsContext *graphicsContext = [NSGraphicsContext currentContext];
-        cgContext = (CGContextRef)[graphicsContext graphicsPort];
-        
-        // Force use of printer font when printing.
-        if ([graphicsContext isDrawingToScreen] == NO){
-            font = [font printerFont];
-        }
-            
+        cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
         // Setup the color and font.
         [color set];
         [font set];

-- 
WebKit Debian packaging