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 /WebKit/android/RenderSkinCombo.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 'WebKit/android/RenderSkinCombo.cpp')
| -rw-r--r-- | WebKit/android/RenderSkinCombo.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/WebKit/android/RenderSkinCombo.cpp b/WebKit/android/RenderSkinCombo.cpp index 870c13e..fd6f1f2 100644 --- a/WebKit/android/RenderSkinCombo.cpp +++ b/WebKit/android/RenderSkinCombo.cpp @@ -36,9 +36,9 @@ namespace WebCore { static SkBitmap s_bitmap[2]; // Collection of assets for a combo box static bool s_decoded; // True if all assets were decoded -static const int s_margin = 2; +static const int s_margin = 0; static const SkIRect s_mar = { s_margin, s_margin, - RenderSkinCombo::extraWidth(), s_margin }; + RenderSkinCombo::extraWidth() - 2, s_margin }; RenderSkinCombo::RenderSkinCombo() { @@ -61,11 +61,8 @@ bool RenderSkinCombo::Draw(SkCanvas* canvas, Node* element, int x, int y, int wi return true; State state = (element->isElementNode() && static_cast<Element*>(element)->isEnabledFormControl()) ? kNormal : kDisabled; - if (height < (s_margin<<1) + 1) { - height = (s_margin<<1) + 1; - } SkRect bounds; - bounds.set(SkIntToScalar(x), SkIntToScalar(y), SkIntToScalar(x + width), SkIntToScalar(y + height)); + bounds.set(SkIntToScalar(x + width), SkIntToScalar(y), SkIntToScalar(x + width), SkIntToScalar(y + height)); SkNinePatch::DrawNine(canvas, bounds, s_bitmap[state], s_mar); return false; } |