Changeset 58370 in webkit

Timestamp:

Apr 27, 2010 7:29:23 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-27 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Darin Fisher.

Makes clicking a select element close its associated popup if
it is open.
​https://bugs.webkit.org/show_bug.cgi?id=38105

• src/WebViewImpl.cpp: (WebKit::WebViewImpl::mouseDown):

Location:

trunk/WebKit/chromium

Files:

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

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-04-27  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Makes clicking a select element close its associated popup if
+        it is open.
+        https://bugs.webkit.org/show_bug.cgi?id=38105
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::mouseDown):
+
 2010-04-27  Jay Civelli  <jcivelli@chromium.org>
 

trunk/WebKit/chromium/src/WebViewImpl.cpp

@@ -327 +327 @@
         return;
 
-    // If there is a select popup opened, close it as the user is clicking on
-    // the page (outside of the popup).
+    // If there is a select popup open, close it as the user is clicking on
+    // the page (outside of the popup).  We also save it so we can prevent a
+    // click on the select element from immediately reopening the popup.
+    RefPtr<WebCore::PopupContainer> selectPopup = m_selectPopup;
     hideSelectPopup();
+    ASSERT(!m_selectPopup);
 
     m_lastMouseDownPoint = WebPoint(event.x, event.y);
@@ -362 +365 @@
         static_cast<EditorClientImpl*>(m_page->editorClient())->
             showFormAutofillForNode(clickedNode.get());
+    }
+    if (m_selectPopup && m_selectPopup == selectPopup) {
+        // That click triggered a select popup which is the same as the one that
+        // was showing before the click.  It means the user clicked the select
+        // while the popup was showing, and as a result we first closed then
+        // immediately reopened the select popup.  It needs to be closed.
+        hideSelectPopup();
     }