summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/android
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-11-11 09:13:46 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-11 09:13:47 -0800
commit0de683c1b300c8e788c178c63b7dc71189c0a3d8 (patch)
tree082da772115ed12b58f2633d23145904e9ad7944 /Source/WebCore/platform/android
parentf51315051fbfa03d02d8c098ae70e9eb227d4200 (diff)
parenta742a8f1f62517167248dfc0186ee0b845146f56 (diff)
downloadexternal_webkit-0de683c1b300c8e788c178c63b7dc71189c0a3d8.zip
external_webkit-0de683c1b300c8e788c178c63b7dc71189c0a3d8.tar.gz
external_webkit-0de683c1b300c8e788c178c63b7dc71189c0a3d8.tar.bz2
Merge "Fix combobox metrics and asset scaling" into ics-mr1
Diffstat (limited to 'Source/WebCore/platform/android')
-rw-r--r--Source/WebCore/platform/android/RenderThemeAndroid.cpp1
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