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

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 156 matching lines @@
 #include "web/PrerendererClientImpl.h"
 #include "web/ResizeViewportAnchor.h"
 #include "web/RotationViewportAnchor.h"
 #include "web/SpeechRecognitionClientProxy.h"
 #include "web/StorageQuotaClientImpl.h"
 #include "web/ValidationMessageClientImpl.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/WebSettingsImpl.h"
 
 #if USE(DEFAULT_RENDER_THEME)
 #include "core/layout/LayoutThemeDefault.h"
 #endif
 
 // Get rid of WTF's pow define so we can use std::pow.
 #undef pow
@@ skipping 1509 matching lines @@
 
   WebWidget* popup_widget = client_->CreatePopupMenu(kWebPopupTypePage);
   // createPopupMenu returns nullptr if this renderer process is about to die.
   if (!popup_widget)
     return nullptr;
   page_popup_ = ToWebPagePopupImpl(popup_widget);
   if (!page_popup_->Initialize(this, client)) {
     page_popup_->ClosePopup();
     page_popup_ = nullptr;
   }
-  EnablePopupMouseWheelEventListener();
+  EnablePopupMouseWheelEventListener(WebLocalFrameImpl::FromFrame(
+      client->OwnerElement().GetDocument().GetFrame()->LocalFrameRoot()));
   return page_popup_.Get();
 }
 
 void WebViewImpl::ClosePagePopup(PagePopup* popup) {
   DCHECK(popup);
   WebPagePopupImpl* popup_impl = ToWebPagePopupImpl(popup);
   DCHECK_EQ(page_popup_.Get(), popup_impl);
   if (page_popup_.Get() != popup_impl)
     return;
   page_popup_->ClosePopup();
 }
 
 void WebViewImpl::CleanupPagePopup() {
   page_popup_ = nullptr;
   DisablePopupMouseWheelEventListener();
 }
 
 void WebViewImpl::CancelPagePopup() {
   if (page_popup_)
     page_popup_->Cancel();
 }
 
-void WebViewImpl::EnablePopupMouseWheelEventListener() {
+void WebViewImpl::EnablePopupMouseWheelEventListener(
+    WebLocalFrameImpl* local_root) {
   // TODO(kenrb): Popup coordination for out-of-process iframes needs to be

[kenrb, 2017/04/18 19:25:53]

I think this comment can be entirely removed. There are still changes needed but
this method should be fine for OOPIFs.

[EhsanK, 2017/04/20 15:23:09]

Acknowledged.

   // added. Because of the early return here a select element
   // popup can remain visible even when the element underneath it is
   // scrolled to a new position. This is part of a larger set of issues with
   // popups.
   // See https://crbug.com/566130
-  if (!MainFrameImpl())
-    return;
   DCHECK(!popup_mouse_wheel_event_listener_);
-  Document* document = MainFrameImpl()->GetFrame()->GetDocument();
+  Document* document = local_root->GetDocument();
   DCHECK(document);
   // We register an empty event listener, EmptyEventListener, so that mouse
   // wheel events get sent to the WebView.
   popup_mouse_wheel_event_listener_ = EmptyEventListener::Create();
   document->addEventListener(EventTypeNames::mousewheel,
                              popup_mouse_wheel_event_listener_, false);
+  local_root_with_empty_mouse_wheel_listener_ = local_root;
 }
 
 void WebViewImpl::DisablePopupMouseWheelEventListener() {
   // TODO(kenrb): Concerns the same as in enablePopupMouseWheelEventListener.
   // See https://crbug.com/566130
-  if (!MainFrameImpl())
-    return;
   DCHECK(popup_mouse_wheel_event_listener_);
-  Document* document = MainFrameImpl()->GetFrame()->GetDocument();
+  Document* document =
+      local_root_with_empty_mouse_wheel_listener_->GetDocument();
   DCHECK(document);
   // Document may have already removed the event listener, for instance, due
   // to a navigation, but remove it anyway.
   document->removeEventListener(EventTypeNames::mousewheel,
                                 popup_mouse_wheel_event_listener_.Release(),
                                 false);
+  local_root_with_empty_mouse_wheel_listener_ = nullptr;
 }
 
 LocalDOMWindow* WebViewImpl::PagePopupWindow() const {
   return page_popup_ ? page_popup_->Window() : nullptr;
 }
 
 Frame* WebViewImpl::FocusedCoreFrame() const {
   return page_ ? page_->GetFocusController().FocusedOrMainFrame() : nullptr;
 }
 
@@ skipping 712 matching lines @@
   if (!page_->MainFrame())
     return BaseBackgroundColor().Rgb();
   if (!page_->MainFrame()->IsLocalFrame())
     return BaseBackgroundColor().Rgb();
   FrameView* view = page_->DeprecatedLocalMainFrame()->View();
   if (!view)
     return BaseBackgroundColor().Rgb();
   return view->DocumentBackgroundColor().Rgb();
 }
 
-WebPagePopup* WebViewImpl::GetPagePopup() const {
+WebPagePopupImpl* WebViewImpl::GetPagePopup() const {
   return page_popup_.Get();
 }
 
 // TODO(ekaramad):This method is almost duplicated in WebFrameWidgetImpl as
 // well. This code needs to be refactored  (http://crbug.com/629721).
 WebRange WebViewImpl::CaretOrSelectionRange() {
   const LocalFrame* focused = FocusedLocalFrameInWidget();
   if (!focused)
     return WebRange();
 
@@ skipping 1685 matching lines @@
   if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame())
     return nullptr;
   return focused_frame;
 }
 
 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const {
   return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink