Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(952)

Unified Diff: Source/core/layout/LayoutInline.cpp

Issue 1032823003: Refactor HitTestResult to store the HitTestRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/layout/LayoutInline.cpp
diff --git a/Source/core/layout/LayoutInline.cpp b/Source/core/layout/LayoutInline.cpp
index cd7fb5c4a2448bb71b00504bfab896973f11383a..f87910cf0268bf34ec6614d3c3a597e08e041132 100644
--- a/Source/core/layout/LayoutInline.cpp
+++ b/Source/core/layout/LayoutInline.cpp
@@ -785,10 +785,10 @@ const char* LayoutInline::name() const
return "LayoutInline";
}
-bool LayoutInline::nodeAtPoint(const HitTestRequest& request, HitTestResult& result,
+bool LayoutInline::nodeAtPoint(HitTestResult& result,
const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTestAction)
{
- return m_lineBoxes.hitTest(this, request, result, locationInContainer, accumulatedOffset, hitTestAction);
+ return m_lineBoxes.hitTest(this, result, locationInContainer, accumulatedOffset, hitTestAction);
}
namespace {
@@ -810,10 +810,10 @@ private:
} // unnamed namespace
-bool LayoutInline::hitTestCulledInline(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset)
+bool LayoutInline::hitTestCulledInline(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset)
{
ASSERT(result.isRectBasedTest() && !alwaysCreateLineBoxes());
- if (!visibleToHitTestRequest(request))
+ if (!visibleToHitTestRequest(result.hitTestRequest()))
return false;
HitTestLocation tmpLocation(locationInContainer, -toLayoutSize(accumulatedOffset));
@@ -826,7 +826,7 @@ bool LayoutInline::hitTestCulledInline(const HitTestRequest& request, HitTestRes
updateHitTestResult(result, tmpLocation.point());
// We can not use addNodeToListBasedTestResult to determine if we fully enclose the hit-test area
// because it can only handle rectangular targets.
- result.addNodeToListBasedTestResult(node(), request, locationInContainer);
+ result.addNodeToListBasedTestResult(node(), locationInContainer);
return regionResult.contains(tmpLocation.boundingBox());
}
return false;

Powered by Google App Engine
This is Rietveld 408576698