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

third_party/WebKit/Source/web/WebViewImpl.h

Index: third_party/WebKit/Source/web/WebViewImpl.h
diff --git a/third_party/WebKit/Source/web/WebViewImpl.h b/third_party/WebKit/Source/web/WebViewImpl.h
index 0bb1e3827f61deaa563638433474c848edc7255e..6bbd121dbf9cd9c0d1182cce62b82a7cb8faf63f 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.h
+++ b/third_party/WebKit/Source/web/WebViewImpl.h
@@ -68,6 +68,7 @@
 #include "web/SpellCheckerClientImpl.h"
 #include "web/StorageClientImpl.h"
 #include "web/WebExport.h"
+#include "web/WebPagePopupImpl.h"
 
 namespace blink {
 
@@ -90,7 +91,6 @@ class WebLayerTreeView;
 class WebLocalFrame;
 class WebLocalFrameImpl;
 class CompositorMutatorImpl;
-class WebPagePopupImpl;
 class WebPlugin;
 class WebRemoteFrame;
 class WebSettingsImpl;
@@ -142,7 +142,7 @@ class WEB_EXPORT WebViewImpl final
   void SetFocus(bool enable) override;
   WebRange CompositionRange() override;
   WebColor BackgroundColor() const override;
-  WebPagePopup* GetPagePopup() const override;
+  WebPagePopupImpl* GetPagePopup() const override;
   bool SelectionBounds(WebRect& anchor, WebRect& focus) const override;
   bool SelectionTextDirection(WebTextDirection& start,
                               WebTextDirection& end) const override;
@@ -502,6 +502,10 @@ class WEB_EXPORT WebViewImpl final
   // root.
   WebInputMethodControllerImpl* GetActiveWebInputMethodController() const;
 
+  void SetLastHiddenPagePopup(WebPagePopupImpl* page_popup) {
+    last_hidden_page_popup_ = page_popup;
+  }
+
  private:
   InspectorOverlay* GetInspectorOverlay();
 
@@ -579,7 +583,7 @@ class WEB_EXPORT WebViewImpl final
   WebGestureEvent CreateGestureScrollEventFromFling(WebInputEvent::Type,
                                                     WebGestureDevice) const;
 
-  void EnablePopupMouseWheelEventListener();
+  void EnablePopupMouseWheelEventListener(WebLocalFrameImpl* local_root);
   void DisablePopupMouseWheelEventListener();
 
   void CancelPagePopup();
@@ -721,6 +725,10 @@ class WEB_EXPORT WebViewImpl final
 
   Persistent<EventListener> popup_mouse_wheel_event_listener_;
 
+  // The local root whose document has |popup_mouse_wheel_event_listener_|
+  // registered.
+  WeakPersistent<WebLocalFrameImpl> local_root_with_empty_mouse_wheel_listener_;
+
   WebPageImportanceSignals page_importance_signals_;
 
   const std::unique_ptr<WebViewScheduler> scheduler_;