Push HandleMouseLeave into base widget implementation.

HandleMouseLeave can be a common implementation, this fixes a TODO
in the OOPIF case for clearing the target URL.

BUG=1097816

Change-Id: I41c7e6d6d022360f5f964e005485ae80e9871d9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2543123
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828726}

third_party/blink/renderer/core/frame/web_frame_widget_base.cc

@@ -623,7 +623,7 @@ WebInputEventResult WebFrameWidgetBase::HandleKeyEvent(
   return WebInputEventResult::kNotHandled;
 }
 
-void WebFrameWidgetBase::HandleMouseDown(LocalFrame& main_frame,
+void WebFrameWidgetBase::HandleMouseDown(LocalFrame& local_root,
                                          const WebMouseEvent& event) {
   WebViewImpl* view_impl = View();
   // If there is a popup open, close it as the user is clicking on the page
@@ -659,7 +659,7 @@ void WebFrameWidgetBase::HandleMouseDown(LocalFrame& main_frame,
     }
   }
 
-  PageWidgetEventHandler::HandleMouseDown(main_frame, event);
+  PageWidgetEventHandler::HandleMouseDown(local_root, event);
   // PageWidgetEventHandler may have detached the frame.
   if (!LocalRootImpl())
     return;
@@ -685,6 +685,13 @@ void WebFrameWidgetBase::HandleMouseDown(LocalFrame& main_frame,
   }
 }
 
+void WebFrameWidgetBase::HandleMouseLeave(LocalFrame& local_root,
+                                          const WebMouseEvent& event) {
+  View()->SetMouseOverURL(WebURL());
+  PageWidgetEventHandler::HandleMouseLeave(local_root, event);
+  // PageWidgetEventHandler may have detached the frame.
+}
+
 void WebFrameWidgetBase::MouseContextMenu(const WebMouseEvent& event) {
   GetPage()->GetContextMenuController().ClearContextMenu();
 
@@ -719,10 +726,10 @@ void WebFrameWidgetBase::MouseContextMenu(const WebMouseEvent& event) {
 }
 
 WebInputEventResult WebFrameWidgetBase::HandleMouseUp(
-    LocalFrame& main_frame,
+    LocalFrame& local_root,
     const WebMouseEvent& event) {
   WebInputEventResult result =
-      PageWidgetEventHandler::HandleMouseUp(main_frame, event);
+      PageWidgetEventHandler::HandleMouseUp(local_root, event);
   // PageWidgetEventHandler may have detached the frame.
   if (!LocalRootImpl())
     return result;

third_party/blink/renderer/core/frame/web_frame_widget_base.h

@@ -768,6 +768,7 @@ class CORE_EXPORT WebFrameWidgetBase
   // PageWidgetEventHandler methods:
   WebInputEventResult HandleKeyEvent(const WebKeyboardEvent&) override;
   void HandleMouseDown(LocalFrame&, const WebMouseEvent&) override;
+  void HandleMouseLeave(LocalFrame&, const WebMouseEvent&) override;
   WebInputEventResult HandleMouseUp(LocalFrame&, const WebMouseEvent&) override;
   WebInputEventResult HandleMouseWheel(LocalFrame&,
                                        const WebMouseWheelEvent&) override;

third_party/blink/renderer/core/frame/web_frame_widget_impl.cc

@@ -380,13 +380,6 @@ void WebFrameWidgetImpl::FocusChanged(bool enable) {
   }
 }
 
-void WebFrameWidgetImpl::HandleMouseLeave(LocalFrame& main_frame,
-                                          const WebMouseEvent& event) {
-  // FIXME: WebWidget doesn't have the method below.
-  // m_client->setMouseOverURL(WebURL());
-  PageWidgetEventHandler::HandleMouseLeave(main_frame, event);
-}
-
 WebInputEventResult WebFrameWidgetImpl::HandleGestureEvent(
     const WebGestureEvent& event) {
   DCHECK(Client());

third_party/blink/renderer/core/frame/web_frame_widget_impl.h

@@ -56,10 +56,8 @@ class Layer;
 
 namespace blink {
 class Element;
-class LocalFrame;
 class PaintLayerCompositor;
 class WebFrameWidget;
-class WebMouseEvent;
 class WebFrameWidgetImpl;
 
 // Implements WebFrameWidget for a child local root frame (OOPIF). This object
@@ -115,7 +113,6 @@ class WebFrameWidgetImpl final : public WebFrameWidgetBase {
   friend class WebFrameWidget;  // For WebFrameWidget::create.
 
   // PageWidgetEventHandler functions
-  void HandleMouseLeave(LocalFrame&, const WebMouseEvent&) override;
   WebInputEventResult HandleGestureEvent(const WebGestureEvent&) override;
 
   // Finds the parameters required for scrolling the focused editable |element|

third_party/blink/renderer/core/frame/web_view_frame_widget.cc

@@ -124,12 +124,6 @@ void WebViewFrameWidget::SetRootLayer(scoped_refptr<cc::Layer> root_layer) {
   web_view_->DidChangeRootLayer(!!root_layer);
 }
 
-void WebViewFrameWidget::HandleMouseLeave(LocalFrame& main_frame,
-                                          const WebMouseEvent& event) {
-  web_view_->SetMouseOverURL(WebURL());
-  PageWidgetEventHandler::HandleMouseLeave(main_frame, event);
-}
-
 WebInputEventResult WebViewFrameWidget::HandleGestureEvent(
     const WebGestureEvent& event) {
   if (!web_view_->Client() || !web_view_->Client()->CanHandleGestureEvent()) {

third_party/blink/renderer/core/frame/web_view_frame_widget.h

@@ -85,7 +85,6 @@ class CORE_EXPORT WebViewFrameWidget : public WebFrameWidgetBase {
 
  private:
   // PageWidgetEventHandler overrides:
-  void HandleMouseLeave(LocalFrame&, const WebMouseEvent&) override;
   WebInputEventResult HandleGestureEvent(const WebGestureEvent&) override;
 
   void SetWindowRectSynchronously(const gfx::Rect& new_window_rect);

third_party/blink/renderer/core/page/page_widget_delegate.cc

@@ -211,60 +211,60 @@ WebInputEventResult PageWidgetDelegate::HandleInputEvent(
 // Default handlers for PageWidgetEventHandler
 
 void PageWidgetEventHandler::HandleMouseMove(
-    LocalFrame& main_frame,
+    LocalFrame& local_root,
     const WebMouseEvent& event,
     const std::vector<std::unique_ptr<WebInputEvent>>& coalesced_events,
     const std::vector<std::unique_ptr<WebInputEvent>>& predicted_events) {
   WebMouseEvent transformed_event =
-      TransformWebMouseEvent(main_frame.View(), event);
-  main_frame.GetEventHandler().HandleMouseMoveEvent(
+      TransformWebMouseEvent(local_root.View(), event);
+  local_root.GetEventHandler().HandleMouseMoveEvent(
       transformed_event,
-      TransformWebMouseEventVector(main_frame.View(), coalesced_events),
-      TransformWebMouseEventVector(main_frame.View(), predicted_events));
+      TransformWebMouseEventVector(local_root.View(), coalesced_events),
+      TransformWebMouseEventVector(local_root.View(), predicted_events));
 }
 
-void PageWidgetEventHandler::HandleMouseLeave(LocalFrame& main_frame,
+void PageWidgetEventHandler::HandleMouseLeave(LocalFrame& local_root,
                                               const WebMouseEvent& event) {
   WebMouseEvent transformed_event =
-      TransformWebMouseEvent(main_frame.View(), event);
-  main_frame.GetEventHandler().HandleMouseLeaveEvent(transformed_event);
+      TransformWebMouseEvent(local_root.View(), event);
+  local_root.GetEventHandler().HandleMouseLeaveEvent(transformed_event);
 }
 
-void PageWidgetEventHandler::HandleMouseDown(LocalFrame& main_frame,
+void PageWidgetEventHandler::HandleMouseDown(LocalFrame& local_root,
                                              const WebMouseEvent& event) {
   WebMouseEvent transformed_event =
-      TransformWebMouseEvent(main_frame.View(), event);
-  main_frame.GetEventHandler().HandleMousePressEvent(transformed_event);
+      TransformWebMouseEvent(local_root.View(), event);
+  local_root.GetEventHandler().HandleMousePressEvent(transformed_event);
 }
 
 WebInputEventResult PageWidgetEventHandler::HandleMouseUp(
-    LocalFrame& main_frame,
+    LocalFrame& local_root,
     const WebMouseEvent& event) {
   WebMouseEvent transformed_event =
-      TransformWebMouseEvent(main_frame.View(), event);
-  return main_frame.GetEventHandler().HandleMouseReleaseEvent(
+      TransformWebMouseEvent(local_root.View(), event);
+  return local_root.GetEventHandler().HandleMouseReleaseEvent(
       transformed_event);
 }
 
 WebInputEventResult PageWidgetEventHandler::HandleMouseWheel(
-    LocalFrame& frame,
+    LocalFrame& local_root,
     const WebMouseWheelEvent& event) {
   WebMouseWheelEvent transformed_event =
-      TransformWebMouseWheelEvent(frame.View(), event);
-  return frame.GetEventHandler().HandleWheelEvent(transformed_event);
+      TransformWebMouseWheelEvent(local_root.View(), event);
+  return local_root.GetEventHandler().HandleWheelEvent(transformed_event);
 }
 
 WebInputEventResult PageWidgetEventHandler::HandlePointerEvent(
-    LocalFrame& main_frame,
+    LocalFrame& local_root,
     const WebPointerEvent& event,
     const std::vector<std::unique_ptr<WebInputEvent>>& coalesced_events,
     const std::vector<std::unique_ptr<WebInputEvent>>& predicted_events) {
   WebPointerEvent transformed_event =
-      TransformWebPointerEvent(main_frame.View(), event);
-  return main_frame.GetEventHandler().HandlePointerEvent(
+      TransformWebPointerEvent(local_root.View(), event);
+  return local_root.GetEventHandler().HandlePointerEvent(
       transformed_event,
-      TransformWebPointerEventVector(main_frame.View(), coalesced_events),
-      TransformWebPointerEventVector(main_frame.View(), predicted_events));
+      TransformWebPointerEventVector(local_root.View(), coalesced_events),
+      TransformWebPointerEventVector(local_root.View(), predicted_events));
 }
 
 }  // namespace blink

third_party/blink/renderer/core/page/page_widget_delegate.h

@@ -53,11 +53,11 @@ class CORE_EXPORT PageWidgetEventHandler {
       const WebMouseEvent&,
       const std::vector<std::unique_ptr<WebInputEvent>>&,
       const std::vector<std::unique_ptr<WebInputEvent>>&);
-  virtual void HandleMouseLeave(LocalFrame& main_frame, const WebMouseEvent&);
-  virtual void HandleMouseDown(LocalFrame& main_frame, const WebMouseEvent&);
-  virtual WebInputEventResult HandleMouseUp(LocalFrame& main_frame,
+  virtual void HandleMouseLeave(LocalFrame& local_root, const WebMouseEvent&);
+  virtual void HandleMouseDown(LocalFrame& local_root, const WebMouseEvent&);
+  virtual WebInputEventResult HandleMouseUp(LocalFrame& local_root,
                                             const WebMouseEvent&);
-  virtual WebInputEventResult HandleMouseWheel(LocalFrame& main_frame,
+  virtual WebInputEventResult HandleMouseWheel(LocalFrame& local_root,
                                                const WebMouseWheelEvent&);
   virtual WebInputEventResult HandleKeyEvent(const WebKeyboardEvent&) = 0;
   virtual WebInputEventResult HandleCharEvent(const WebKeyboardEvent&) = 0;