diff options
| author | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2009-10-01 08:43:40 -0700 |
|---|---|---|
| committer | android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> | 2009-10-01 08:43:40 -0700 |
| commit | a0d5dbfcbb7c62ec014dd3033ef3efac4ecd3b79 (patch) | |
| tree | dc76673f3ef10079419f664badff73b5b3118e9d /WebCore/platform/android/RenderThemeAndroid.cpp | |
| parent | 0fade321435f38382c614ade7b64e6b68440d747 (diff) | |
| parent | 8b101d480f638c14f332d4be73a74925bfed1d82 (diff) | |
| download | external_webkit-a0d5dbfcbb7c62ec014dd3033ef3efac4ecd3b79.zip external_webkit-a0d5dbfcbb7c62ec014dd3033ef3efac4ecd3b79.tar.gz external_webkit-a0d5dbfcbb7c62ec014dd3033ef3efac4ecd3b79.tar.bz2 | |
Merge commit 'goog/eclair' into eclair-release
Diffstat (limited to 'WebCore/platform/android/RenderThemeAndroid.cpp')
| -rw-r--r-- | WebCore/platform/android/RenderThemeAndroid.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
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 |