From 02b5ebb30fc88967b843818cbc61987f9dc9685d Mon Sep 17 00:00:00 2001 From: Leon Clarke Date: Thu, 1 Oct 2009 10:30:38 +0100 Subject: Don't extend the arrow asset of the combo box over the text, so that the real background color is used. Re-instate using the correct color for the text. --- WebCore/platform/android/RenderThemeAndroid.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'WebCore/platform/android') diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp index 0f419f5..51f404e 100644 --- a/WebCore/platform/android/RenderThemeAndroid.cpp +++ b/WebCore/platform/android/RenderThemeAndroid.cpp @@ -235,7 +235,7 @@ bool RenderThemeAndroid::paintTextArea(RenderObject* obj, const RenderObject::Pa { if (obj->isMenuList()) return paintCombo(obj, info, rect); - return true; + return true; } void RenderThemeAndroid::adjustSearchFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const @@ -245,7 +245,7 @@ void RenderThemeAndroid::adjustSearchFieldStyle(CSSStyleSelector*, RenderStyle* bool RenderThemeAndroid::paintSearchField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&) { - return true; + return true; } void RenderThemeAndroid::adjustListboxStyle(CSSStyleSelector*, RenderStyle* style, Element*) const @@ -259,12 +259,6 @@ static void adjustMenuListStyleCommon(RenderStyle* style, Element* e) { // Added to make room for our arrow. style->setPaddingRight(Length(RenderSkinCombo::extraWidth(), Fixed)); - // Code copied from RenderThemeMac.mm - // Makes sure that the text shows up on our treatment - bool isEnabled = true; - if (e) - isEnabled = e->isEnabledFormControl(); - style->setColor(isEnabled ? Color::black : Color::darkGray); } void RenderThemeAndroid::adjustMenuListStyle(CSSStyleSelector*, RenderStyle* style, Element* e) const -- cgit v1.1