Change hittest node to be scrollbar's parent when hittest include a scrollbar

third_party/WebKit/Source/core/input/EventHandler.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 260 matching lines @@
   // the first layout because until then, there is nothing shown on the screen -
   // the user can't have intentionally clicked on something belonging to this
   // page.  Furthermore, mousemove events before the first layout should not
   // lead to a premature layout() happening, which could show a flash of white.
   // See also the similar code in Document::performMouseEventHitTest.
   if (m_frame->contentLayoutItem().isNull() || !m_frame->view() ||
       !m_frame->view()->didFirstLayout())
     return result;
 
   m_frame->contentLayoutItem().hitTest(result);
-  if (!request.readOnly()) {
-    m_frame->document()->updateHoverActiveState(request, result.innerElement(),
-                                                result.scrollbar());
-  }
+  if (!request.readOnly())
+    m_frame->document()->updateHoverActiveState(request, result.innerElement());
 
   return result;
 }
 
 void EventHandler::stopAutoscroll() {
   m_scrollManager->stopAutoscroll();
 }
 
 // TODO(bokan): This should be merged with logicalScroll assuming
 // defaultSpaceEventHandler's chaining scroll can be done crossing frames.
@@ skipping 524 matching lines @@
     hitType |= HitTestRequest::Active | HitTestRequest::ReadOnly;
   HitTestRequest request(hitType);
   MouseEventWithHitTestResults mev = MouseEventWithHitTestResults(
       mouseEvent, HitTestResult(request, LayoutPoint()));
 
   // We don't want to do a hit-test in forceLeave scenarios because there might
   // actually be some other frame above this one at the specified co-ordinate.
   // So we must force the hit-test to fail, while still clearing hover/active
   // state.
   if (forceLeave) {
-    m_frame->document()->updateHoverActiveState(request, nullptr, nullptr);
+    m_frame->document()->updateHoverActiveState(request, nullptr);
   } else {
     mev = EventHandlingUtil::performMouseEventHitTest(m_frame, request,
                                                       mouseEvent);
   }
 
   if (hoveredNode)
     *hoveredNode = mev.hitTestResult();
 
   Scrollbar* scrollbar = nullptr;
 
@@ skipping 656 matching lines @@
 
       LocalFrame* oldHoverFrame = toLocalFrame(owner->contentFrame());
       Document* doc = oldHoverFrame->document();
       if (!doc)
         break;
 
       oldHoverNodeInCurDoc = doc->hoverNode();
       // If the old hovered frame is different from the new hovered frame.
       // we should clear the old hovered node from the old hovered frame.
       if (newHoverFrame != oldHoverFrame)
-        doc->updateHoverActiveState(request, nullptr, nullptr);
+        doc->updateHoverActiveState(request, nullptr);
     }
   }
 
   // Recursively set the new active/hover states on every frame in the chain of
   // innerElement.
-  m_frame->document()->updateHoverActiveState(request, innerElement, nullptr);
+  m_frame->document()->updateHoverActiveState(request, innerElement);
 }
 
 // Update the mouseover/mouseenter/mouseout/mouseleave events across all frames
 // for this gesture, before passing the targeted gesture event directly to a hit
 // frame.
 void EventHandler::updateGestureTargetNodeForMouseEvent(
     const GestureEventWithHitTestResults& targetedEvent) {
   ASSERT(m_frame == m_frame->localFrameRoot());
 
   // Behaviour of this function is as follows:
@@ skipping 312 matching lines @@
 
   Node* targetNode =
       overrideTargetElement ? overrideTargetElement : doc->focusedElement();
   if (!targetNode)
     targetNode = doc;
 
   // Use the focused node as the target for hover and active.
   HitTestRequest request(HitTestRequest::Active);
   HitTestResult result(request, locationInRootFrame);
   result.setInnerNode(targetNode);
-  doc->updateHoverActiveState(request, result.innerElement(),
-                              result.scrollbar());
+  doc->updateHoverActiveState(request, result.innerElement());
 
   // The contextmenu event is a mouse event even when invoked using the
   // keyboard.  This is required for web compatibility.
   WebInputEvent::Type eventType = WebInputEvent::MouseDown;
   if (m_frame->settings() && m_frame->settings()->getShowContextMenuOnMouseUp())
     eventType = WebInputEvent::MouseUp;
 
   WebMouseEvent mouseEvent(
       eventType,
       WebFloatPoint(locationInRootFrame.x(), locationInRootFrame.y()),
@@ skipping 51 matching lines @@
   ASSERT(m_frame);
   ASSERT(m_frame->document());
 
   if (LayoutViewItem layoutItem = m_frame->contentLayoutItem()) {
     if (FrameView* view = m_frame->view()) {
       HitTestRequest request(HitTestRequest::Move);
       HitTestResult result(request,
                            view->rootFrameToContents(
                                m_mouseEventManager->lastKnownMousePosition()));
       layoutItem.hitTest(result);
-      m_frame->document()->updateHoverActiveState(
-          request, result.innerElement(), result.scrollbar());
+      m_frame->document()->updateHoverActiveState(request,
+                                                  result.innerElement());
     }
   }
 }
 
 void EventHandler::activeIntervalTimerFired(TimerBase*) {
   TRACE_EVENT0("input", "EventHandler::activeIntervalTimerFired");
 
   if (m_frame && m_frame->document() && m_lastDeferredTapElement) {
     // FIXME: Enable condition when http://crbug.com/226842 lands
     // m_lastDeferredTapElement.get() == m_frame->document()->activeElement()
     HitTestRequest request(HitTestRequest::TouchEvent |
                            HitTestRequest::Release);
-    m_frame->document()->updateHoverActiveState(
-        request, m_lastDeferredTapElement.get(), nullptr);
+    m_frame->document()->updateHoverActiveState(request,
+                                                m_lastDeferredTapElement.get());
   }
   m_lastDeferredTapElement = nullptr;
 }
 
 void EventHandler::notifyElementActivated() {
   // Since another element has been set to active, stop current timer and clear
   // reference.
   m_activeIntervalTimer.stop();
   m_lastDeferredTapElement = nullptr;
 }
@@ skipping 142 matching lines @@
     MouseEventWithHitTestResults& mev,
     LocalFrame* subframe) {
   WebInputEventResult result =
       subframe->eventHandler().handleMouseReleaseEvent(mev.event());
   if (result != WebInputEventResult::NotHandled)
     return result;
   return WebInputEventResult::HandledSystem;
 }
 
 }  // namespace blink