diff options
| -rw-r--r-- | webkit/glue/webview_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/port/platform/chromium/PopupMenuChromium.cpp | 40 | ||||
| -rw-r--r-- | webkit/port/platform/chromium/PopupMenuChromium.h | 7 |
3 files changed, 40 insertions, 9 deletions
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 419c0e2..67285ff 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -431,7 +431,6 @@ bool WebViewImpl::KeyEvent(const WebKeyboardEvent& event) { #endif return true; } - return false; } // A new key being pressed should hide the popup. @@ -1516,6 +1515,7 @@ void WebViewImpl::AutofillSuggestionsForNode( WebCore::PopupContainer::create(autocomplete_popup_client_.get(), false); autocomplete_popup_->setTextOnIndexChange(false); + autocomplete_popup_->setAcceptOnAbandon(false); autocomplete_popup_->show(focused_node->getRect(), page_->mainFrame()->view(), 0); } diff --git a/webkit/port/platform/chromium/PopupMenuChromium.cpp b/webkit/port/platform/chromium/PopupMenuChromium.cpp index 5cda719..c11c525 100644 --- a/webkit/port/platform/chromium/PopupMenuChromium.cpp +++ b/webkit/port/platform/chromium/PopupMenuChromium.cpp @@ -138,6 +138,10 @@ public: // new item is selected (by using the arrow keys). Default is true. void setTextOnIndexChange(bool value) { m_setTextOnIndexChange = value; } + // Sets whether we should accept the selected index when the popup is + // abandonned. + void setAcceptOnAbandon(bool value) { m_shouldAcceptOnAbandon = value; } + private: friend class PopupContainer; friend class RefCounted<PopupListBox>; @@ -161,7 +165,8 @@ private: PopupListBox(PopupMenuClient* client) : m_originalIndex(0) , m_selectedIndex(0) - , m_acceptOnAbandon(false) + , m_shouldAcceptOnAbandon(true) + , m_willAcceptOnAbandon(false) , m_visibleRows(0) , m_popupClient(client) , m_repeatingChar(0) @@ -226,10 +231,16 @@ private: // enter yet however. int m_selectedIndex; + // Whether we should accept the selectedIndex as chosen when the popup is + // "abandoned". This value is set through its setter and is useful as + // select popup menu and form autofill popup menu have different behaviors. + bool m_shouldAcceptOnAbandon; + // True if we should accept the selectedIndex as chosen, even if the popup // is "abandoned". This is used for keyboard navigation, where we want the - // selection to change immediately. - bool m_acceptOnAbandon; + // selection to change immediately, and is only used if + // m_shouldAcceptOnAbandon is true. + bool m_willAcceptOnAbandon; // This is the number of rows visible in the popup. The maximum number visible at a time is // defined as being kMaxVisibleRows. For a scrolled popup, this can be thought of as the @@ -479,6 +490,10 @@ void PopupContainer::setTextOnIndexChange(bool value) { listBox()->setTextOnIndexChange(value); } +void PopupContainer::setAcceptOnAbandon(bool value) { + listBox()->setAcceptOnAbandon(value); +} + /////////////////////////////////////////////////////////////////////////////// // PopupListBox implementation @@ -563,6 +578,7 @@ bool PopupListBox::isInterestedInEventForKey(int key_code) { case VKEY_NEXT: case VKEY_HOME: case VKEY_END: + case VKEY_TAB: return true; default: return false; @@ -615,10 +631,18 @@ bool PopupListBox::handleKeyEvent(const PlatformKeyboardEvent& event) // want to fire the onchange event until the popup is closed, to match // IE). We change the original index so we revert to that when the // popup is closed. - m_acceptOnAbandon = true; + if (m_shouldAcceptOnAbandon) + m_willAcceptOnAbandon = true; + setOriginalIndex(m_selectedIndex); if (m_setTextOnIndexChange) - m_popupClient->setTextFromItem(m_selectedIndex); + m_popupClient->setTextFromItem(m_selectedIndex); + } else if (!m_setTextOnIndexChange && + event.windowsVirtualKeyCode() == VKEY_TAB) { + // TAB is a special case as it should select the item and advance focus. + m_popupClient->setTextFromItem(m_selectedIndex); + // Return false so the TAB key event is propagated to the page. + return false; } return true; @@ -796,7 +820,7 @@ void PopupListBox::abandon() m_selectedIndex = m_originalIndex; - if (m_acceptOnAbandon) + if (m_willAcceptOnAbandon) m_popupClient->valueChanged(m_selectedIndex); // valueChanged may have torn down the popup! @@ -943,9 +967,9 @@ void PopupListBox::updateFromElement() // It happens when pressing a key to jump to an item, then use tab or // mouse to get away from the select box. In that case, updateFromElement // is called before abandon, which causes discarding of the select result. - if (m_acceptOnAbandon) { + if (m_willAcceptOnAbandon) { m_popupClient->valueChanged(m_selectedIndex); - m_acceptOnAbandon = false; + m_willAcceptOnAbandon = false; } clear(); diff --git a/webkit/port/platform/chromium/PopupMenuChromium.h b/webkit/port/platform/chromium/PopupMenuChromium.h index 0f97ee4..49b2a75 100644 --- a/webkit/port/platform/chromium/PopupMenuChromium.h +++ b/webkit/port/platform/chromium/PopupMenuChromium.h @@ -70,6 +70,13 @@ public: // new item is selected (by using the arrow keys). Default is true. void setTextOnIndexChange(bool value); + // Sets whether the selection should be accepted when the popup menu is + // closed (through ESC being pressed or the focus going away). + // Default is true. + // Note that when TAB is pressed, the selection is always accepted + // regardless of this setting. + void setAcceptOnAbandon(bool value); + PopupListBox* listBox() const { return m_listBox.get(); } private: |