Minor tweaks to RenderThemeMac's systemFont function.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f2e12fde4980ddf7d512a7577a0edd05c3fca338..a854b3e0a9e23547349bedec1ee5e8c31f57f8e4 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-22  Dave Hyatt <hyatt@apple.com>
+
+        Super-minor tweaks to the systemFont function on Mac.
+        Set the generic family to None rather than to Serif, and
+        don't waste time setting the computed size, since that is
+        set from the specified size over in CSSStyleSelector anyway.
+
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::systemFont):
+
 2006-09-22  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Brady.

diff --git a/WebCore/rendering/RenderThemeMac.mm b/WebCore/rendering/RenderThemeMac.mm
index 84997e8c0f0387fa67c05b1a8e2824a95e36b5ec..f0f661fd0b3d5eef9d482005fe755d68abe09932 100644 (file)
--- a/WebCore/rendering/RenderThemeMac.mm
+++ b/WebCore/rendering/RenderThemeMac.mm
@@ -129,9 +129,8 @@ void RenderThemeMac::systemFont(int propId, FontDescription& fontDescription) co
     
     if (font) {
         cachedDesc->setIsAbsoluteSize(true);
-        cachedDesc->setGenericFamily(FontDescription::SerifFamily);
+        cachedDesc->setGenericFamily(FontDescription::NoFamily);
         cachedDesc->firstFamily().setFamily([font familyName]);
-        cachedDesc->setComputedSize([font pointSize]);
         cachedDesc->setSpecifiedSize([font pointSize]);
         NSFontTraitMask traits = [[NSFontManager sharedFontManager] traitsOfFont:font];
         cachedDesc->setBold(traits & NSBoldFontMask);