Reviewed by Geoff.

        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=9810
          OPTGROUP label text is using the default font instead of Lucida Grande

        * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::setFontFromControlSize):
        Code wants the family name, but was calling fontName, which is not the same thing.
        Also removed the unneeded conversion to DeprecatedString.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 307d50bbf722244a8c4d829d268f337d5ba785f2..8d22c304307ba755c767230a8b2814e5c25fbea3 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-10  Darin Adler  <darin@apple.com>
+
+        Reviewed by Geoff.
+
+        - fix rdar://problem/4619534 http://bugzilla.opendarwin.org/show_bug.cgi?id=9810
+          OPTGROUP label text is using the default font instead of Lucida Grande
+
+        * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::setFontFromControlSize):
+        Code wants the family name, but was calling fontName, which is not the same thing.
+        Also removed the unneeded conversion to DeprecatedString.
+
 === Safari-521.16 ===
 
 2006-07-10  David Kilzer  <ddkilzer@kilzer.net>

diff --git a/WebCore/manual-tests/disabled-option-elements.html b/WebCore/manual-tests/disabled-option-elements.html
index 2c0c6b29d2aa798f38459b9dc748913df515396b..4ff291fdccf188311df70cbea71c02655eb01e1e 100644 (file)
--- a/WebCore/manual-tests/disabled-option-elements.html
+++ b/WebCore/manual-tests/disabled-option-elements.html
@@ -24,4 +24,3 @@
 
 </body>
 </html>
-\ No newline at end of file

diff --git a/WebCore/rendering/RenderThemeMac.mm b/WebCore/rendering/RenderThemeMac.mm
index 85291b51645edfc83042b89f10866e83f2a186b3..a0f64c00a58a0b36c7b611308b62588b12225edc 100644 (file)
--- a/WebCore/rendering/RenderThemeMac.mm
+++ b/WebCore/rendering/RenderThemeMac.mm
@@ -267,7 +267,7 @@ void RenderThemeMac::setFontFromControlSize(CSSStyleSelector* selector, RenderSt
     fontDescription.setGenericFamily(FontDescription::SerifFamily);
     
     NSFont* font = [NSFont systemFontOfSize:[NSFont systemFontSizeForControlSize:controlSize]];
-    fontDescription.firstFamily().setFamily(DeprecatedString::fromNSString([font fontName]));
+    fontDescription.firstFamily().setFamily([font familyName]);
     fontDescription.setComputedSize([font pointSize]);
     fontDescription.setSpecifiedSize([font pointSize]);