diff options
| author | Michael Kolb <kolby@google.com> | 2011-11-11 11:51:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-11 11:51:25 -0800 |
| commit | 916501be8092011779af20c29d477c0bbd4e9460 (patch) | |
| tree | 784e5198aee2d8b298e6e3cc6caa5f45d7f471e4 /Source/WebCore/platform/android | |
| parent | 20725bac775c6d780d0ec8eaf32417117dc4f343 (diff) | |
| parent | 0de683c1b300c8e788c178c63b7dc71189c0a3d8 (diff) | |
| download | external_webkit-916501be8092011779af20c29d477c0bbd4e9460.zip external_webkit-916501be8092011779af20c29d477c0bbd4e9460.tar.gz external_webkit-916501be8092011779af20c29d477c0bbd4e9460.tar.bz2 | |
am 0de683c1: Merge "Fix combobox metrics and asset scaling" into ics-mr1
* commit '0de683c1b300c8e788c178c63b7dc71189c0a3d8':
Fix combobox metrics and asset scaling
Diffstat (limited to 'Source/WebCore/platform/android')
| -rw-r--r-- | Source/WebCore/platform/android/RenderThemeAndroid.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/WebCore/platform/android/RenderThemeAndroid.cpp b/Source/WebCore/platform/android/RenderThemeAndroid.cpp index 481ecbf..93c99a4 100644 --- a/Source/WebCore/platform/android/RenderThemeAndroid.cpp +++ b/Source/WebCore/platform/android/RenderThemeAndroid.cpp @@ -428,6 +428,7 @@ static void adjustMenuListStyleCommon(RenderStyle* style) style->setPaddingTop(Length(RenderSkinCombo::padding(), Fixed)); style->setPaddingBottom(Length(RenderSkinCombo::padding(), Fixed)); style->setPaddingRight(Length(RenderSkinCombo::extraWidth(), Fixed)); + style->setMinHeight(Length(RenderSkinCombo::minHeight(), Fixed)); } void RenderThemeAndroid::adjustListboxStyle(CSSStyleSelector*, RenderStyle* style, Element*) const |