diff options
| author | Leon Scroggins <scroggo@google.com> | 2011-01-06 11:39:24 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-06 11:39:24 -0800 |
| commit | 4014a341b3afd6f880646b046088025ea1f07807 (patch) | |
| tree | 39aeed72dc008343688d2ef5a25ea93e19e44779 /WebCore/platform/android/PopupMenuAndroid.cpp | |
| parent | 608cd75e8bcc1526c42be58a3253f813647cf7d3 (diff) | |
| parent | d820d47a28739316b387f0a0c2a201e98b0e498d (diff) | |
| download | external_webkit-4014a341b3afd6f880646b046088025ea1f07807.zip external_webkit-4014a341b3afd6f880646b046088025ea1f07807.tar.gz external_webkit-4014a341b3afd6f880646b046088025ea1f07807.tar.bz2 | |
Merge "When canceling <select> popup leave the value unchanged." into honeycomb
Diffstat (limited to 'WebCore/platform/android/PopupMenuAndroid.cpp')
| -rw-r--r-- | WebCore/platform/android/PopupMenuAndroid.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/WebCore/platform/android/PopupMenuAndroid.cpp b/WebCore/platform/android/PopupMenuAndroid.cpp index 3e36ea4..b35ea0c 100644 --- a/WebCore/platform/android/PopupMenuAndroid.cpp +++ b/WebCore/platform/android/PopupMenuAndroid.cpp @@ -42,6 +42,9 @@ public: virtual void replyInt(int value) { if (m_popupClient) { m_popupClient->popupDidHide(); + // -2 is a special value signaling that the popup was canceled. + if (-2 == value) + return; m_popupClient->valueChanged(value, true); } if (m_viewImpl) |