Hide popups when handling mouse down, mouse wheel, or gesture tap in a WebFrameWidget

third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

 /*
  * Copyright (C) 2014 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 53 matching lines @@
 #include "web/CompositionUnderlineVectorBuilder.h"
 #include "web/CompositorMutatorImpl.h"
 #include "web/CompositorWorkerProxyClientImpl.h"
 #include "web/ContextMenuAllowedScope.h"
 #include "web/InspectorOverlay.h"
 #include "web/PageOverlay.h"
 #include "web/WebDevToolsAgentImpl.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebInputMethodControllerImpl.h"
 #include "web/WebLocalFrameImpl.h"
+#include "web/WebPagePopupImpl.h"
 #include "web/WebPluginContainerImpl.h"
 #include "web/WebRemoteFrameImpl.h"
 #include "web/WebViewFrameWidget.h"
 #include "wtf/AutoReset.h"
 #include "wtf/PtrUtil.h"
 
 namespace blink {
 
 // WebFrameWidget ------------------------------------------------------------
 
@@ skipping 677 matching lines @@
 
 void WebFrameWidgetImpl::handleMouseLeave(LocalFrame& mainFrame,
                                           const WebMouseEvent& event) {
   // FIXME: WebWidget doesn't have the method below.
   // m_client->setMouseOverURL(WebURL());
   PageWidgetEventHandler::handleMouseLeave(mainFrame, event);
 }
 
 void WebFrameWidgetImpl::handleMouseDown(LocalFrame& mainFrame,
                                          const WebMouseEvent& event) {
+  // 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 click on an
+  // element from immediately reopening the same popup.
+  RefPtr<WebPagePopupImpl> pagePopup;
+  if (event.button == WebMouseEvent::Button::Left) {
+    pagePopup = view()->pagePopup();
+    view()->hidePopups();
+  }

[EhsanK, 2017/04/07 16:16:12]

There is a DCHECK(!m_pagePopup) which I could add here as well.

+
   // Take capture on a mouse down on a plugin so we can send it mouse events.
   // If the hit node is a plugin but a scrollbar is over it don't start mouse
   // capture because it will interfere with the scrollbar receiving events.
   IntPoint point(event.positionInWidget().x, event.positionInWidget().y);
   if (event.button == WebMouseEvent::Button::Left) {
     point = m_localRoot->frameView()->rootFrameToContents(point);
     HitTestResult result(
         m_localRoot->frame()->eventHandler().hitTestResultAtPoint(point));
     result.setToShadowHostIfInRestrictedShadowRoot();
     Node* hitNode = result.innerNode();
 
     if (!result.scrollbar() && hitNode && hitNode->layoutObject() &&
         hitNode->layoutObject()->isEmbeddedObject()) {
       m_mouseCaptureNode = hitNode;
       TRACE_EVENT_ASYNC_BEGIN0("input", "capturing mouse", this);
     }
   }
 
   PageWidgetEventHandler::handleMouseDown(mainFrame, event);
 
   if (event.button == WebMouseEvent::Button::Left && m_mouseCaptureNode)
     m_mouseCaptureGestureToken =
         mainFrame.eventHandler().takeLastMouseDownGestureToken();
 
+  if (view()->pagePopup() && pagePopup &&
+      view()->pagePopup()->hasSamePopupClient(pagePopup.get())) {
+    // That click triggered a page popup that is the same as the one we just
+    // closed.  It needs to be closed.
+    view()->hidePopups();
+  }
+
   // Dispatch the contextmenu event regardless of if the click was swallowed.
   if (!page()->settings().getShowContextMenuOnMouseUp()) {
 #if OS(MACOSX)
     if (event.button == WebMouseEvent::Button::Right ||
         (event.button == WebMouseEvent::Button::Left &&
          event.modifiers() & WebMouseEvent::ControlKey))
       mouseContextMenu(event);
 #else
     if (event.button == WebMouseEvent::Button::Right)
       mouseContextMenu(event);
@@ skipping 43 matching lines @@
     // Dispatch the contextmenu event regardless of if the click was swallowed.
     // On Mac/Linux, we handle it on mouse down, not up.
     if (event.button == WebMouseEvent::Button::Right)
       mouseContextMenu(event);
   }
 }
 
 WebInputEventResult WebFrameWidgetImpl::handleMouseWheel(
     LocalFrame& mainFrame,
     const WebMouseWheelEvent& event) {
+  view()->hidePopups();

[EhsanK, 2017/04/07 16:16:12]

Unless there is a handler on the page, this won't work. kenrb@, should we add a
fake handler for the local root like we do for WebViewImpl? Or drop this and
redo the whole the main problem noted in https://crbug.com/566130)?

   return PageWidgetEventHandler::handleMouseWheel(mainFrame, event);
 }
 
 WebInputEventResult WebFrameWidgetImpl::handleGestureEvent(
     const WebGestureEvent& event) {
   DCHECK(m_client);
   WebInputEventResult eventResult = WebInputEventResult::NotHandled;
   bool eventCancelled = false;
   switch (event.type()) {
     case WebInputEvent::GestureScrollBegin:
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureScrollUpdate:
     case WebInputEvent::GestureTap:
     case WebInputEvent::GestureTapUnconfirmed:
     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.
+      view()->setLastHiddenPagePopup(view()->pagePopup());
+      view()->hidePopups();
+    case WebInputEvent::GestureTapCancel:
+      view()->setLastHiddenPagePopup(nullptr);
     case WebInputEvent::GestureShowPress:
-    case WebInputEvent::GestureTapCancel:
     case WebInputEvent::GestureDoubleTap:
     case WebInputEvent::GestureTwoFingerTap:
     case WebInputEvent::GestureLongPress:
     case WebInputEvent::GestureLongTap:
       break;
     case WebInputEvent::GestureFlingStart:
     case WebInputEvent::GestureFlingCancel:
       m_client->didHandleGestureEvent(event, eventCancelled);
       return WebInputEventResult::NotHandled;
     default:
@@ skipping 273 matching lines @@
   return nullptr;
 }
 
 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const {
   if (!m_imeAcceptEvents)
     return nullptr;
   return focusedLocalFrameInWidget();
 }
 
 }  // namespace blink