Fixed <rdar://problem/4000073> non-screen font error on www.worldofwarcraft.com

        Reviewed by John Sullivan.

        * WebCoreSupport.subproj/WebTextRenderer.m:
        (-[WebTextRenderer _smallCapsFont]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8555 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5d77e2ade8c5f0cdfd17b5d613abd2339c385e0e..0343a676f5c798d92824d4397d6bfb1f87bd5877 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-09  Richard Williamson   <rjw@apple.com>
+
+       Fixed <rdar://problem/4000073> non-screen font error on www.worldofwarcraft.com
+
+        Reviewed by John Sullivan.
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+        (-[WebTextRenderer _smallCapsFont]):
+
 === Safari-185 ===
 
 2005-02-07  Chris Blumenberg  <cblu@apple.com>

diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 618cf4ba41e21691eff5e41a81c1551ff901e950..1e3ac7868b5e9a7a0d3cf8bb4d49731317783d74 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -716,8 +716,8 @@ static BOOL alwaysUseATSU = NO;
 - (NSFont *)_smallCapsFont
 {
     if (!smallCapsFont)
-        smallCapsFont = [[NSFontManager sharedFontManager] convertFont:font toSize:([font pointSize] * SMALLCAPS_FONTSIZE_MULTIPLIER)];
-    return smallCapsFont;
+        smallCapsFont = [[[NSFontManager sharedFontManager] convertFont:font toSize:([font pointSize] * SMALLCAPS_FONTSIZE_MULTIPLIER)] screenFont];
+    return usingPrinterFont ? [smallCapsFont printerFont] : smallCapsFont;
 }
 
 static inline BOOL fontContainsString(NSFont *font, NSString *string)