Changeset 53565 in webkit

Timestamp:

Jan 20, 2010 2:21:59 PM (14 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/6579204> Exception thrown when opening a <select> pop-up that
uses a web font
​https://bugs.webkit.org/show_bug.cgi?id=23911

Reviewed by Darin Adler.

• platform/mac/PopupMenuMac.mm:

(WebCore::PopupMenu::populate): Use the (bold) system font if an NSFont cannot
be obtained.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/PopupMenuMac.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-20  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/6579204> Exception thrown when opening a <select> pop-up that
+        uses a web font
+        https://bugs.webkit.org/show_bug.cgi?id=23911
+
+        * platform/mac/PopupMenuMac.mm:
+        (WebCore::PopupMenu::populate): Use the (bold) system font if an NSFont cannot
+        be obtained.
+
 2010-01-19  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebCore/platform/mac/PopupMenuMac.mm

@@ -82 +82 @@
             PopupMenuStyle style = client()->itemStyle(i);
             NSMutableDictionary* attributes = [[NSMutableDictionary alloc] init];
-            if (style.font() != Font())
-                [attributes setObject:style.font().primaryFont()->getNSFont() forKey:NSFontAttributeName];
+            if (style.font() != Font()) {
+                NSFont *font = style.font().primaryFont()->getNSFont();
+                if (!font) {
+                    CGFloat size = style.font().primaryFont()->platformData().size();
+                    font = style.font().weight() < FontWeightBold ? [NSFont systemFontOfSize:size] : [NSFont boldSystemFontOfSize:size];
+                }
+                [attributes setObject:font forKey:NSFontAttributeName];
+            }
             // FIXME: Add support for styling the foreground and background colors.
             // FIXME: Find a way to customize text color when an item is highlighted.