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

third_party/WebKit/Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 216 matching lines @@
 #include "platform/LengthFunctions.h"
 #include "platform/PluginScriptForbiddenScope.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/WebFrameScheduler.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/loader/fetch/ResourceFetcher.h"
 #include "platform/network/ContentSecurityPolicyParsers.h"
 #include "platform/network/HTTPParsers.h"
 #include "platform/network/NetworkStateNotifier.h"
-#include "platform/scroll/Scrollbar.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "platform/text/PlatformLocale.h"
 #include "platform/text/SegmentedString.h"
 #include "platform/weborigin/OriginAccessEntry.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebAddressSpace.h"
 #include "public/platform/WebPrerenderingSupport.h"
@@ skipping 3397 matching lines @@
   // lead to a premature layout() happening, which could show a flash of white.
   // See also the similar code in EventHandler::hitTestResultAtPoint.
   if (layoutViewItem().isNull() || !view() || !view()->didFirstLayout())
     return MouseEventWithHitTestResults(event,
                                         HitTestResult(request, LayoutPoint()));
 
   HitTestResult result(request, documentPoint);
   layoutViewItem().hitTest(result);
 
   if (!request.readOnly())
-    updateHoverActiveState(request, result.innerElement(), result.scrollbar());
+    updateHoverActiveState(request, result.innerElement());
 
   if (isHTMLCanvasElement(result.innerNode())) {
     HitTestCanvasResult* hitTestCanvasResult =
         toHTMLCanvasElement(result.innerNode())
             ->getControlAndIdIfHitRegionExists(result.pointInInnerNodeFrame());
     if (hitTestCanvasResult->getControl()) {
       result.setInnerNode(hitTestCanvasResult->getControl());
     }
     result.setCanvasRegionId(hitTestCanvasResult->getId());
   }
@@ skipping 2502 matching lines @@
         return currObj1;
     }
   }
 
   return 0;
 }
 
 // TODO(mustaq) |request| parameter maybe a misuse of HitTestRequest in
 // updateHoverActiveState() since the function doesn't bother with hit-testing.
 void Document::updateHoverActiveState(const HitTestRequest& request,
-                                      Element* innerElement,
-                                      Scrollbar* hitScrollbar) {
+                                      Element* innerElement) {
   DCHECK(!request.readOnly());
 
   if (request.active() && m_frame)
     m_frame->eventHandler().notifyElementActivated();
 
-  Element* innerElementInDocument = hitScrollbar ? nullptr : innerElement;
-  // Replace the innerElementInDocument to be srollbar's parent when hit
-  // scrollbar
-  if (hitScrollbar) {
-    ScrollableArea* scrollableArea = hitScrollbar->getScrollableArea();
-    if (scrollableArea && scrollableArea->layoutBox() &&
-        scrollableArea->layoutBox()->node() &&
-        scrollableArea->layoutBox()->node()->isElementNode()) {
-      innerElementInDocument =
-          toElement(hitScrollbar->getScrollableArea()->layoutBox()->node());
-    }
-  }
+  Element* innerElementInDocument = innerElement;
 
   while (innerElementInDocument && innerElementInDocument->document() != this) {
     innerElementInDocument->document().updateHoverActiveState(
-        request, innerElementInDocument, hitScrollbar);
+        request, innerElementInDocument);
     innerElementInDocument = innerElementInDocument->document().localOwner();
   }
 
   updateDistribution();
   Element* oldActiveElement = activeHoverElement();
   if (oldActiveElement && !request.active()) {
     // The oldActiveElement layoutObject is null, dropped on :active by setting
     // display: none, for instance. We still need to clear the ActiveChain as
     // the mouse is released.
     for (Node* node = oldActiveElement; node;
@@ skipping 462 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (blink::Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->url().getString().utf8().data());
 }
 #endif