Stop hit testing culled inlines when a match is found

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

 /*
  * Copyright (C) 2006, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 24 matching lines @@
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLMapElement.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLTextAreaElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/layout/LayoutImage.h"
 #include "core/layout/LayoutTextFragment.h"
 #include "core/page/FrameTree.h"
 #include "core/svg/SVGElement.h"
+#include "platform/geometry/Region.h"
 #include "platform/scroll/Scrollbar.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 HitTestResult::HitTestResult()
     : m_hitTestRequest(HitTestRequest::ReadOnly | HitTestRequest::Active)
     , m_cacheable(true)
     , m_isOverWidget(false)
@@ skipping 368 matching lines @@
         return !toHTMLTextAreaElement(*m_innerNode).isDisabledOrReadOnly();
 
     if (isHTMLInputElement(*m_innerNode)) {
         HTMLInputElement& inputElement = toHTMLInputElement(*m_innerNode);
         return !inputElement.isDisabledOrReadOnly() && inputElement.isTextField();
     }
 
     return m_innerNode->hasEditableStyle();
 }
 
-bool HitTestResult::addNodeToListBasedTestResult(Node* node, const HitTestLocation& locationInContainer, const LayoutRect& rect)
+ListBasedHitTestBehavior HitTestResult::addNodeToListBasedTestResult(Node* node, const HitTestLocation& location, const LayoutRect& rect)
 {
-    // If not a list-based test, this function should be a no-op.
+    // If not a list-based test, stop testing because the hit has been found.
     if (!hitTestRequest().listBased())
-        return false;
+        return StopHitTesting;
 
-    // If node is null, return true so the hit test can continue.
+    // If node is null, continue hit testing.
     if (!node)
-        return true;
+        return ContinueHitTesting;
 
     mutableListBasedTestResult().add(node);
 
     if (hitTestRequest().penetratingList())
-        return true;
+        return ContinueHitTesting;
 
-    bool regionFilled = rect.contains(LayoutRect(locationInContainer.boundingBox()));
-    return !regionFilled;
+    bool regionFilled = rect.contains(LayoutRect(location.boundingBox()));
+    return regionFilled ? StopHitTesting : ContinueHitTesting;
+}
+
+ListBasedHitTestBehavior HitTestResult::addNodeToListBasedTestResult(Node* node, const HitTestLocation& location, const Region& region)
+{

[Rick Byers, 2016/01/25 21:50:05]

Seems a shame to copy/paste this entire function.  Refactor to implement the
rect verison in terms of the region version?  Or, worst case, make a template
method.

[pdr., 2016/01/25 23:47:36]

Good idea.

This isn't possible due to the default argument on the rect version, but I've
extracted out a common function and added a fixme that describes what the 3rd
argument is for.

I opted for not templatizing the new 3-line addNodeToListBasedTestResult
functions to keep things simple.

+    // If not a list-based test, stop testing because the hit has been found.
+    if (!hitTestRequest().listBased())
+        return StopHitTesting;
+
+    // If node is null, continue hit testing.
+    if (!node)
+        return ContinueHitTesting;
+
+    mutableListBasedTestResult().add(node);
+
+    if (hitTestRequest().penetratingList())
+        return ContinueHitTesting;
+
+    bool regionFilled = region.contains(location.boundingBox());
+    return regionFilled ? StopHitTesting : ContinueHitTesting;
 }
 
 void HitTestResult::append(const HitTestResult& other)
 {
     ASSERT(hitTestRequest().listBased());
 
     if (!m_scrollbar && other.scrollbar()) {
         setScrollbar(other.scrollbar());
     }
 
@@ skipping 65 matching lines @@
     else if (isHTMLMapElement(m_innerNode))
         imageMapImageElement = toHTMLMapElement(m_innerNode)->imageElement();
 
     if (!imageMapImageElement)
         return m_innerNode.get();
 
     return imageMapImageElement;
 }
 
 } // namespace blink