Changeset 85759 in webkit

Timestamp:

May 4, 2011 10:47:45 AM (13 years ago)

Author:

jcivelli@chromium.org

Message:

2011-05-04 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Ojan Vafai.

Send the char events to the select popup if one is showing to fix
a bug were pressing a letter would not select the matching option.
​https://bugs.webkit.org/show_bug.cgi?id=47769

• src/WebViewImpl.cpp: (WebKit::WebViewImpl::keyEvent): (WebKit::WebViewImpl::charEvent):
• src/WebViewImpl.h:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebViewImpl.cpp (modified) (3 diffs)
• src/WebViewImpl.h (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-05-04  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        Send the char events to the select popup if one is showing to fix
+        a bug were pressing a letter would not select the matching option.
+        https://bugs.webkit.org/show_bug.cgi?id=47769
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::keyEvent):
+        (WebKit::WebViewImpl::charEvent):
+        * src/WebViewImpl.h:
+
 2011-05-03  Justin Novosad  <junov@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebViewImpl.cpp

@@ -597 +597 @@
     m_suppressNextKeypressEvent = false;
 
-    // Give any select popup a chance at consuming the key event.
-    if (selectPopupHandleKeyEvent(event))
-        return true;
+    // If there is a select popup, it should be the one processing the event,
+    // not the page.
+    if (m_selectPopup)
+        return m_selectPopup->handleKeyEvent(PlatformKeyboardEventBuilder(event));
 
     // Give Autocomplete a chance to consume the key events it is interested in.
@@ -643 +644 @@
 
     return keyEventDefault(event);
-}
-
-bool WebViewImpl::selectPopupHandleKeyEvent(const WebKeyboardEvent& event)
-{
-    if (!m_selectPopup)
-        return false;
-
-    return m_selectPopup->handleKeyEvent(PlatformKeyboardEventBuilder(event));
 }
 
@@ -715 +708 @@
     bool suppress = m_suppressNextKeypressEvent;
     m_suppressNextKeypressEvent = false;
+
+    // If there is a select popup, it should be the one processing the event,
+    // not the page.
+    if (m_selectPopup)
+        return m_selectPopup->handleKeyEvent(PlatformKeyboardEventBuilder(event));
 
     Frame* frame = focusedWebCoreFrame();

trunk/Source/WebKit/chromium/src/WebViewImpl.h

@@ -384 +384 @@
     bool keyEventDefault(const WebKeyboardEvent&);
 
-    // Returns true if the select popup has consumed the event.
-    bool selectPopupHandleKeyEvent(const WebKeyboardEvent&);
-
     // Returns true if the autocomple has consumed the event.
     bool autocompleteHandleKeyEvent(const WebKeyboardEvent&);