Changeset 42597 in webkit

Timestamp:

Apr 16, 2009 3:29:30 PM (15 years ago)

Author:

darin@chromium.org

Message:

2009-04-16 Adam Langley <​agl@google.com>

Reviewed by Darin Fisher.

Fix Chromium's rendering of <option> elements inside of <optgroups>.

​https://bugs.webkit.org/show_bug.cgi?id=25244

Test (will included as a manual test by ​https://bugs.webkit.org/show_bug.cgi?id=24900):

<select>

<optgroup label="Should be bold">

<option>Should not be bold</option>

</optgroup>

</select>

• css/themeWin.css: adding comments
• platform/chromium/PopupMenuChromium.cpp: (WebCore::PopupListBox::getRowFont): use menuStyle() rather than the item's style

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/themeWin.css (modified) (1 diff)
• platform/chromium/PopupMenuChromium.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-04-16  Adam Langley  <agl@google.com>
+
+        Reviewed by Darin Fisher.
+
+        Fix Chromium's rendering of <option> elements inside of <optgroups>.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25244
+
+        Test (will included as a manual test by https://bugs.webkit.org/show_bug.cgi?id=24900):
+
+        <select>
+          <optgroup label="Should be bold">
+            <option>Should not be bold</option>
+          </optgroup>
+        </select>
+
+        * css/themeWin.css: adding comments
+        * platform/chromium/PopupMenuChromium.cpp:
+        (WebCore::PopupListBox::getRowFont): use menuStyle() rather than the item's style
+
 2009-04-16  Eric Roman  <eroman@chromium.org>
 

trunk/WebCore/css/themeWin.css

@@ -98 +98 @@
     margin: 0;
 }
-/* Options always use the selects' fonts */
+
+/* Option font must be inherited because we depend on computing the size of the
+   <select> based on the size of the options, and they must use the same font
+   for that computation to be correct */
 option {
     font: inherit !important;

trunk/WebCore/platform/chromium/PopupMenuChromium.cpp

@@ -809 +809 @@
 Font PopupListBox::getRowFont(int rowIndex)
 {
-    Font itemFont = m_popupClient->itemStyle(rowIndex).font();
+    Font itemFont = m_popupClient->menuStyle().font();
     if (m_popupClient->itemIsLabel(rowIndex)) {
         // Bold-ify labels (ie, an <optgroup> heading).