diff options
| author | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
|---|---|---|
| committer | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
| commit | 5f1ab04193ad0130ca8204aadaceae083aca9881 (patch) | |
| tree | 5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/rendering/RenderThemeMac.mm | |
| parent | 194315e5a908cc8ed67d597010544803eef1ac59 (diff) | |
| download | external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2 | |
Get WebKit r44544.
Diffstat (limited to 'WebCore/rendering/RenderThemeMac.mm')
| -rw-r--r-- | WebCore/rendering/RenderThemeMac.mm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebCore/rendering/RenderThemeMac.mm b/WebCore/rendering/RenderThemeMac.mm index 7d1a60e..c3ec91a 100644 --- a/WebCore/rendering/RenderThemeMac.mm +++ b/WebCore/rendering/RenderThemeMac.mm @@ -951,11 +951,7 @@ void RenderThemeMac::adjustMenuListStyle(CSSStyleSelector* selector, RenderStyle // Set the foreground color to black or gray when we have the aqua look. // Cast to RGB32 is to work around a compiler bug. - bool isEnabled = true; - if (FormControlElement* formControlElement = toFormControlElement(e)) - isEnabled = formControlElement->isEnabled(); - - style->setColor(isEnabled ? static_cast<RGBA32>(Color::black) : Color::darkGray); + style->setColor(e && e->isEnabledFormControl() ? static_cast<RGBA32>(Color::black) : Color::darkGray); // Set the button's vertical size. setSizeFromFont(style, menuListButtonSizes()); |