Removed code that should not have been checked in from

	last patch.

        * WebCoreSupport.subproj/WebTextRendererFactory.m:
        (-[WebTextRendererFactory isFontFixedPitch:]):

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

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 297145d7fedd3694c4c03160a84b3cf45ccdb364..0cf3c36fc56e645c52c87742c2198356b7373a2d 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-17  Richard Williamson   <rjw@apple.com>
+
+       Removed code that should not have been checked in from
+       last patch.
+
+        * WebCoreSupport.subproj/WebTextRendererFactory.m:
+        (-[WebTextRendererFactory isFontFixedPitch:]):
+
 2005-02-17  Richard Williamson   <rjw@apple.com>
 
         Fixed <rdar://problem/3999467> when Osaka-Mono is specified as fixed width font, Osaka used instead

diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index ebac34927f551f6eb5229059cfd0921c99df347c..fd407a4154835477954a7a422019a94e2aebd596 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -261,7 +261,10 @@ fontsChanged( ATSFontNotificationInfoRef info, void *_factory)
 
 - (BOOL)isFontFixedPitch: (NSFont *)font
 {
-    return [font isFixedPitch] || [font _isFakeFixedPitch] || [font _web_isFakeFixedPitch];
+    // We don't add additional check for [font _web_isFakeFixedPitch] here because of
+    // performance problems.  Instead the check is done down in WebCore (QFont) and
+    // also in WebTextRenderer.
+    return [font isFixedPitch] || [font _isFakeFixedPitch];
 }
 
 - init