Index: Source/core/layout/LayoutBox.cpp |
diff --git a/Source/core/layout/LayoutBox.cpp b/Source/core/layout/LayoutBox.cpp |
index 7911492f693515845fd9bd82d490de560f270bb5..2ec5db30855f9674832fba348f324e1ad1598782 100644 |
--- a/Source/core/layout/LayoutBox.cpp |
+++ b/Source/core/layout/LayoutBox.cpp |
@@ -1149,13 +1149,13 @@ LayoutUnit LayoutBox::adjustContentBoxLogicalHeightForBoxSizing(LayoutUnit heigh |
} |
// Hit Testing |
-bool LayoutBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction action) |
+bool LayoutBox::nodeAtPoint(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction action) |
{ |
LayoutPoint adjustedLocation = accumulatedOffset + location(); |
// Check kids first. |
for (LayoutObject* child = slowLastChild(); child; child = child->previousSibling()) { |
- if ((!child->hasLayer() || !toLayoutBoxModelObject(child)->layer()->isSelfPaintingLayer()) && child->nodeAtPoint(request, result, locationInContainer, adjustedLocation, action)) { |
+ if ((!child->hasLayer() || !toLayoutBoxModelObject(child)->layer()->isSelfPaintingLayer()) && child->nodeAtPoint(result, locationInContainer, adjustedLocation, action)) { |
updateHitTestResult(result, locationInContainer.point() - toLayoutSize(adjustedLocation)); |
return true; |
} |
@@ -1165,9 +1165,9 @@ bool LayoutBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result |
// foreground phase (which is true for replaced elements like images). |
LayoutRect boundsRect = borderBoxRect(); |
boundsRect.moveBy(adjustedLocation); |
- if (visibleToHitTestRequest(request) && action == HitTestForeground && locationInContainer.intersects(boundsRect)) { |
+ if (visibleToHitTestRequest(result.hitTestRequest()) && action == HitTestForeground && locationInContainer.intersects(boundsRect)) { |
updateHitTestResult(result, locationInContainer.point() - toLayoutSize(adjustedLocation)); |
- if (!result.addNodeToListBasedTestResult(node(), request, locationInContainer, boundsRect)) |
+ if (!result.addNodeToListBasedTestResult(node(), locationInContainer, boundsRect)) |
return true; |
} |