diff options
| author | apiccion@chromium.org <apiccion@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 13:53:06 +0000 |
|---|---|---|
| committer | apiccion@chromium.org <apiccion@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-12 13:53:06 +0000 |
| commit | 30f915808db5483d840fcc581285312b3ff8c0b3 (patch) | |
| tree | a7e521bfe243863073913d448f3861bc087516c5 /chrome/android/java | |
| parent | 5a29592d33d6e1520a6c63527a5c229c0e518078 (diff) | |
| download | chromium_src-30f915808db5483d840fcc581285312b3ff8c0b3.zip chromium_src-30f915808db5483d840fcc581285312b3ff8c0b3.tar.gz chromium_src-30f915808db5483d840fcc581285312b3ff8c0b3.tar.bz2 | |
Added an empty string check to Paint.getTextBounds call.
This call returns incorrect (very large) values when given string is empty.
BUG=239383
Review URL: https://chromiumcodereview.appspot.com/16099012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/android/java')
| -rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopup.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopup.java index 28b151d..c1b5d9a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopup.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillPopup.java @@ -175,12 +175,16 @@ public class AutofillPopup extends ListPopupWindow implements AdapterView.OnItem bounds.setEmpty(); String name = data[i].mName; float width = 0; - mNameViewPaint.getTextBounds(name, 0, name.length(), bounds); + if (name.length() > 0) { + mNameViewPaint.getTextBounds(name, 0, name.length(), bounds); + } width += bounds.width(); bounds.setEmpty(); String label = data[i].mLabel; - mLabelViewPaint.getTextBounds(label, 0, label.length(), bounds); + if (label.length() > 0) { + mLabelViewPaint.getTextBounds(label, 0, label.length(), bounds); + } width += bounds.width(); maxTextWidth = Math.max(width, maxTextWidth); } |