Drop-down closes via tap/touch again.

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 798 matching lines @@
     case WebInputEvent::GestureLongPress:
       for (size_t i = 0; i < m_linkHighlights.size(); ++i)
         m_linkHighlights[i]->startHighlightAnimationIfNeeded();
       break;
     default:
       break;
   }
 
   switch (event.type) {
     case WebInputEvent::GestureTap: {
-      // If there is a 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 tap on an
-      // element from immediately reopening the same popup.
-      RefPtr<WebPagePopupImpl> pagePopup = m_pagePopup;
-      hidePopups();
-      DCHECK(!m_pagePopup);
-
       m_client->cancelScheduledContentIntents();
       if (detectContentOnTouch(targetedEvent)) {
         eventResult = WebInputEventResult::HandledSystem;
         break;
       }
 
       // Don't trigger a disambiguation popup on sites designed for mobile
       // devices.  Instead, assume that the page has been designed with big
       // enough buttons and links.  Don't trigger a disambiguation popup when
       // screencasting, since it's implemented outside of compositor pipeline
@@ skipping 31 matching lines @@
               m_linkHighlights[i]->startHighlightAnimationIfNeeded();
             eventResult = WebInputEventResult::HandledSystem;
             eventCancelled = true;
             break;
           }
         }
       }
 
       eventResult = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(
           targetedEvent);
-
-      if (m_pagePopup && pagePopup &&
-          m_pagePopup->hasSamePopupClient(pagePopup.get())) {
+      if (m_pagePopup && m_lastHiddenPagePopup &&
+          m_pagePopup->hasSamePopupClient(m_lastHiddenPagePopup.get())) {
         // The tap triggered a page popup that is the same as the one we just
-        // closed.  It needs to be closed.
+        // closed. It needs to be closed.
         cancelPagePopup();
       }
+      m_lastHiddenPagePopup = nullptr;
       break;
     }
     case WebInputEvent::GestureTwoFingerTap:
     case WebInputEvent::GestureLongPress:
     case WebInputEvent::GestureLongTap: {
       if (!mainFrameImpl() || !mainFrameImpl()->frameView())
         break;
 
       m_client->cancelScheduledContentIntents();
       m_page->contextMenuController().clearContextMenu();
       {
         ContextMenuAllowedScope scope;
         eventResult =
             mainFrameImpl()->frame()->eventHandler().handleGestureEvent(
                 targetedEvent);
       }
 
       break;
     }
-    case WebInputEvent::GestureShowPress:
+    case WebInputEvent::GestureTapDown: {
+      // Touch pinch zoom and scroll on the page (outside of a popup) must hide
+      // the popup. In case of a touch scroll or pinch zoom, this function is
+      // called with GestureTapDown rather than a GSB/GSU/GSE or GPB/GPU/GPE.
+      // When we close a popup because of a GestureTapDown, we also save it so
+      // we can prevent the following GestureTap from immediately reopening the
+      // same popup.
+      m_lastHiddenPagePopup = m_pagePopup;
+      hidePopups();
+      DCHECK(!m_pagePopup);
+      eventResult = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(
+          targetedEvent);
+      break;
+    }
+    case WebInputEvent::GestureTapCancel: {
+      m_lastHiddenPagePopup = nullptr;
+      eventResult = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(
+          targetedEvent);
+      break;
+    }
+    case WebInputEvent::GestureShowPress: {
       m_client->cancelScheduledContentIntents();
-    case WebInputEvent::GestureTapDown:
-      // Touch pinch zoom and scroll must hide the popup. In case of a touch
-      // scroll or pinch zoom, this function is called with GestureTapDown
-      // rather than a GSB/GSU/GSE or GPB/GPU/GPE.
-      hidePopups();
-    case WebInputEvent::GestureTapCancel:
+      eventResult = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(
+          targetedEvent);
+      break;
+    }
     case WebInputEvent::GestureTapUnconfirmed: {
       eventResult = mainFrameImpl()->frame()->eventHandler().handleGestureEvent(
           targetedEvent);
       break;
     }
-    default:
-      NOTREACHED();
+    default: { NOTREACHED(); }
   }
   m_client->didHandleGestureEvent(event, eventCancelled);
   return eventResult;
 }
 
 WebInputEventResult WebViewImpl::handleSyntheticWheelFromTouchpadPinchEvent(
     const WebGestureEvent& pinchEvent) {
   DCHECK_EQ(pinchEvent.type, WebInputEvent::GesturePinchUpdate);
 
   // For pinch gesture events, match typical trackpad behavior on Windows by
@@ skipping 3276 matching lines @@
   if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
     return nullptr;
   return focusedFrame;
 }
 
 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
   return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink