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

third_party/WebKit/Source/core/layout/LayoutView.cpp

Index: third_party/WebKit/Source/core/layout/LayoutView.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutView.cpp b/third_party/WebKit/Source/core/layout/LayoutView.cpp
index 374293e898c154a038231f87d6e7e1010b63b406..59c75cbe0e324afc92cc8ba8606c96dfa8f1e5b6 100644
--- a/third_party/WebKit/Source/core/layout/LayoutView.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutView.cpp
@@ -155,6 +155,23 @@ bool LayoutView::hitTestNoLifecycleUpdate(HitTestResult& result) {
             frameView()->scrollbarAtFramePoint(framePoint))
       result.setScrollbar(frameScrollbar);
 
+    // If hitTestResult include scrollbar, innerNode should be the parent of the
+    // scrollbar.
+    if (result.scrollbar()) {
+      // Clear innerNode if we hit a scrollbar whose ScrollableArea isn't
+      // associated with a LayoutBox so we aren't hitting some random element
+      // below too.
+      result.setInnerNode(nullptr);
+      result.setURLElement(nullptr);
+      ScrollableArea* scrollableArea = result.scrollbar()->getScrollableArea();
+      if (scrollableArea && scrollableArea->layoutBox() &&
+          scrollableArea->layoutBox()->node()) {
+        Node* node = scrollableArea->layoutBox()->node();
+        result.setInnerNode(node);
+        result.setURLElement(node->enclosingLinkEventParentOrSelf());
+      }
+    }
+
     if (hitLayer)
       m_hitTestCache->addCachedResult(result, domTreeVersion);
   }