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

Unified Diff: sky/engine/core/rendering/RenderObject.cpp

Issue 924273003: Remove HitTestAction. (Closed) Base URL: git@github.com:domokit/mojo.git@hittestfilter
Patch Set: Created 5 years, 10 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
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | sky/engine/core/rendering/RenderParagraph.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderObject.cpp
diff --git a/sky/engine/core/rendering/RenderObject.cpp b/sky/engine/core/rendering/RenderObject.cpp
index 8a93f1c9454cf1a49e024c66e5774e76c297fcaa..56635652efb2a51c0d1ef9686047eeb1e03b1ab1 100644
--- a/sky/engine/core/rendering/RenderObject.cpp
+++ b/sky/engine/core/rendering/RenderObject.cpp
@@ -1674,14 +1674,11 @@ PositionWithAffinity RenderObject::positionForPoint(const LayoutPoint&)
return createPositionWithAffinity(caretMinOffset(), DOWNSTREAM);
}
+// FIXME(sky): Change the callers to use nodeAtPoint direclty and remove this function.
+// Or, rename nodeAtPoint to hitTest?
bool RenderObject::hitTest(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset)
{
- // First test the foreground layer (lines and inlines).
- bool inside = nodeAtPoint(request, result, locationInContainer, accumulatedOffset, HitTestForeground);
- // See if the mouse is inside us but not any of our descendants
- if (!inside)
- inside = nodeAtPoint(request, result, locationInContainer, accumulatedOffset, HitTestBlockBackground);
- return inside;
+ return nodeAtPoint(request, result, locationInContainer, accumulatedOffset);
}
void RenderObject::updateHitTestResult(HitTestResult& result, const LayoutPoint& point)
@@ -1699,7 +1696,7 @@ void RenderObject::updateHitTestResult(HitTestResult& result, const LayoutPoint&
}
}
-bool RenderObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& /*locationInContainer*/, const LayoutPoint& /*accumulatedOffset*/, HitTestAction)
+bool RenderObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& /*locationInContainer*/, const LayoutPoint& /*accumulatedOffset*/)
{
return false;
}
@@ -1937,7 +1934,7 @@ bool RenderObject::canUpdateSelectionOnRootLineBoxes()
return containingBlock ? !containingBlock->needsLayout() : false;
}
-bool RenderObject::nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint&, HitTestAction)
+bool RenderObject::nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint&)
{
ASSERT_NOT_REACHED();
return false;
« no previous file with comments | « sky/engine/core/rendering/RenderObject.h ('k') | sky/engine/core/rendering/RenderParagraph.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698